aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2018-12-11 10:36:29 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2018-12-10 21:36:29 -0500
commit75cce2299b30a8d10d032155de7e4489966813fd (patch)
tree2b60030e951ac7ba0b1d9722774d5c453666f6bc
parent621429601f906902d4e98c11f6c05fdbac423699 (diff)
downloadcryptography-75cce2299b30a8d10d032155de7e4489966813fd.tar.gz
cryptography-75cce2299b30a8d10d032155de7e4489966813fd.tar.bz2
cryptography-75cce2299b30a8d10d032155de7e4489966813fd.zip
convert some asserts to function calls (#4636)
-rw-r--r--src/cryptography/hazmat/backends/openssl/rsa.py24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/rsa.py b/src/cryptography/hazmat/backends/openssl/rsa.py
index b7d2173f..0bcc4712 100644
--- a/src/cryptography/hazmat/backends/openssl/rsa.py
+++ b/src/cryptography/hazmat/backends/openssl/rsa.py
@@ -127,10 +127,11 @@ def _enc_dec_rsa_pkey_ctx(backend, key, data, padding_enum, padding):
def _handle_rsa_enc_dec_error(backend, key):
errors = backend._consume_errors()
backend.openssl_assert(errors)
- assert errors[0].lib == backend._lib.ERR_LIB_RSA
+ backend.openssl_assert(errors[0].lib == backend._lib.ERR_LIB_RSA)
if isinstance(key, _RSAPublicKey):
- assert (errors[0].reason ==
- backend._lib.RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE)
+ backend.openssl_assert(
+ errors[0].reason == backend._lib.RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE
+ )
raise ValueError(
"Data too long for key size. Encrypt less data or use a "
"larger key size."
@@ -148,7 +149,7 @@ def _handle_rsa_enc_dec_error(backend, key):
if backend._lib.Cryptography_HAS_RSA_R_PKCS_DECODING_ERROR:
decoding_errors.append(backend._lib.RSA_R_PKCS_DECODING_ERROR)
- assert errors[0].reason in decoding_errors
+ backend.openssl_assert(errors[0].reason in decoding_errors)
raise ValueError("Decryption failed.")
@@ -236,17 +237,20 @@ def _rsa_sig_sign(backend, padding, algorithm, private_key, data):
pkey_ctx, buf, buflen, data, len(data))
if res != 1:
errors = backend._consume_errors()
- assert errors[0].lib == backend._lib.ERR_LIB_RSA
+ backend.openssl_assert(errors[0].lib == backend._lib.ERR_LIB_RSA)
reason = None
- if (errors[0].reason ==
- backend._lib.RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE):
+ if (
+ errors[0].reason ==
+ backend._lib.RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE
+ ):
reason = ("Salt length too long for key size. Try using "
"MAX_LENGTH instead.")
else:
- assert (errors[0].reason ==
- backend._lib.RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY)
+ backend.openssl_assert(
+ errors[0].reason ==
+ backend._lib.RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY
+ )
reason = "Digest too large for key size. Use a larger key."
- assert reason is not None
raise ValueError(reason)
return backend._ffi.buffer(buf)[:]