diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-08-25 11:36:19 -1000 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-08-25 11:36:19 -1000 |
| commit | e9d027a99b7b945e4254e2ddd407c34d500cd22d (patch) | |
| tree | 84eb6c0d361dd9ed61945074a3dc171e21a9266a /cryptography | |
| parent | dda54aa7b1f40601fd4dc58f6c4d1e21c192edbd (diff) | |
| parent | 35bb89a4dbd0b9b5795ac1938db09ca42887b715 (diff) | |
| download | cryptography-e9d027a99b7b945e4254e2ddd407c34d500cd22d.tar.gz cryptography-e9d027a99b7b945e4254e2ddd407c34d500cd22d.tar.bz2 cryptography-e9d027a99b7b945e4254e2ddd407c34d500cd22d.zip | |
Merge pull request #1321 from alex/check-padding
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.py | 3 |
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): |