diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-12-25 22:10:03 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-12-25 19:10:03 -0800 |
| commit | 93c1a8c815d7de5bccaa1486413cf821a8d50c1d (patch) | |
| tree | db7c2d7cb7138557ae81d764536ec4cd6b52e857 | |
| parent | 31b5d784e6542a6bcac9af9b39d3feacabdba137 (diff) | |
| download | cryptography-93c1a8c815d7de5bccaa1486413cf821a8d50c1d.tar.gz cryptography-93c1a8c815d7de5bccaa1486413cf821a8d50c1d.tar.bz2 cryptography-93c1a8c815d7de5bccaa1486413cf821a8d50c1d.zip | |
Inline a pair of functions that became trivial post-1.0.0 (#3336)
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/backend.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index a8d779ba..67034bc5 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -234,9 +234,6 @@ class Backend(object): return _HashContext(self, algorithm) def cipher_supported(self, cipher, mode): - return self._evp_cipher_supported(cipher, mode) - - def _evp_cipher_supported(self, cipher, mode): try: adapter = self._cipher_registry[type(cipher), type(mode)] except KeyError: @@ -589,14 +586,11 @@ class Backend(object): else: return isinstance(algorithm, hashes.SHA1) - def _pss_mgf1_hash_supported(self, algorithm): - return self.hash_supported(algorithm) - def rsa_padding_supported(self, padding): if isinstance(padding, PKCS1v15): return True elif isinstance(padding, PSS) and isinstance(padding._mgf, MGF1): - return self._pss_mgf1_hash_supported(padding._mgf._algorithm) + return self.hash_supported(padding._mgf._algorithm) elif isinstance(padding, OAEP) and isinstance(padding._mgf, MGF1): return ( self._oaep_hash_supported(padding._mgf._algorithm) and |