Improve test vectors.

diff --git a/tests/pkcs12_s2k.c b/tests/pkcs12_s2k.c
index f576137b356dd1834137d07a2e979ce3dca1d9ce..07a34e2aa70780ec35a4764fe06838b92b6ff500 100644 (file)
--- a/tests/pkcs12_s2k.c
+++ b/tests/pkcs12_s2k.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008 Free Software Foundation
+ * Copyright (C) 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Simon Josefsson
  *
@@ -52,12 +52,50 @@ static const char *values[] = {
 /* 2.1 */
   "de8dd3ffd59b65d3d5f59a1f71d7add582741f7752a786c045953e727e4465c0",
 /* 2.2 */
+#ifndef PKCS12_BROKEN_KEYGEN
+  "9dd7f19e5e6aee5c5008b5deefd35889ab75193594ed49a605df4e93e7c2a155",
+#else
   "9dd7f19e5e6aee5c5008b5deefd35889ab7519356f13478ecdee593c5ed689b1",
-/* 3.0 */
+#endif
+  /* 3.0 */
   "1c165e5a291a1539f3dbcf82a3e6ed566eb9d50ad4b0b3b57b599b08f0531236",
 /* 3.1 */
   "5c9abee3cde31656eedfc131b7c2f8061032a3c705961ee2306a826c8b4b1a76",
-/* 3.2 */ "a9c94e0acdaeaea54d1b1b681c3b64916396a352dea7ffe635fb2c11d8502e98"
+/* 3.2 */
+  "a9c94e0acdaeaea54d1b1b681c3b64916396a352dea7ffe635fb2c11d8502e98"
+};
+
+/* Values derived from
+   http://www.drh-consultancy.demon.co.uk/test.txt */
+static struct
+{
+  int id;
+  const char *password;
+  const char *salt;
+  size_t iter;
+  size_t keylen;
+  const char *key;
+} tv[] = {
+  { 1, "smeg", "\x0A\x58\xCF\x64\x53\x0D\x82\x3F", 1, 24,
+    "8aaae6297b6cb04642ab5b077851284eb7128f1a2a7fbca3" },
+  { 2, "smeg", "\x0A\x58\xCF\x64\x53\x0D\x82\x3F", 1, 8,
+    "79993dfe048d3b76" },
+  { 1, "smeg", "\x64\x2B\x99\xAB\x44\xFB\x4B\x1F", 1, 24,
+    "f3a95fec48d7711e985cfe67908c5ab79fa3d7c5caa5d966" },
+  { 2, "smeg", "\x64\x2B\x99\xAB\x44\xFB\x4B\x1F", 1, 8,
+    "c0a38d64a79bea1d" },
+  { 3, "smeg", "\x3D\x83\xC0\xE4\x54\x6A\xC1\x40", 1, 20,
+    "8d967d88f6caa9d714800ab3d48051d63f73a312" },
+  { 1, "queeg", "\x05\xDE\xC9\x59\xAC\xFF\x72\xF7", 1000, 24,
+    "ed2034e36328830ff09df1e1a07dd357185dac0d4f9eb3d4" },
+  { 2, "queeg", "\x05\xDE\xC9\x59\xAC\xFF\x72\xF7", 1000, 8,
+    "11dedad7758d4860" },
+  { 1, "queeg", "\x16\x82\xC0\xFC\x5B\x3F\x7E\xC5", 1000, 24,
+    "483dd6e919d7de2e8e648ba8f862f3fbfbdc2bcb2c02957f" },
+  { 2, "queeg", "\x16\x82\xC0\xFC\x5B\x3F\x7E\xC5", 1000, 8,
+    "9d461d1b00355c50" },
+  { 3, "queeg", "\x26\x32\x16\xFC\xC2\xFA\xB3\x1C", 1000, 20,
+    "5ec4c7a80df652294c3925b6489a7ab857c83476" }
 };
 
 void
@@ -82,11 +120,11 @@ doit (void)
                                          j + i + 15, pw[j], sizeof (key),
                                          key);
          if (rc < 0)
-           fail ("_gnutls_pkcs12_string_to_key failed[0]\n");
+           fail ("_gnutls_pkcs12_string_to_key failed[0]: %d\n", rc);
 
-         if (strcmp
-             (_gnutls_bin2hex (key, sizeof (key), tmp, sizeof (tmp)),
-              values[x]) != 0)
+         if (strcmp (_gnutls_bin2hex (key, sizeof (key),
+                                      tmp, sizeof (tmp)),
+                     values[x]) != 0)
            fail ("_gnutls_pkcs12_string_to_key failed[1]\n");
 
          printf ("ij: %d.%d: %s\n", i, j,
@@ -96,5 +134,23 @@ doit (void)
     }
   printf ("\n");
 
+  for (i = 0; i < sizeof (tv) / sizeof (tv[0]); i++)
+    {
+      rc = _gnutls_pkcs12_string_to_key (tv[i].id, tv[i].salt, 8,
+                                        tv[i].iter, tv[i].password,
+                                        tv[i].keylen, key);
+      if (rc < 0)
+       fail ("_gnutls_pkcs12_string_to_key failed[2]: %d\n", rc);
+
+      if (memcmp (_gnutls_bin2hex (key, tv[i].keylen,
+                                  tmp, sizeof (tmp)),
+                 tv[i].key, tv[i].keylen) != 0)
+       fail ("_gnutls_pkcs12_string_to_key failed[3]\n");
+
+      printf ("tv[%d]: %s\n", i,
+             _gnutls_bin2hex (key, tv[i].keylen, tmp, sizeof (tmp)));
+    }
+  printf ("\n");
+
   success ("_gnutls_pkcs12_string_to_key ok\n");
 }