diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-15 09:35:13 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-16 17:03:40 -0400 |
| commit | ee58901071b5b60fbe925dd906fbd6d220e943af (patch) | |
| tree | d5fc5d4ee381c56b5f57607e0b3d816a7dc2c20b | |
| parent | 763c621de1cb576dd4f9ec02fab73df30f71c1d8 (diff) | |
| download | cryptography-ee58901071b5b60fbe925dd906fbd6d220e943af.tar.gz cryptography-ee58901071b5b60fbe925dd906fbd6d220e943af.tar.bz2 cryptography-ee58901071b5b60fbe925dd906fbd6d220e943af.zip | |
make mgf private
| -rw-r--r-- | cryptography/hazmat/backends/openssl/backend.py | 10 | ||||
| -rw-r--r-- | cryptography/hazmat/primitives/asymmetric/padding.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py index 73582808..3d08e3f8 100644 --- a/cryptography/hazmat/backends/openssl/backend.py +++ b/cryptography/hazmat/backends/openssl/backend.py @@ -776,10 +776,10 @@ class _RSAVerificationContext(object): else: self._verify_method = self._verify_pkcs1 elif isinstance(padding, PSS): - if not isinstance(padding.mgf, MGF1): + if not isinstance(padding._mgf, MGF1): raise TypeError("Only MGF1 is supported by this backend") - if (not isinstance(padding.mgf._algorithm, hashes.SHA1) and + if (not isinstance(padding._mgf._algorithm, hashes.SHA1) and not self._backend._lib.Cryptography_HAS_MGF1_MD): raise UnsupportedHash("This backend only supports MGF1 with " "SHA1 when OpenSSL is not 1.0.1+") @@ -836,7 +836,7 @@ class _RSAVerificationContext(object): if self._backend._lib.Cryptography_HAS_MGF1_MD: # MGF1 MD is configurable in OpenSSL 1.0.1+ mgf1_md = self._backend._lib.EVP_get_digestbyname( - self._padding.mgf._algorithm.name.encode("ascii")) + self._padding._mgf._algorithm.name.encode("ascii")) assert mgf1_md != self._backend._ffi.NULL res = self._backend._lib.EVP_PKEY_CTX_set_rsa_mgf1_md( pkey_ctx, mgf1_md @@ -908,10 +908,10 @@ class _RSAVerificationContext(object): raise InvalidSignature def _get_salt_length(self): - if self._padding.mgf._salt_length is MGF1.MAX_LENGTH: + if self._padding._mgf._salt_length is MGF1.MAX_LENGTH: return -2 else: - return self._padding.mgf._salt_length + return self._padding._mgf._salt_length backend = Backend() diff --git a/cryptography/hazmat/primitives/asymmetric/padding.py b/cryptography/hazmat/primitives/asymmetric/padding.py index a8129804..02aff280 100644 --- a/cryptography/hazmat/primitives/asymmetric/padding.py +++ b/cryptography/hazmat/primitives/asymmetric/padding.py @@ -29,7 +29,7 @@ class PSS(object): name = "EMSA-PSS" def __init__(self, mgf): - self.mgf = mgf + self._mgf = mgf class MGF1(object): |