diff options
| author | David Reid <dreid@dreid.org> | 2014-02-04 16:49:28 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2014-02-04 16:49:28 -0800 |
| commit | 6781094003b86c0a6997452876ae63acd49809e1 (patch) | |
| tree | 7c5a810630a5417913be50e788fd5024a33ff129 /cryptography | |
| parent | e45826f8dc75dd159582ecc15dfc7626ef908a1f (diff) | |
| parent | 09d08ae07a72506b81bc640a2af70397f3ab2594 (diff) | |
| download | cryptography-6781094003b86c0a6997452876ae63acd49809e1.tar.gz cryptography-6781094003b86c0a6997452876ae63acd49809e1.tar.bz2 cryptography-6781094003b86c0a6997452876ae63acd49809e1.zip | |
Merge pull request #561 from alex/unsupported-algorithm
Made OpenSSL's derive_pbkdf2_hmac raise the right exception
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/hazmat/backends/openssl/backend.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py index 67b365fa..74faee57 100644 --- a/cryptography/hazmat/backends/openssl/backend.py +++ b/cryptography/hazmat/backends/openssl/backend.py @@ -162,8 +162,11 @@ class Backend(object): ) assert res == 1 else: - # OpenSSL < 1.0.0 - assert isinstance(algorithm, hashes.SHA1) + if not isinstance(algorithm, hashes.SHA1): + raise UnsupportedAlgorithm( + "This version of OpenSSL only supports PBKDF2HMAC with " + "SHA1" + ) res = self._lib.PKCS5_PBKDF2_HMAC_SHA1( key_material, len(key_material), |