diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-04-25 16:26:03 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-04-25 16:26:03 -0500 |
| commit | e6e1b417fd09d0b1f4ff6e54019fe7bebc0ec25c (patch) | |
| tree | 6ec2130d8ac42a20f59e93dfdffd32294e74783f /cryptography | |
| parent | 4f034181c870030ed5f2c67e830bc1ae67176f41 (diff) | |
| parent | 458c09bdb2be4d39b8897db790349cc89faf3e6c (diff) | |
| download | cryptography-e6e1b417fd09d0b1f4ff6e54019fe7bebc0ec25c.tar.gz cryptography-e6e1b417fd09d0b1f4ff6e54019fe7bebc0ec25c.tar.bz2 cryptography-e6e1b417fd09d0b1f4ff6e54019fe7bebc0ec25c.zip | |
Merge pull request #958 from public/openssl-loading-backend-iface
Rename OpenSSLSerializationBackend
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/hazmat/backends/interfaces.py | 4 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/err.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cryptography/hazmat/backends/interfaces.py b/cryptography/hazmat/backends/interfaces.py index 677f4c67..1ddf0785 100644 --- a/cryptography/hazmat/backends/interfaces.py +++ b/cryptography/hazmat/backends/interfaces.py @@ -141,9 +141,9 @@ class DSABackend(object): @six.add_metaclass(abc.ABCMeta) -class OpenSSLSerializationBackend(object): +class TraditionalOpenSSLSerializationBackend(object): @abc.abstractmethod - def load_openssl_pem_private_key(self, data, password): + def load_traditional_openssl_pem_private_key(self, data, password): """ Load a private key from PEM encoded data, using password if the data is encrypted. diff --git a/cryptography/hazmat/bindings/openssl/err.py b/cryptography/hazmat/bindings/openssl/err.py index c08c880c..f6456d66 100644 --- a/cryptography/hazmat/bindings/openssl/err.py +++ b/cryptography/hazmat/bindings/openssl/err.py @@ -138,6 +138,7 @@ static const int EVP_F_RC5_CTRL; static const int EVP_R_AES_KEY_SETUP_FAILED; static const int EVP_R_ASN1_LIB; static const int EVP_R_BAD_BLOCK_LENGTH; +static const int EVP_R_BAD_DECRYPT; static const int EVP_R_BAD_KEY_LENGTH; static const int EVP_R_BN_DECODE_ERROR; static const int EVP_R_BN_PUBKEY_ERROR; |