X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/0f00dc4c8eb47e67bc0f148c2dd109f73a451e0a..a90d420cbe87490c844ae422c966e746d3134b07:/symm/t/sha224

diff --git a/symm/t/sha224 b/symm/t/sha224
index 35e11715..983e9c4e 100644
--- a/symm/t/sha224
+++ b/symm/t/sha224
@@ -1,47 +1,24 @@
 # Test vectors for SHA-224
 
-# --- Basic hash function ---
-
-sha224 {
-
-  # --- Test vectors from the definition [FALSE] ---
+# --- HMAC mode ---
 
-  "abc"
-	23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7;
-  "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-	75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525;
+sha224-hmac {
+  # NIST examples.
 
-  # --- Other tests to trap regression ---
+  "Sample message for keylen<blocklen"
+	000102030405060708090a0b0c0d0e0f101112131415161718191a1b
+	e3d249a8cfb67ef8b7a169e9a0a599714a2cecba65999a51beb8fbbe;
 
-  ""
-	d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f;
-  "a"
-	abd37534c7d9a2efb9465de931cd7055ffdb8879563ae98078d6d6d5;
-  "message digest"
-	2cb21c83ae2f004de7e81c3c7019cbcb65b71ab656b22d6d0c39b8eb;
-  "abcdefghijklmnopqrstuvwxyz"
-	45a5f72c39c5cff2522eb3429799e49e5f44b356ef926bcf390dccc2;
-  "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-	75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525;
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-	bff72b4fcb7d75e5632900ac5f90d219e05e97a7bde72e740db393d9;
-}
+  "Sample message for keylen=blocklen"
+	000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f
+	c7405e3ae058e8cd30b08b4140248581ed174cb34e1224bcc1efc81b;
 
-sha224-rep {
-  "1234567890" 8
-	b50aecbe4e9bb0b57bc5f3ae760a8e01db24f203fb3cdcd13148046e;
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789
-" 23
-	5a86156c37c95ab356e003d569370580737794815f46de7f4834d634;
-  "a" 1000000
-	20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67;
-}
+  "Sample message for keylen=blocklen" # not entirely true
+	000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f60616263
+	91c52509e5af8531601ae6230099d90bef88aaefb961f4080abc014d;
 
-# --- HMAC mode ---
-#
-# Autogenerated, unofficial.
+  # Autogenerated, unofficial.
 
-sha224-hmac {
   "Hi There"
 	0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
 	1abbc7c42cf4ca9f9d7b624564cb72d7b0945ea0a615095904a0fd34;