[GNUnet-SVN] r13226 - in gnunet/src: include util

[gnunet]

Author: durner
Date: 2010-10-08 15:48:51 +0200 (Fri, 08 Oct 2010)
New Revision: 13226

Modified:
   gnunet/src/include/gnunet_crypto_lib.h
   gnunet/src/util/crypto_aes.c
   gnunet/src/util/crypto_hash.c
Log:
style improvements

Modified: gnunet/src/include/gnunet_crypto_lib.h
===================================================================
--- gnunet/src/include/gnunet_crypto_lib.h      2010-10-08 13:47:49 UTC (rev 
13225)
+++ gnunet/src/include/gnunet_crypto_lib.h      2010-10-08 13:48:51 UTC (rev 
13226)
@@ -333,8 +333,9 @@
  */
 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 @@
  */
 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 @@
 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 @@
 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,
                               ...);
 
 /**

Modified: gnunet/src/util/crypto_aes.c
===================================================================
--- gnunet/src/util/crypto_aes.c        2010-10-08 13:47:49 UTC (rev 13225)
+++ gnunet/src/util/crypto_aes.c        2010-10-08 13:48:51 UTC (rev 13226)
@@ -158,8 +158,9 @@
  */
 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 @@
  */
 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);

Modified: gnunet/src/util/crypto_hash.c
===================================================================
--- gnunet/src/util/crypto_hash.c       2010-10-08 13:47:49 UTC (rev 13225)
+++ gnunet/src/util/crypto_hash.c       2010-10-08 13:48:51 UTC (rev 13226)
@@ -539,7 +539,7 @@
 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 @@
 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_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,