Inline a pair of functions that became trivial post-1.0.0 (#3336)
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py
index a8d779b..67034bc 100644
--- a/src/cryptography/hazmat/backends/openssl/backend.py
+++ b/src/cryptography/hazmat/backends/openssl/backend.py
@@ -234,9 +234,6 @@
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 @@
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