fix

[oweals/gnunet.git] / src / util / crypto_hash.c

diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index 879285772e9f4bbd1b36f95d01b48e836b362562..ab6fc28cfcb35e1c46c5673e1999e44122b5a3b3 100644 (file)
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -127,6 +127,7 @@ file_hash_finish (struct GNUNET_CRYPTO_FileHashContext *fhc,
   GNUNET_free (fhc->filename);
   if (!GNUNET_DISK_handle_invalid (fhc->fh))
     GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fhc->fh));
+  gcry_md_close (fhc->md);
   GNUNET_free (fhc);            /* also frees fhc->buffer */
 }
 
@@ -162,7 +163,6 @@ file_hash_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     {
       res = (GNUNET_HashCode *) gcry_md_read (fhc->md, GCRY_MD_SHA512);
       file_hash_finish (fhc, res);
-      gcry_md_close (fhc->md);
       return;
     }
   fhc->task 
@@ -539,7 +539,7 @@ void
 GNUNET_CRYPTO_hmac_derive_key(struct GNUNET_CRYPTO_AuthKey *key,
                               const struct GNUNET_CRYPTO_AesSessionKey *rkey,
                               const void *salt,
-                              const size_t salt_len,
+                              size_t salt_len,
                               ...)
 {
   va_list argp;
@@ -562,14 +562,14 @@ void
 GNUNET_CRYPTO_hmac_derive_key_v(struct GNUNET_CRYPTO_AuthKey *key,
                                 const struct GNUNET_CRYPTO_AesSessionKey *rkey,
                                 const void *salt,
-                                const size_t salt_len,
+                                size_t salt_len,
                                va_list argp)
 {
   GNUNET_CRYPTO_kdf_v (key->key,
                       sizeof(key->key), 
                       salt, salt_len, 
                       rkey->key,
-                      sizeof(rkey->key),  /* FIXME: this is likely wrong! */
+                      sizeof(rkey->key),
                       argp);
 }
 
@@ -589,7 +589,7 @@ GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key,
                    GNUNET_HashCode *hmac)
 {
   gcry_md_hd_t md;
-  unsigned char *mc;
+  const unsigned char *mc;
 
   GNUNET_assert (GPG_ERR_NO_ERROR == gcry_md_open (&md,
                                                   GCRY_MD_SHA512,