style improvements

diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index fbe8b42c3c7d97fc18f0973b738e29ee692076cd..8b1379e45aafac76b25cec4da3c5f9a5c7f259e5 100644 (file)
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -333,8 +333,9 @@ ssize_t GNUNET_CRYPTO_aes_decrypt (const void *block,
  */
 void
 GNUNET_CRYPTO_aes_derive_iv (struct GNUNET_CRYPTO_AesInitializationVector *iv,
-    const struct GNUNET_CRYPTO_AesSessionKey *skey, void *salt,
-    size_t salt_len, ...);
+    const struct GNUNET_CRYPTO_AesSessionKey *skey,
+    const void *salt, size_t salt_len,
+    ...);
 
 
 /**
@@ -347,8 +348,9 @@ GNUNET_CRYPTO_aes_derive_iv (struct GNUNET_CRYPTO_AesInitializationVector *iv,
  */
 void
 GNUNET_CRYPTO_aes_derive_iv_v (struct GNUNET_CRYPTO_AesInitializationVector *iv,
-    const struct GNUNET_CRYPTO_AesSessionKey *skey, void *salt,
-    size_t salt_len, va_list argp);
+    const struct GNUNET_CRYPTO_AesSessionKey *skey,
+    const void *salt, size_t salt_len,
+    va_list argp);
 
 
 /**
@@ -583,7 +585,7 @@ 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);
 
 
@@ -599,7 +601,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,
                               ...);
 
 /**

diff --git a/src/util/crypto_aes.c b/src/util/crypto_aes.c
index bf618ffc37bf72d6b8774d034dbbf1977fb61468..1ab4a7301a87526a655476e22cdb0f50c06af5e9 100644 (file)
--- a/src/util/crypto_aes.c
+++ b/src/util/crypto_aes.c
@@ -158,8 +158,9 @@ GNUNET_CRYPTO_aes_decrypt (const void *block,
  */
 void
 GNUNET_CRYPTO_aes_derive_iv (struct GNUNET_CRYPTO_AesInitializationVector *iv,
-    const struct GNUNET_CRYPTO_AesSessionKey *skey, void *salt,
-    size_t salt_len, ...)
+    const struct GNUNET_CRYPTO_AesSessionKey *skey,
+    const void *salt, size_t salt_len,
+    ...)
 {
   va_list argp;
 
@@ -178,8 +179,9 @@ GNUNET_CRYPTO_aes_derive_iv (struct GNUNET_CRYPTO_AesInitializationVector *iv,
  */
 void
 GNUNET_CRYPTO_aes_derive_iv_v (struct GNUNET_CRYPTO_AesInitializationVector *iv,
-    const struct GNUNET_CRYPTO_AesSessionKey *skey, void *salt,
-    size_t salt_len, va_list argp)
+    const struct GNUNET_CRYPTO_AesSessionKey *skey,
+    const void *salt, size_t salt_len,
+    va_list argp)
 {
   GNUNET_CRYPTO_kdf_v (iv->iv, sizeof(iv->iv), salt, salt_len, skey->key,
       sizeof(skey->key), argp);

diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index 879285772e9f4bbd1b36f95d01b48e836b362562..2217e622367da5bdf976ee1f809e68206f15068b 100644 (file)
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -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,