Dropped length argument from nettle_set_key_func.set_key-changes

1 files changed, 46 insertions, 78 deletions

diff --git a/testsuite/blowfish-test.c b/testsuite/blowfish-test.c
index 2cac994a..cadeda5f 100644
--- a/testsuite/blowfish-test.c
+++ b/testsuite/blowfish-test.c
@@ -2,86 +2,54 @@
 #include "nettle-internal.h"
 #include "blowfish.h"
 
+static void
+test_blowfish(const struct tstring *key,
+	      const struct tstring *cleartext,
+	      const struct tstring *ciphertext)
+{
+  struct blowfish_ctx ctx;
+  uint8_t *data = xalloc(cleartext->length);
+  size_t length;
+  ASSERT (cleartext->length == ciphertext->length);
+  length = cleartext->length;
+
+  blowfish_set_key(&ctx, key->length, key->data);
+  blowfish_encrypt(&ctx, length, data, cleartext->data);
+
+  if (!MEMEQ(length, data, ciphertext->data))
+    {
+      fprintf(stderr, "Encrypt failed:\nInput:");
+      tstring_print_hex(cleartext);
+      fprintf(stderr, "\nOutput: ");
+      print_hex(length, data);
+      fprintf(stderr, "\nExpected:");
+      tstring_print_hex(ciphertext);
+      fprintf(stderr, "\n");
+      FAIL();
+    }
+  blowfish_set_key(&ctx, key->length, key->data);
+  blowfish_decrypt(&ctx, length, data, data);
+
+  if (!MEMEQ(length, data, cleartext->data))
+    {
+      fprintf(stderr, "Decrypt failed:\nInput:");
+      tstring_print_hex(ciphertext);
+      fprintf(stderr, "\nOutput: ");
+      print_hex(length, data);
+      fprintf(stderr, "\nExpected:");
+      tstring_print_hex(cleartext);
+      fprintf(stderr, "\n");
+      FAIL();
+    }
+
+  free(data);
+}
+
 void
 test_main(void)
 {
   /* 208 bit key. Test from GNUPG. */
-  test_cipher(&nettle_blowfish128,
-	      SDATA("abcdefghijklmnopqrstuvwxyz"),
-	      SDATA("BLOWFISH"),
-	      SHEX("32 4E D0 FE F4 13 A2 03"));
+  test_blowfish(SDATA("abcdefghijklmnopqrstuvwxyz"),
+		SDATA("BLOWFISH"),
+		SHEX("32 4E D0 FE F4 13 A2 03"));
 }
-/* FIXME: All values below are bogus. */
-#if 0
-
-/* 128 bit keys */
-H(msg, "506812A45F08C889 B97F5980038B8359");
-
-blowfish_set_key(&ctx, 16,  H("0001020305060708 0A0B0C0D0F101112"));
-blowfish_encrypt(&ctx, BLOWFISH_BLOCK_SIZE, cipher, msg);
-if (!MEMEQ(16, cipher, H("D8F532538289EF7D 06B506A4FD5BE9C9")))
-  FAIL;
-
-blowfish_decrypt(&ctx, BLOWFISH_BLOCK_SIZE, clear, cipher);
-if (!MEMEQ(16, msg, clear))
-  FAIL;
-
-H(msg, "5C6D71CA30DE8B8B 00549984D2EC7D4B");
-
-blowfish_set_key(&ctx, 16,  H("14151617191A1B1C 1E1F202123242526"));
-blowfish_encrypt(&ctx, BLOWFISH_BLOCK_SIZE, cipher, msg);
-if (!MEMEQ(16, cipher, H("59AB30F4D4EE6E4F F9907EF65B1FB68C")))
-  FAIL;
-
-blowfish_decrypt(&ctx, BLOWFISH_BLOCK_SIZE, clear, cipher);
-if (!MEMEQ(16, msg, clear))
-  FAIL;
-
-H(msg, "53F3F4C64F8616E4 E7C56199F48F21F6");
-
-blowfish_set_key(&ctx, 16,  H("28292A2B2D2E2F30 323334353738393A"));
-blowfish_encrypt(&ctx, BLOWFISH_BLOCK_SIZE, cipher, msg);
-if (!MEMEQ(16, cipher, H("BF1ED2FCB2AF3FD4 1443B56D85025CB1")))
-  FAIL;
-
-blowfish_decrypt(&ctx, BLOWFISH_BLOCK_SIZE, clear, cipher);
-if (!MEMEQ(16, msg, clear))
-  FAIL;
-
-H(msg, "F5F4F7F684878689 A6A7A0A1D2CDCCCF");
-
-blowfish_set_key(&ctx, 16,  H("A0A1A2A3A5A6A7A8 AAABACADAFB0B1B2"));
-blowfish_encrypt(&ctx, BLOWFISH_BLOCK_SIZE, cipher, msg);
-if (!MEMEQ(16, cipher, H("CE52AF650D088CA5 59425223F4D32694")))
-  FAIL;
-
-blowfish_decrypt(&ctx, BLOWFISH_BLOCK_SIZE, clear, cipher);
-if (!MEMEQ(16, msg, clear))
-  FAIL;
-
-/* 192 bit keys */
-H(msg, "2D33EEF2C0430A8A 9EBF45E809C40BB6");
-
-blowfish_set_key(&ctx, 24,  H("0001020305060708 0A0B0C0D0F101112"
-			 "14151617191A1B1C"));
-blowfish_encrypt(&ctx, BLOWFISH_BLOCK_SIZE, cipher, msg);
-if (!MEMEQ(16, cipher, H("DFF4945E0336DF4C 1C56BC700EFF837F")))
-  FAIL;
-
-blowfish_decrypt(&ctx, BLOWFISH_BLOCK_SIZE, clear, cipher);
-if (!MEMEQ(16, msg, clear))
-  FAIL;
-
-/* 256 bit keys */
-H(msg, "834EADFCCAC7E1B30664B1ABA44815AB");
-
-blowfish_set_key(&ctx, 32,  H("0001020305060708 0A0B0C0D0F101112"
-			 "14151617191A1B1C 1E1F202123242526"));
-blowfish_encrypt(&ctx, BLOWFISH_BLOCK_SIZE, cipher, msg);
-if (!MEMEQ(16, cipher, H("1946DABF6A03A2A2 C3D0B05080AED6FC")))
-  FAIL;
-
-blowfish_decrypt(&ctx, BLOWFISH_BLOCK_SIZE, clear, cipher);
-if (!MEMEQ(16, msg, clear))
-  FAIL;
-#endif