aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-03-17 17:19:51 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-03-17 17:19:51 -0400
commit92e8ae835d543403279a416e16ae17f222de5d74 (patch)
tree5a88c2a32084f46e1897bda464b76c2165041170
parent1cfdca212bb33b1945dc54e9974595bf06060e1f (diff)
downloadcryptography-92e8ae835d543403279a416e16ae17f222de5d74.tar.gz
cryptography-92e8ae835d543403279a416e16ae17f222de5d74.tar.bz2
cryptography-92e8ae835d543403279a416e16ae17f222de5d74.zip
use mgf1_hash_supported to simplify some logic
-rw-r--r--cryptography/hazmat/backends/openssl/backend.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index 44065b1c..6f024da5 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/cryptography/hazmat/backends/openssl/backend.py
@@ -779,8 +779,7 @@ class _RSAVerificationContext(object):
if not isinstance(padding._mgf, MGF1):
raise TypeError("Only MGF1 is supported by this backend")
- if (not isinstance(padding._mgf._algorithm, hashes.SHA1) and
- not self._backend._lib.Cryptography_HAS_MGF1_MD):
+ if not self._backend.mgf1_hash_supported(padding._mgf._algorithm):
raise UnsupportedHash("This backend only supports MGF1 with "
"SHA1 when OpenSSL is not 1.0.1+")