X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/e75d775e7c8dd58f06e699371f44928535a59c44..ba6e6b64033b1f9de49feccb5c9cd438354481f7:/tests/blowfish

diff --git a/tests/blowfish b/tests/blowfish
index 4eb4bc1..9f7075e 100644
--- a/tests/blowfish
+++ b/tests/blowfish
@@ -1,12 +1,13 @@
 # Test vectors for Blowfish
 #
-# $Id: blowfish,v 1.2 2000/07/15 10:03:13 mdw Exp $
-
-# --- Main block cipher ---
-#
-# Taken from Bruce Schneier's web pages, I think...
+# $Id: blowfish,v 1.3 2001/04/29 17:38:07 mdw Exp $
 
 blowfish {
+
+  # --- Main block cipher ---
+  #
+  # Taken from Bruce Schneier's web pages, I think...
+
   0000000000000000 0000000000000000 4ef997456198dd78;
   ffffffffffffffff ffffffffffffffff 51866fd5b85ecb8a;
   3000000000000000 1000000000000001 7d856f9a613063f2;
@@ -41,80 +42,78 @@ blowfish {
   ffffffffffffffff 0000000000000000 f21e9a77b71c49bc;
   0123456789abcdef 0000000000000000 245946885754369a;
   fedcba9876543210 ffffffffffffffff 6b5c5a9c5d9e0a5a;
-}
 
-# --- Key schedule test ---
-#
-# From wherever the previous tests came from.
+  # --- Key schedule test ---
+  #
+  # From wherever the previous tests came from.
 
-blowfish-sched {
-  f0						  
+  f0
 	fedcba9876543210	f9ad597c49db005e;
 
-  f0e1						  
+  f0e1
 	fedcba9876543210	e91d21c1d961a6d6;
 
-  f0e1d2					  
+  f0e1d2
 	fedcba9876543210	e9c2b70a1bc65cf3;
 
-  f0e1d2c3					  
+  f0e1d2c3
 	fedcba9876543210	be1e639408640f05;
 
-  f0e1d2c3b4					  
+  f0e1d2c3b4
 	fedcba9876543210	b39e44481bdb1e6e;
 
-  f0e1d2c3b4a5					  
+  f0e1d2c3b4a5
 	fedcba9876543210	9457aa83b1928c0d;
 
-  f0e1d2c3b4a596				  
+  f0e1d2c3b4a596
 	fedcba9876543210	8bb77032f960629d;
 
-  f0e1d2c3b4a59687				  
+  f0e1d2c3b4a59687
 	fedcba9876543210	e87a244e2cc85e82;
 
-  f0e1d2c3b4a5968778				  
+  f0e1d2c3b4a5968778
 	fedcba9876543210	15750e7a4f4ec577;
 
-  f0e1d2c3b4a596877869				  
+  f0e1d2c3b4a596877869
 	fedcba9876543210	122ba70b3ab64ae0;
 
-  f0e1d2c3b4a5968778695a			  
+  f0e1d2c3b4a5968778695a
 	fedcba9876543210	3a833c9affc537f6;
 
-  f0e1d2c3b4a5968778695a4b			  
+  f0e1d2c3b4a5968778695a4b
 	fedcba9876543210	9409da87a90f6bf2;
 
-  f0e1d2c3b4a5968778695a4b3c			  
+  f0e1d2c3b4a5968778695a4b3c
 	fedcba9876543210	884f80625060b8b4;
 
-  f0e1d2c3b4a5968778695a4b3c2d			  
+  f0e1d2c3b4a5968778695a4b3c2d
 	fedcba9876543210	1f85031c19e11968;
 
-  f0e1d2c3b4a5968778695a4b3c2d1e		  
+  f0e1d2c3b4a5968778695a4b3c2d1e
 	fedcba9876543210	79d9373a714ca34f;
 
-  f0e1d2c3b4a5968778695a4b3c2d1e0f		  
+  f0e1d2c3b4a5968778695a4b3c2d1e0f
 	fedcba9876543210	93142887ee3be15c;
 
-  f0e1d2c3b4a5968778695a4b3c2d1e0f00		  
+  f0e1d2c3b4a5968778695a4b3c2d1e0f00
 	fedcba9876543210	03429e838ce2d14b;
 
-  f0e1d2c3b4a5968778695a4b3c2d1e0f0011		  
+  f0e1d2c3b4a5968778695a4b3c2d1e0f0011
 	fedcba9876543210	a4299e27469ff67b;
 
-  f0e1d2c3b4a5968778695a4b3c2d1e0f001122	  
+  f0e1d2c3b4a5968778695a4b3c2d1e0f001122
 	fedcba9876543210	afd5aed1c1bc96a8;
 
-  f0e1d2c3b4a5968778695a4b3c2d1e0f00112233	  
+  f0e1d2c3b4a5968778695a4b3c2d1e0f00112233
 	fedcba9876543210	10851c0e3858da9f;
 
-  f0e1d2c3b4a5968778695a4b3c2d1e0f0011223344	  
+  f0e1d2c3b4a5968778695a4b3c2d1e0f0011223344
 	fedcba9876543210	e6f51ed79b9db21f;
 
-  f0e1d2c3b4a5968778695a4b3c2d1e0f001122334455	  
+  f0e1d2c3b4a5968778695a4b3c2d1e0f001122334455
 	fedcba9876543210	64a6e14afd36b46f;
 
-  f0e1d2c3b4a5968778695a4b3c2d1e0f00112233445566  
+  f0e1d2c3b4a5968778695a4b3c2d1e0f00112233445566
 	fedcba9876543210	80c7d7d45a5479ad;
 
   f0e1d2c3b4a5968778695a4b3c2d1e0f0011223344556677