Merge pull request #515 from dreid/nisted-hkdf-vectors
Convert the HKDF vectors to the NIST format.
diff --git a/tests/hazmat/primitives/vectors/KDF/rfc-5869-HKDF-SHA1.txt b/tests/hazmat/primitives/vectors/KDF/rfc-5869-HKDF-SHA1.txt
index 598ecaa..b3fd03a 100644
--- a/tests/hazmat/primitives/vectors/KDF/rfc-5869-HKDF-SHA1.txt
+++ b/tests/hazmat/primitives/vectors/KDF/rfc-5869-HKDF-SHA1.txt
@@ -1,6 +1,8 @@
# A.4. Test Case 4
# Basic test case with SHA-1
+COUNT = 4
+
Hash = SHA-1
IKM = 0b0b0b0b0b0b0b0b0b0b0b
salt = 000102030405060708090a0b0c
@@ -13,6 +15,8 @@
# A.5. Test Case 5
# Test with SHA-1 and longer inputs/outputs
+COUNT = 5
+
Hash = SHA-1
IKM = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f
salt = 606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeaf
@@ -25,6 +29,8 @@
# A.6. Test Case 6
# Test with SHA-1 and zero-length salt/info
+COUNT = 6
+
Hash = SHA-1
IKM = 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
salt =
@@ -38,6 +44,8 @@
# Test with SHA-1, salt not provided (defaults to HashLen zero octets),
# zero-length info
+COUNT = 7
+
Hash = SHA-1
IKM = 0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
salt =
diff --git a/tests/hazmat/primitives/vectors/KDF/rfc-5869-HKDF-SHA256.txt b/tests/hazmat/primitives/vectors/KDF/rfc-5869-HKDF-SHA256.txt
index 170dd13..9068a73 100644
--- a/tests/hazmat/primitives/vectors/KDF/rfc-5869-HKDF-SHA256.txt
+++ b/tests/hazmat/primitives/vectors/KDF/rfc-5869-HKDF-SHA256.txt
@@ -1,6 +1,8 @@
# A.1. Test Case 1
# Basic test case with SHA-256
+COUNT = 1
+
Hash = SHA-256
IKM = 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
salt = 000102030405060708090a0b0c
@@ -12,6 +14,8 @@
# A.2. Test Case 2
# Test with SHA-256 and longer inputs/outputs
+COUNT = 2
+
Hash = SHA-256
IKM = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f
salt = 606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeaf
@@ -24,6 +28,8 @@
# A.3. Test Case 3
# Test with SHA-256 and zero-length salt/info
+COUNT = 3
+
Hash = SHA-256
IKM = 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
salt =