Elgato_dark/python-tuf
1
0
Fork 0
mirror of https://github.com/theupdateframework/python-tuf synced 2026-05-24 10:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not store exception messages in a temp variable

Browse source
This commit is contained in:
Vladimir Diaz 2016-01-25 11:17:21 -05:00
parent 1e0fe452d9
commit 2c8dead51a
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tuf/pyca_crypto_keys.py
View file

@ -536,8 +536,8 @@ def create_rsa_encrypted_pem(private_key, passphrase):
passphrase=passphrase)
except (ValueError, IndexError, TypeError) as e:
message = 'An encrypted RSA key in PEM format cannot be generated: ' + str(e)
raise tuf.CryptoError(message)
raise tuf.CryptoError('An encrypted RSA key in PEM format cannot be'
' generated: ' + str(e))
else:
raise TypeError('The required private key is unset.')
@ -640,12 +640,11 @@ def create_rsa_public_and_private_from_encrypted_pem(encrypted_pem, passphrase):
# UnsupportedAlgorithm: If the private key (or if the key is encrypted with
# an unsupported symmetric cipher) is not supported by the backend.
except (ValueError, TypeError, cryptography.exceptions.UnsupportedAlgorithm) as e:
message = 'RSA (public, private) tuple cannot be generated from the' +\
' encrypted PEM string: ' + str(e)
# Raise 'tuf.CryptoError' and pyca/cryptography's exception message. Avoid
# propogating pyca/cryptography's exception trace to avoid revealing
# sensitive error.
raise tuf.CryptoError(message)
raise tuf.CryptoError('RSA (public, private) tuple cannot be generated'
' from the encrypted PEM string: ' + str(e))
# Export the public and private halves of the pyca/cryptography RSA key
# object. The (public, private) tuple returned contains the public and
@ -739,8 +738,7 @@ def encrypt_key(key_object, password):
# Ensure the private portion of the key is included in 'key_object'.
if not key_object['keyval']['private']:
message = 'Key object does not contain a private part.'
raise tuf.FormatError(message)
raise tuf.FormatError('Key object does not contain a private part.')
# Derive a key (i.e., an appropriate encryption key and not the
# user's password) from the given 'password'. Strengthen 'password' with