zuul
/
zuul
Code Issues Proposed changes

Merge "encrypt_secret: support OpenSSL 1.1.1"

This commit is contained in:
Zuul 2018-10-23 13:54:15 +00:00 committed by Gerrit Code Review
parent e4fb6e151c 4df1d87519
commit baa1cf322f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/encrypt_secret.py
View File

@ -118,10 +118,11 @@ def main():
openssl_version = subprocess.check_output(
['openssl', 'version']).split()[1]
if openssl_version.startswith(b'0.'):
m = re.match(r'^Modulus \((\d+) bit\):$', output, re.MULTILINE)
key_length_re = r'^Modulus \((?P<key_length>\d+) bit\):$'
else:
m = re.match(r'^Public-Key: \((\d+) bit\)$', output, re.MULTILINE)
nbits = int(m.group(1))
key_length_re = r'^(|RSA )Public-Key: \((?P<key_length>\d+) bit\)$'
m = re.match(key_length_re, output, re.MULTILINE)
nbits = int(m.group('key_length'))
nbytes = int(nbits / 8)
max_bytes = nbytes - 42 # PKCS1-OAEP overhead
chunks = int(math.ceil(float(len(plaintext)) / max_bytes))