diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-06-18 18:10:16 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-06-18 17:10:16 -0500 |
| commit | f3779755b0e4ed2a16c8a875d08ab7eefe771a27 (patch) | |
| tree | 9c89cc85febc9029e4fff2fb1a6c4de834cc8021 /src | |
| parent | 0ac6fc8aa91b83e4d7040e842c494789c04b22a8 (diff) | |
| download | cryptography-f3779755b0e4ed2a16c8a875d08ab7eefe771a27.tar.gz cryptography-f3779755b0e4ed2a16c8a875d08ab7eefe771a27.tar.bz2 cryptography-f3779755b0e4ed2a16c8a875d08ab7eefe771a27.zip | |
Simplify control flow now that the 0.9.8 branches are gone (#2989)
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/rsa.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/rsa.py b/src/cryptography/hazmat/backends/openssl/rsa.py index e0f2a853..d96ef2df 100644 --- a/src/cryptography/hazmat/backends/openssl/rsa.py +++ b/src/cryptography/hazmat/backends/openssl/rsa.py @@ -158,7 +158,6 @@ class _RSASignatureContext(object): self._backend.openssl_assert(self._pkey_size > 0) if isinstance(padding, PKCS1v15): - self._finalize_method = self._finalize_pkey_ctx self._padding_enum = self._backend._lib.RSA_PKCS1_PADDING elif isinstance(padding, PSS): if not isinstance(padding._mgf, MGF1): @@ -182,7 +181,6 @@ class _RSASignatureContext(object): _Reasons.UNSUPPORTED_HASH ) - self._finalize_method = self._finalize_pkey_ctx self._padding_enum = self._backend._lib.RSA_PKCS1_PSS_PADDING else: raise UnsupportedAlgorithm( @@ -202,9 +200,6 @@ class _RSASignatureContext(object): self._algorithm.name.encode("ascii")) self._backend.openssl_assert(evp_md != self._backend._ffi.NULL) - return self._finalize_method(evp_md) - - def _finalize_pkey_ctx(self, evp_md): pkey_ctx = self._backend._lib.EVP_PKEY_CTX_new( self._private_key._evp_pkey, self._backend._ffi.NULL ) @@ -289,7 +284,6 @@ class _RSAVerificationContext(object): self._backend.openssl_assert(self._pkey_size > 0) if isinstance(padding, PKCS1v15): - self._verify_method = self._verify_pkey_ctx self._padding_enum = self._backend._lib.RSA_PKCS1_PADDING elif isinstance(padding, PSS): if not isinstance(padding._mgf, MGF1): @@ -315,7 +309,6 @@ class _RSAVerificationContext(object): _Reasons.UNSUPPORTED_HASH ) - self._verify_method = self._verify_pkey_ctx self._padding_enum = self._backend._lib.RSA_PKCS1_PSS_PADDING else: raise UnsupportedAlgorithm( @@ -335,9 +328,6 @@ class _RSAVerificationContext(object): self._algorithm.name.encode("ascii")) self._backend.openssl_assert(evp_md != self._backend._ffi.NULL) - self._verify_method(evp_md) - - def _verify_pkey_ctx(self, evp_md): pkey_ctx = self._backend._lib.EVP_PKEY_CTX_new( self._public_key._evp_pkey, self._backend._ffi.NULL ) |