[GNUnet-SVN] r7621 - libmicrohttpd/src/daemon/https/x509

[gnunet]

Author: grothoff
Date: 2008-08-24 17:38:15 -0600 (Sun, 24 Aug 2008)
New Revision: 7621

Modified:
   libmicrohttpd/src/daemon/https/x509/pkcs12.c
Log:
simplify

Modified: libmicrohttpd/src/daemon/https/x509/pkcs12.c
===================================================================
--- libmicrohttpd/src/daemon/https/x509/pkcs12.c        2008-08-24 23:36:26 UTC 
(rev 7620)
+++ libmicrohttpd/src/daemon/https/x509/pkcs12.c        2008-08-24 23:38:15 UTC 
(rev 7621)
@@ -858,7 +858,6 @@
 {
   opaque salt[8], key[20];
   int result;
-  const int iter = 1;
   mac_hd_t td1 = NULL;
   gnutls_datum_t tmp = { NULL, 0 };
   opaque sha_mac[20];
@@ -888,25 +887,10 @@
       goto cleanup;
     }
 
-  /* write the iterations
-   */
-
-  if (iter > 1)
-    {
-      result =
-        _gnutls_x509_write_uint32 (pkcs12->pkcs12, "macData.iterations",
-                                   iter);
-      if (result < 0)
-        {
-          gnutls_assert ();
-          goto cleanup;
-        }
-    }
-
   /* Generate the key.
    */
   result = _pkcs12_string_to_key (3 /*MAC*/, salt, sizeof (salt),
-                                  iter, pass, sizeof (key), key);
+                                  1, pass, sizeof (key), key);
   if (result < 0)
     {
       gnutls_assert ();