commit 14367303f16bc271f4a8f11f09b02342f44c3a7e
author David Reid <dreid@dreid.org> Mon Jan 27 16:33:31 2014 -0800
committer David Reid <dreid@dreid.org> Mon Feb 03 10:05:26 2014 -0800
tree e5b0cced1281ef2c7edaa8a9d5d4f77f1ddb41e5
parent 9b24cb8a2c7324696adc7a595e4a143f23e5f2bc

Use the nist vector loader.

tests/hazmat/primitives/utils.py

diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py
index 963838e..9e9088a 100644
--- a/tests/hazmat/primitives/utils.py
+++ b/tests/hazmat/primitives/utils.py
@@ -306,45 +306,39 @@
 
 
 def hkdf_derive_test(backend, algorithm, params):
-    ikm, salt, info, length, prk, expected_okm = params
-
     okm = hkdf_derive(
-        binascii.unhexlify(ikm),
-        length,
-        binascii.unhexlify(salt),
-        binascii.unhexlify(info),
+        binascii.unhexlify(params["ikm"]),
+        int(params["l"]),
+        binascii.unhexlify(params["salt"]),
+        binascii.unhexlify(params["info"]),
         algorithm,
         backend=backend
     )
 
-    assert binascii.hexlify(okm) == expected_okm
+    assert okm == binascii.unhexlify(params["okm"])
 
 
 def hkdf_extract_test(backend, algorithm, params):
-    ikm, salt, info, length, expected_prk, okm = params
-
     prk = hkdf_extract(
         algorithm,
-        binascii.unhexlify(ikm),
-        binascii.unhexlify(salt),
+        binascii.unhexlify(params["ikm"]),
+        binascii.unhexlify(params["salt"]),
         backend=backend
     )
 
-    assert prk == binascii.unhexlify(expected_prk)
+    assert prk == binascii.unhexlify(params["prk"])
 
 
 def hkdf_expand_test(backend, algorithm, params):
-    ikm, salt, info, length, prk, expected_okm = params
-
     okm = hkdf_expand(
         algorithm,
-        binascii.unhexlify(prk),
-        binascii.unhexlify(info),
-        length,
+        binascii.unhexlify(params["prk"]),
+        binascii.unhexlify(params["info"]),
+        int(params["l"]),
         backend=backend
     )
 
-    assert okm == binascii.unhexlify(expected_okm)
+    assert okm == binascii.unhexlify(params["okm"])
 
 
 def generate_hkdf_test(param_loader, path, file_names, algorithm):