X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgc-pbkdf2-sha1.c;h=3c864c6d63751df4ec2422610ea7407969045a53;hb=cbb4401a52ac870ccfe0fbc1e1503e4741ca8fd5;hp=afdfcdb06585886fd2a7c93bc3f89454b09bcbad;hpb=9045e5f89f3d9b8d1033a67f47b4859e2618583c;p=gnulib.git

diff --git a/lib/gc-pbkdf2-sha1.c b/lib/gc-pbkdf2-sha1.c
index afdfcdb06..3c864c6d6 100644
--- a/lib/gc-pbkdf2-sha1.c
+++ b/lib/gc-pbkdf2-sha1.c
@@ -1,5 +1,5 @@
 /* gc-pbkdf2-sha1.c --- Password-Based Key Derivation Function a'la PKCS#5
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 /* Written by Simon Josefsson.  The comments in this file are taken
    from RFC 2898.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gc.h"
 
@@ -68,6 +66,8 @@ gc_pbkdf2_sha1 (const char *P, size_t Plen,
   unsigned int i;
   unsigned int k;
   int rc;
+  char *tmp;
+  size_t tmplen = Slen + 4;
 
   if (c == 0)
     return GC_PKCS5_INVALID_ITERATION_COUNT;
@@ -98,9 +98,7 @@ gc_pbkdf2_sha1 (const char *P, size_t Plen,
    *        integer greater than, or equal to, x.
    */
 
-  l = dkLen / hLen;
-  if (dkLen % hLen)
-    l++;
+  l = ((dkLen - 1) / hLen) + 1;
   r = dkLen - (l - 1) * hLen;
 
   /*
@@ -145,6 +143,12 @@ gc_pbkdf2_sha1 (const char *P, size_t Plen,
    *
    */
 
+  tmp = malloc (tmplen);
+  if (tmp == NULL)
+    return GC_MALLOC_ERROR;
+
+  memcpy (tmp, S, Slen);
+
   for (i = 1; i <= l; i++)
     {
       memset (T, 0, hLen);
@@ -153,28 +157,21 @@ gc_pbkdf2_sha1 (const char *P, size_t Plen,
 	{
 	  if (u == 1)
 	    {
-	      char *tmp;
-	      size_t tmplen = Slen + 4;
-
-	      tmp = malloc (tmplen);
-	      if (tmp == NULL)
-		return GC_MALLOC_ERROR;
-
-	      memcpy (tmp, S, Slen);
 	      tmp[Slen + 0] = (i & 0xff000000) >> 24;
 	      tmp[Slen + 1] = (i & 0x00ff0000) >> 16;
 	      tmp[Slen + 2] = (i & 0x0000ff00) >> 8;
 	      tmp[Slen + 3] = (i & 0x000000ff) >> 0;
 
 	      rc = gc_hmac_sha1 (P, Plen, tmp, tmplen, U);
-
-	      free (tmp);
 	    }
 	  else
 	    rc = gc_hmac_sha1 (P, Plen, U, hLen, U);
 
 	  if (rc != GC_OK)
-	    return rc;
+	    {
+	      free (tmp);
+	      return rc;
+	    }
 
 	  for (k = 0; k < hLen; k++)
 	    T[k] ^= U[k];
@@ -183,5 +180,7 @@ gc_pbkdf2_sha1 (const char *P, size_t Plen,
       memcpy (DK + (i - 1) * hLen, T, i == l ? r : hLen);
     }
 
+  free (tmp);
+
   return GC_OK;
 }