/* 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
/* 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"
unsigned int i;
unsigned int k;
int rc;
+ char *tmp;
+ size_t tmplen = Slen + 4;
if (c == 0)
return GC_PKCS5_INVALID_ITERATION_COUNT;
* integer greater than, or equal to, x.
*/
- l = dkLen / hLen;
- if (dkLen % hLen)
- l++;
+ l = ((dkLen - 1) / hLen) + 1;
r = dkLen - (l - 1) * hLen;
/*
*
*/
+ tmp = malloc (tmplen);
+ if (tmp == NULL)
+ return GC_MALLOC_ERROR;
+
+ memcpy (tmp, S, Slen);
+
for (i = 1; i <= l; i++)
{
memset (T, 0, hLen);
{
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];
memcpy (DK + (i - 1) * hLen, T, i == l ? r : hLen);
}
+ free (tmp);
+
return GC_OK;
}