diff options
| author | Ayrx <terrycwk1994@gmail.com> | 2014-05-07 17:02:21 +0800 |
|---|---|---|
| committer | Ayrx <terrycwk1994@gmail.com> | 2014-05-07 17:02:21 +0800 |
| commit | ac1a079f9baf441c262fd11628f3e3d06f73129d (patch) | |
| tree | 7e67360894dd8ef4943444c8bb872f29c7932b9d /tests | |
| parent | c0ce911b4e971f3090d406cb88dea532647eeac6 (diff) | |
| download | cryptography-ac1a079f9baf441c262fd11628f3e3d06f73129d.tar.gz cryptography-ac1a079f9baf441c262fd11628f3e3d06f73129d.tar.bz2 cryptography-ac1a079f9baf441c262fd11628f3e3d06f73129d.zip | |
Modified HKDF to use HKDFExpand
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/primitives/test_hkdf.py | 3 | ||||
| -rw-r--r-- | tests/hazmat/primitives/utils.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/hazmat/primitives/test_hkdf.py b/tests/hazmat/primitives/test_hkdf.py index bee42172..598f09f0 100644 --- a/tests/hazmat/primitives/test_hkdf.py +++ b/tests/hazmat/primitives/test_hkdf.py @@ -214,3 +214,6 @@ def test_invalid_backend(): with raises_unsupported_algorithm(_Reasons.BACKEND_MISSING_INTERFACE): HKDF(hashes.SHA256(), 16, None, None, pretend_backend) + + with raises_unsupported_algorithm(_Reasons.BACKEND_MISSING_INTERFACE): + HKDFExpand(hashes.SHA256(), 16, None, pretend_backend) diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py index 6c3f4c95..7cf5efd0 100644 --- a/tests/hazmat/primitives/utils.py +++ b/tests/hazmat/primitives/utils.py @@ -26,7 +26,7 @@ from cryptography.exceptions import ( from cryptography.hazmat.primitives import hashes, hmac from cryptography.hazmat.primitives.asymmetric import rsa from cryptography.hazmat.primitives.ciphers import Cipher -from cryptography.hazmat.primitives.kdf.hkdf import HKDF +from cryptography.hazmat.primitives.kdf.hkdf import HKDF, HKDFExpand from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC from ...utils import load_vectors_from_file @@ -347,10 +347,9 @@ def hkdf_extract_test(backend, algorithm, params): def hkdf_expand_test(backend, algorithm, params): - hkdf = HKDF( + hkdf = HKDFExpand( algorithm, int(params["l"]), - salt=binascii.unhexlify(params["salt"]) or None, info=binascii.unhexlify(params["info"]) or None, backend=backend ) |