diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-15 08:51:44 -0400 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-15 08:51:44 -0400 |
commit | f7644ca71eaa25ebf511a49fa22b3cd7f44c0c33 (patch) | |
tree | e51dc3c8d78612f50b8fd26901c6f8044695e98f /src | |
parent | ae9ae087aeddb2157a6588a424ff5b14243f748c (diff) | |
parent | eafa4b1c5d5b9fe6981309349a0daa641a070ea7 (diff) | |
download | cryptography-f7644ca71eaa25ebf511a49fa22b3cd7f44c0c33.tar.gz cryptography-f7644ca71eaa25ebf511a49fa22b3cd7f44c0c33.tar.bz2 cryptography-f7644ca71eaa25ebf511a49fa22b3cd7f44c0c33.zip |
Merge pull request #2276 from viraptor/move-signature-typecheck
Move signature type checks
Diffstat (limited to 'src')
-rw-r--r-- | src/cryptography/hazmat/backends/openssl/dsa.py | 6 | ||||
-rw-r--r-- | src/cryptography/hazmat/backends/openssl/ec.py | 5 | ||||
-rw-r--r-- | src/cryptography/hazmat/backends/openssl/rsa.py | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/dsa.py b/src/cryptography/hazmat/backends/openssl/dsa.py index f1bb6d9b..ec056767 100644 --- a/src/cryptography/hazmat/backends/openssl/dsa.py +++ b/src/cryptography/hazmat/backends/openssl/dsa.py @@ -29,9 +29,6 @@ def _truncate_digest_for_dsa(dsa_cdata, digest, backend): @utils.register_interface(AsymmetricVerificationContext) class _DSAVerificationContext(object): def __init__(self, backend, public_key, signature, algorithm): - if not isinstance(signature, bytes): - raise TypeError("signature must be bytes.") - self._backend = backend self._public_key = public_key self._signature = signature @@ -179,6 +176,9 @@ class _DSAPublicKey(object): key_size = utils.read_only_property("_key_size") def verifier(self, signature, signature_algorithm): + if not isinstance(signature, bytes): + raise TypeError("signature must be bytes.") + return _DSAVerificationContext( self._backend, self, signature, signature_algorithm ) diff --git a/src/cryptography/hazmat/backends/openssl/ec.py b/src/cryptography/hazmat/backends/openssl/ec.py index b8692e49..6764416d 100644 --- a/src/cryptography/hazmat/backends/openssl/ec.py +++ b/src/cryptography/hazmat/backends/openssl/ec.py @@ -119,8 +119,6 @@ class _ECDSASignatureContext(object): @utils.register_interface(AsymmetricVerificationContext) class _ECDSAVerificationContext(object): def __init__(self, backend, public_key, signature, algorithm): - if not isinstance(signature, bytes): - raise TypeError("signature must be bytes.") self._backend = backend self._public_key = public_key self._signature = signature @@ -227,6 +225,9 @@ class _EllipticCurvePublicKey(object): curve = utils.read_only_property("_curve") def verifier(self, signature, signature_algorithm): + if not isinstance(signature, bytes): + raise TypeError("signature must be bytes.") + if isinstance(signature_algorithm, ec.ECDSA): return _ECDSAVerificationContext( self._backend, self, signature, signature_algorithm.algorithm diff --git a/src/cryptography/hazmat/backends/openssl/rsa.py b/src/cryptography/hazmat/backends/openssl/rsa.py index 8e32eb02..7da42292 100644 --- a/src/cryptography/hazmat/backends/openssl/rsa.py +++ b/src/cryptography/hazmat/backends/openssl/rsa.py @@ -337,9 +337,6 @@ class _RSASignatureContext(object): @utils.register_interface(AsymmetricVerificationContext) class _RSAVerificationContext(object): def __init__(self, backend, public_key, signature, padding, algorithm): - if not isinstance(signature, bytes): - raise TypeError("signature must be bytes.") - self._backend = backend self._public_key = public_key self._signature = signature @@ -578,6 +575,9 @@ class _RSAPublicKey(object): key_size = utils.read_only_property("_key_size") def verifier(self, signature, padding, algorithm): + if not isinstance(signature, bytes): + raise TypeError("signature must be bytes.") + return _RSAVerificationContext( self._backend, self, signature, padding, algorithm ) |