[GNUnet-SVN] r13381 - gnunet/src/util

[gnunet]

Author: durner
Date: 2010-10-22 23:46:02 +0200 (Fri, 22 Oct 2010)
New Revision: 13381

Modified:
   gnunet/src/util/crypto_hkdf.c
Log:
minor improvements

Modified: gnunet/src/util/crypto_hkdf.c
===================================================================
--- gnunet/src/util/crypto_hkdf.c       2010-10-22 21:18:45 UTC (rev 13380)
+++ gnunet/src/util/crypto_hkdf.c       2010-10-22 21:46:02 UTC (rev 13381)
@@ -161,10 +161,6 @@
   if (k == 0)
     return GNUNET_SYSERR;
 
-  // FIXME: what is the check for?
-  if (out_len > (2 ^ 32 * k))
-    return GNUNET_SYSERR;
-
   if (gcry_md_open(&xtr, xtr_algo, GCRY_MD_FLAG_HMAC) != GPG_ERR_NO_ERROR)
     return GNUNET_SYSERR;
 
@@ -248,10 +244,9 @@
       if (t > 0)
         {
           memcpy (plain, result - k, k);
-          memset (plain + k + ctx_len, i + 1, 1);
+          i++;
         }
-      else
-        memset (plain + k + ctx_len, 1, 1);
+      memset (plain + k + ctx_len, i, 1);
       gcry_md_reset (prf);
 #if DEBUG_HKDF
       dump("K(t):d", plain, plain_len);