Reorganized, and removed `-sched' test set.

diff --git a/tests/blowfish b/tests/blowfish
index 4eb4bc1..1727cc0 100644 (file)
--- 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,13 +42,11 @@ 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                                             
        fedcba9876543210        f9ad597c49db005e;