aboutsummaryrefslogtreecommitdiffstats
path: root/cryptography
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-08-25 13:10:49 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-08-25 13:10:49 -0700
commit35bb89a4dbd0b9b5795ac1938db09ca42887b715 (patch)
tree84eb6c0d361dd9ed61945074a3dc171e21a9266a /cryptography
parentdda54aa7b1f40601fd4dc58f6c4d1e21c192edbd (diff)
downloadcryptography-35bb89a4dbd0b9b5795ac1938db09ca42887b715.tar.gz
cryptography-35bb89a4dbd0b9b5795ac1938db09ca42887b715.tar.bz2
cryptography-35bb89a4dbd0b9b5795ac1938db09ca42887b715.zip
Verify that padding is an instance of AsymmetircPadding before trying to use it; fixes #1318
Diffstat (limited to 'cryptography')
-rw-r--r--cryptography/hazmat/backends/openssl/rsa.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/cryptography/hazmat/backends/openssl/rsa.py b/cryptography/hazmat/backends/openssl/rsa.py
index 21ac1573..d24bea57 100644
--- a/cryptography/hazmat/backends/openssl/rsa.py
+++ b/cryptography/hazmat/backends/openssl/rsa.py
@@ -43,6 +43,9 @@ def _get_rsa_pss_salt_length(pss, key_size, digest_size):
def _enc_dec_rsa(backend, key, data, padding):
+ if not isinstance(padding, interfaces.AsymmetricPadding):
+ raise TypeError("Padding must be an instance of AsymmetricPadding.")
+
if isinstance(padding, PKCS1v15):
padding_enum = backend._lib.RSA_PKCS1_PADDING
elif isinstance(padding, OAEP):