Add some more vectors, and a whinge about how Skipjack test vectors are.

diff --git a/tests/skipjack b/tests/skipjack
index cfdb16f..a173ec5 100644 (file)
--- a/tests/skipjack
+++ b/tests/skipjack
@@ -1,9 +1,48 @@
-# $Id: skipjack,v 1.1 2000/07/15 15:39:48 mdw Exp $
+# $Id: skipjack,v 1.2 2000/08/01 00:29:15 mdw Exp $
 #
 # Test vectors for Skipjack
 
 # --- From the Skipjack definition ---
 
 skipjack {
+
+  # --- The official Skipjack test vector ---
+  #
+  # It's a bit piss-poor that they only provide one test-vector here.
+
   00998877665544332211 33221100ddccbbaa 2587cae27a12d300;
+
+  # --- From KEA test vectors ---
+  #
+  # The Skipjack algorithm is used by the KEA to derive the final key.
+  # Unfortunately, the test vectors given in the Skipjack/KEA spec don't
+  # match my (or anyone else's!) implementation.  These are the values
+  # which seem to be generally agreed.
+
+  e7496e99e4628b7f9ffb 99ccfe2b90fd550b 60a73d387b517fca; 
+  e7496e99e4628b7f9ffb 60a73d387b517fca 24c90cb05d668b27;
+  e5caf4dcc70e55f1dd90 b71cb0d009af2765 64f4877ae68a8a62;
+  e5caf4dcc70e55f1dd90 64f4877ae68a8a62 fee778a838a601cd;
+
+  # --- These are the results expected from the KEA spec ---
+  #
+  # A `?' indicates that I don't know what that digit's meant to be.  I've
+  # derived the top 16 bits of the intermediate results from the spec.
+
+  # e7496e99e4628b7f9ffb 99ccfe2b90fd550b 2f30????????????;
+  # e7496e99e4628b7f9ffb 2f30???????????? 740839dee833add4;
+  # e5caf4dcc70e55f1dd90 b71cb0d009af2765 8e27????????????;
+  # e5caf4dcc70e55f1dd90 8e27???????????? 97fd1c6bd86bc439;
+
+  # --- Some more test vectors ---
+  #
+  # These are dreamed up by me.  The above tests don't actually exhaustively
+  # test the F-table.  There are 16 entries unaccounted for.  The keys and
+  # plaintexts were generated using fibrand with seed 0.
+
+  cde4bef260d7bcda1635 47d348b7551195e7 f17b3070144aebea;
+  7022907dd1dff7dac5c9 941d26d0c6eb14ad a055d02c5e0eae8d;
+  568f86edd1dc9268eeee 533285a6ed810c9b b4c22f4fb74c35dc;
+  689daaa9060d2d4b6003 062365b0a54364c7 08698d8786f80d16;
+  6c160f11896c4794846e cfa14a7130c9f137 d6db848b7cecdd39;
 }