diff options
| author | David Reid <dreid@dreid.org> | 2014-01-22 17:19:50 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2014-02-03 10:05:26 -0800 |
| commit | 41f12d769c8653e812d3979a3b87f1864fcec019 (patch) | |
| tree | ef6bd14cf5bb1b86d225c4184e1509dabc285887 /tests | |
| parent | 5443e9d949a1b720642ac25c2a2eb712515e77b0 (diff) | |
| download | cryptography-41f12d769c8653e812d3979a3b87f1864fcec019.tar.gz cryptography-41f12d769c8653e812d3979a3b87f1864fcec019.tar.bz2 cryptography-41f12d769c8653e812d3979a3b87f1864fcec019.zip | |
Fix pep8.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/primitives/test_hkdf_vectors.py | 1 | ||||
| -rw-r--r-- | tests/test_utils.py | 54 |
2 files changed, 22 insertions, 33 deletions
diff --git a/tests/hazmat/primitives/test_hkdf_vectors.py b/tests/hazmat/primitives/test_hkdf_vectors.py index 2595c956..2748e010 100644 --- a/tests/hazmat/primitives/test_hkdf_vectors.py +++ b/tests/hazmat/primitives/test_hkdf_vectors.py @@ -22,6 +22,7 @@ from cryptography.hazmat.primitives import hashes from .utils import generate_hkdf_test from ...utils import load_hkdf_vectors + @pytest.mark.supported( only_if=lambda backend: backend.hash_supported(hashes.SHA1()), skip_message="Does not support SHA1." diff --git a/tests/test_utils.py b/tests/test_utils.py index 3bc4bf65..d00302fd 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -537,48 +537,36 @@ def test_load_hkdf_vectors(): # Basic test case with SHA-256 Hash = SHA-256 - IKM = 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b - salt = 000102030405060708090a0b0c - info = f0f1f2f3f4f5f6f7f8f9 + IKM = 000000 + salt = 111111 + info = 222222 L = 42 - """ - "PRK = 077709362c2e32df0ddc3f0dc47bba6390b6c73bb50f9c3122ec844ad7c2" - "b3e5\n" - "OKM = 3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4" - "c5bf34007208d5b887185865\n" - """ + PRK = 333333 + OKM = 444444 + # A.2. Test Case 2 # Test with SHA-256 and longer inputs/outputs Hash = SHA-256 - """ - "IKM = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d" - "1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3" - "f404142434445464748494a4b4c4d4e4f\n" - "salt = \n" - "info = \n" - "L = 82\n" - "PRK = 06a6b88c5853361a06104c9ceb35b45cef760014904671014a193f40c15f" - "c244\n" - "OKM = b11e398dc80327a1c8e7f78c596a49344f012eda2d4efad8a050cc4c19af" - "a97c59045a99cac7827271cb41c65e590e09da3275600c2f09b8367793a9aca3db7" - "1cc30c58179ec3e87c14c01d5c1f3434f1d87\n" - ).splitlines() + IKM = 000000 + salt = + info = + L = 82 + PRK = 333333 + OKM = 444444 + """).splitlines() assert load_hkdf_vectors(vector_data) == [ - (b"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b", - b"000102030405060708090a0b0c", - b"f0f1f2f3f4f5f6f7f8f9", + (b"000000", + b"111111", + b"222222", 42, - b"3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf34" - b"007208d5b887185865"), - (b"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20" - b"2122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f4041" - b"42434445464748494a4b4c4d4e4f", + b"333333", + b"444444"), + (b"000000", b"", b"", 82, - b"b11e398dc80327a1c8e7f78c596a49344f012eda2d4efad8a050cc4c19afa97c59" - b"045a99cac7827271cb41c65e590e09da3275600c2f09b8367793a9aca3db71cc30" - b"c58179ec3e87c14c01d5c1f3434f1d87") + b"333333", + b"444444") ] |