From 92e8ae835d543403279a416e16ae17f222de5d74 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Mon, 17 Mar 2014 17:19:51 -0400 Subject: use mgf1_hash_supported to simplify some logic --- cryptography/hazmat/backends/openssl/backend.py | 3 +-- 1 file changed, 1 insertion(+), 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+") -- cgit v1.2.3