pbkdf2: Reorganized loops.

diff --git a/ChangeLog b/ChangeLog
index 05c463c4e4669f64b2858b5267d4629376ec83de..6dbb80ff87608b46f95b02ff8328d2a24ac0d7a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-09-21  Niels Möller  <nisse@lysator.liu.se>
 
+       * pbkdf2.c (pbkdf2): assert that iterations > 0. Reorganized
+       loops.
+
        * nettle.texinfo (Cipher functions): Stress that the salsa20 hash
        function is not suitable as a general hash function.
 

diff --git a/pbkdf2.c b/pbkdf2.c
index 3d8a0937e5e31545af54848f42bcccf20eb5a2c7..10e6bc20cd49582bc84af1be96d728c7c41e0d32 100644 (file)
--- a/pbkdf2.c
+++ b/pbkdf2.c
@@ -5,7 +5,7 @@
 
 /* nettle, low-level cryptographics library
  *
- * Copyright (C) 2012 Simon Josefsson
+ * Copyright (C) 2012 Simon Josefsson, Niels Möller
  *
  * The nettle library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -48,47 +48,44 @@ pbkdf2 (void *mac_ctx,
   TMP_DECL(U, uint8_t, NETTLE_MAX_HASH_DIGEST_SIZE);
   TMP_DECL(T, uint8_t, NETTLE_MAX_HASH_DIGEST_SIZE);
   
-  unsigned int u;
-  unsigned int l;
-  unsigned int r;
-  unsigned int i;
-  char tmp[4];
+  unsigned i;
 
-  if (iterations == 0)
-    return;
+  assert (iterations > 0);
 
   if (length == 0)
     return;
 
-  l = ((length - 1) / digest_size) + 1;
-  r = length - (l - 1) * digest_size;
-
   TMP_ALLOC (U, digest_size);
   TMP_ALLOC (T, digest_size);
 
-  for (i = 1; i <= l; i++)
+  for (i = 1;;
+       i++, dst += digest_size, length -= digest_size)
     {
-      memset (T, 0, digest_size);
-
-      for (u = 1; u <= iterations; u++)
+      uint8_t tmp[4];
+      uint8_t *prev;
+      unsigned u;
+      
+      WRITE_UINT32 (tmp, i);
+      
+      update (mac_ctx, salt_length, salt);
+      update (mac_ctx, sizeof(tmp), tmp);
+      digest (mac_ctx, digest_size, T);
+
+      prev = T;
+      
+      for (u = 1; u < iterations; u++, prev = U)
        {
-         if (u == 1)
-           {
-             WRITE_UINT32 (tmp, i);
-
-             update (mac_ctx, salt_length, salt);
-             update (mac_ctx, 4, tmp);
-           }
-         else
-           {
-             update (mac_ctx, digest_size, U);
-           }
-
+         update (mac_ctx, digest_size, prev);
          digest (mac_ctx, digest_size, U);
 
          memxor (T, U, digest_size);
        }
 
-      memcpy (dst + (i - 1) * digest_size, T, i == l ? r : digest_size);
+      if (length <= digest_size)
+       {
+         memcpy (dst, T, length);
+         return;
+       }
+      memcpy (dst, T, digest_size);
     }
 }