diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-03-01 15:58:14 -0600 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-03-01 15:58:14 -0600 |
commit | 98975e9990e4ee1232bbd6f426dddcce1643e87e (patch) | |
tree | f421deaf7d0de9df17f879fbf5a9fdf1e86c8393 | |
parent | 94770319e08bd7412a7e0b62abf206e0d78b997b (diff) | |
download | cryptography-98975e9990e4ee1232bbd6f426dddcce1643e87e.tar.gz cryptography-98975e9990e4ee1232bbd6f426dddcce1643e87e.tar.bz2 cryptography-98975e9990e4ee1232bbd6f426dddcce1643e87e.zip |
update naming
-rw-r--r-- | src/cryptography/hazmat/backends/openssl/backend.py | 6 | ||||
-rw-r--r-- | src/cryptography/hazmat/backends/openssl/rsa.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index e1758dae..ce11f6cb 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -1093,8 +1093,8 @@ class Backend(object): return ctx - def _private_bytes(self, encoding, format, encryption_algorithm, - pem_write_func, evp_pkey, cdata): + def _private_key_bytes(self, encoding, format, encryption_algorithm, + traditional_write_func, evp_pkey, cdata): if not isinstance(encoding, serialization.Encoding): raise TypeError("encoding must be an item from the Encoding enum") @@ -1109,7 +1109,7 @@ class Backend(object): write_bio = self._lib.PEM_write_bio_PKCS8PrivateKey key = evp_pkey elif format is serialization.Format.TraditionalOpenSSL: - write_bio = pem_write_func + write_bio = traditional_write_func key = cdata if not isinstance(encryption_algorithm, diff --git a/src/cryptography/hazmat/backends/openssl/rsa.py b/src/cryptography/hazmat/backends/openssl/rsa.py index 05648d85..0470c3fd 100644 --- a/src/cryptography/hazmat/backends/openssl/rsa.py +++ b/src/cryptography/hazmat/backends/openssl/rsa.py @@ -562,7 +562,7 @@ class _RSAPrivateKey(object): ) def private_bytes(self, encoding, format, encryption_algorithm): - return self._backend._private_bytes( + return self._backend._private_key_bytes( encoding, format, encryption_algorithm, |