small fixes and style issues

diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 8cba8a588ffa4c44fee5fad3201f24ca41e99547..08da06c705f0de66150d68362e34c788659a0124 100644 (file)
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -617,9 +617,12 @@ GNUNET_CRYPTO_hmac_derive_key(struct GNUNET_CRYPTO_AuthKey *key,
  * @return GNUNET_YES on success
  */
 int
-GNUNET_CRYPTO_hkdf (void *result, const unsigned long long out_len,
-    int xtr_algo, int prf_algo, const void *xts, const size_t xts_len,
-    const void *skm, const size_t skm_len, ...);
+GNUNET_CRYPTO_hkdf (void *result, 
+                   unsigned long long out_len,
+                   int xtr_algo, int prf_algo, 
+                   const void *xts, size_t xts_len,
+                   const void *skm, size_t skm_len, 
+                   ...);
 
 
 /**
@@ -636,9 +639,13 @@ GNUNET_CRYPTO_hkdf (void *result, const unsigned long long out_len,
  * @return GNUNET_YES on success
  */
 int
-GNUNET_CRYPTO_hkdf_v (void *result, const unsigned long long out_len,
-    int xtr_algo, int prf_algo, const void *xts, const size_t xts_len,
-    const void *skm, const size_t skm_len, va_list argp);
+GNUNET_CRYPTO_hkdf_v (void *result, 
+                     const unsigned long long out_len, /* FIXME: size_t? */
+                     int xtr_algo, 
+                     int prf_algo, 
+                     const void *xts, size_t xts_len,
+                     const void *skm, size_t skm_len, 
+                     va_list argp);
 
 
 /**
@@ -653,9 +660,11 @@ GNUNET_CRYPTO_hkdf_v (void *result, const unsigned long long out_len,
  * @return GNUNET_YES on success
  */
 int
-GNUNET_CRYPTO_kdf_v (void *result, const unsigned long long out_len,
-                    const void *xts, const size_t xts_len, const void *skm,
-                    const size_t skm_len, va_list argp);
+GNUNET_CRYPTO_kdf_v (void *result, 
+                    unsigned long long out_len,
+                    const void *xts, size_t xts_len, 
+                    const void *skm, size_t skm_len, 
+                    va_list argp);
 
 
 /**

diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index 8ec822434d3ce79c5e2408adb2d87390681c0860..879285772e9f4bbd1b36f95d01b48e836b362562 100644 (file)
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -401,9 +401,11 @@ GNUNET_CRYPTO_hash_sum (const GNUNET_HashCode * a,
     result->bits[i] = delta->bits[i] + a->bits[i];
 }
 
+
 void
 GNUNET_CRYPTO_hash_xor (const GNUNET_HashCode * a,
-                        const GNUNET_HashCode * b, GNUNET_HashCode * result)
+                        const GNUNET_HashCode * b,
+                       GNUNET_HashCode * result)
 {
   int i;
   for (i = (sizeof (GNUNET_HashCode) / sizeof (unsigned int)) - 1; i >= 0;
@@ -411,6 +413,7 @@ GNUNET_CRYPTO_hash_xor (const GNUNET_HashCode * a,
     result->bits[i] = a->bits[i] ^ b->bits[i];
 }
 
+
 /**
  * Convert a hashcode into a key.
  */
@@ -430,6 +433,7 @@ GNUNET_CRYPTO_hash_to_aes_key (const GNUNET_HashCode * hc,
           sizeof (struct GNUNET_CRYPTO_AesInitializationVector));
 }
 
+
 /**
  * Obtain a bit from a hashcode.
  * @param code the GNUNET_CRYPTO_hash to index bit-wise
@@ -437,7 +441,8 @@ GNUNET_CRYPTO_hash_to_aes_key (const GNUNET_HashCode * hc,
  * @return Bit \a bit from hashcode \a code, -1 for invalid index
  */
 int
-GNUNET_CRYPTO_hash_get_bit (const GNUNET_HashCode * code, unsigned int bit)
+GNUNET_CRYPTO_hash_get_bit (const GNUNET_HashCode * code, 
+                           unsigned int bit)
 {
   GNUNET_assert (bit < 8 * sizeof (GNUNET_HashCode));
   return (((unsigned char *) code)[bit >> 3] & (1 << (bit & 7))) > 0;
@@ -455,7 +460,9 @@ GNUNET_CRYPTO_hash_get_bit (const GNUNET_HashCode * code, unsigned int bit)
  *
  * @return the number of bits that match
  */
-unsigned int GNUNET_CRYPTO_hash_matching_bits(const GNUNET_HashCode *first, const GNUNET_HashCode *second)
+unsigned int 
+GNUNET_CRYPTO_hash_matching_bits(const GNUNET_HashCode *first,
+                                const GNUNET_HashCode *second)
 {
   unsigned int i;
 
@@ -465,6 +472,7 @@ unsigned int GNUNET_CRYPTO_hash_matching_bits(const GNUNET_HashCode *first, cons
   return sizeof (GNUNET_HashCode) * 8;
 }
 
+
 /**
  * Compare function for HashCodes, producing a total ordering
  * of all hashcodes.
@@ -491,6 +499,7 @@ GNUNET_CRYPTO_hash_cmp (const GNUNET_HashCode * h1,
   return 0;
 }
 
+
 /**
  * Find out which of the two GNUNET_CRYPTO_hash codes is closer to target
  * in the XOR metric (Kademlia).
@@ -556,10 +565,15 @@ GNUNET_CRYPTO_hmac_derive_key_v(struct GNUNET_CRYPTO_AuthKey *key,
                                 const size_t salt_len,
                                va_list argp)
 {
-  GNUNET_CRYPTO_kdf_v (key->key, sizeof(key->key), salt, salt_len, rkey->key,
-      sizeof(rkey->key), argp);
+  GNUNET_CRYPTO_kdf_v (key->key,
+                      sizeof(key->key), 
+                      salt, salt_len, 
+                      rkey->key,
+                      sizeof(rkey->key),  /* FIXME: this is likely wrong! */
+                      argp);
 }
 
+
 /**
  * Calculate HMAC of a message (RFC 2104)
  *
@@ -577,7 +591,9 @@ GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key,
   gcry_md_hd_t md;
   unsigned char *mc;
 
-  GNUNET_assert (GPG_ERR_NO_ERROR == gcry_md_open (&md, GCRY_MD_SHA512, GCRY_MD_FLAG_HMAC));
+  GNUNET_assert (GPG_ERR_NO_ERROR == gcry_md_open (&md,
+                                                  GCRY_MD_SHA512, 
+                                                  GCRY_MD_FLAG_HMAC));
   gcry_md_setkey (md, key->key, sizeof(key->key));
   gcry_md_write (md, plaintext, plaintext_len);
   mc = gcry_md_read (md, GCRY_MD_SHA512);

diff --git a/src/util/crypto_hkdf.c b/src/util/crypto_hkdf.c
index 00750554f84b467d947be770c2929034fa0f1640..64437571e9dfc7bd05fdcb6c8fe49bd345442160 100644 (file)
--- a/src/util/crypto_hkdf.c
+++ b/src/util/crypto_hkdf.c
@@ -44,8 +44,9 @@
  * @return HMAC, freed by caller via gcry_md_close/_reset
  */
 static void *
-doHMAC (gcry_md_hd_t mac, const void *key, const size_t key_len,
-    const void *buf, const size_t buf_len)
+doHMAC (gcry_md_hd_t mac, 
+       const void *key, size_t key_len,
+       const void *buf, size_t buf_len)
 {
   gcry_md_setkey (mac, key, key_len);
   gcry_md_write (mac, buf, buf_len);
@@ -64,8 +65,10 @@ doHMAC (gcry_md_hd_t mac, const void *key, const size_t key_len,
  * @return GNUNET_YES on success
  */
 static int
-getPRK (gcry_md_hd_t mac, const void *xts, const unsigned long long xts_len,
-    const void *skm, const unsigned long long skm_len, void *prk)
+getPRK (gcry_md_hd_t mac, 
+       const void *xts, unsigned long long xts_len, /* FIXME: size_t? */
+       const void *skm, unsigned long long skm_len, 
+       void *prk)
 {
   void *ret;
 
@@ -77,20 +80,25 @@ getPRK (gcry_md_hd_t mac, const void *xts, const unsigned long long xts_len,
   return GNUNET_YES;
 }
 
+
 #if DEBUG_HKDF
-static void dump(char *src, void *p, unsigned int l)
+static void 
+dump(const char *src, 
+     const void *p, 
+     unsigned int l)
 {
   unsigned int i;
 
   printf("\n%s: ", src);
   for (i = 0; i < l; i++)
     {
-      printf("%2x", (int) ((unsigned char *) p)[i]);
+      printf("%2x", (int) ((const unsigned char *) p)[i]);
     }
   printf("\n");
 }
 #endif
 
+
 /**
  * @brief Derive key
  * @param result buffer for the derived key, allocated by caller
@@ -105,9 +113,11 @@ static void dump(char *src, void *p, unsigned int l)
  * @return GNUNET_YES on success
  */
 int
-GNUNET_CRYPTO_hkdf_v (void *result, const unsigned long long out_len,
-    int xtr_algo, int prf_algo, const void *xts, const size_t xts_len,
-    const void *skm, const size_t skm_len, va_list argp)
+GNUNET_CRYPTO_hkdf_v (void *result, unsigned long long out_len,
+                     int xtr_algo, int prf_algo, 
+                     const void *xts, size_t xts_len,
+                     const void *skm, size_t skm_len,
+                     va_list argp)
 {
   void *prk, *hc, *plain;
   unsigned long long plain_len;
@@ -243,6 +253,7 @@ hkdf_ok:
   return ret;
 }
 
+
 /**
  * @brief Derive key
  * @param result buffer for the derived key, allocated by caller
@@ -258,9 +269,11 @@ hkdf_ok:
  * @return GNUNET_YES on success
  */
 int
-GNUNET_CRYPTO_hkdf (void *result, const unsigned long long out_len,
-    int xtr_algo, int prf_algo, const void *xts, const size_t xts_len,
-    const void *skm, const size_t skm_len, ...)
+GNUNET_CRYPTO_hkdf (void *result, unsigned long long out_len,
+                   int xtr_algo, int prf_algo, 
+                   const void *xts, size_t xts_len,
+                   const void *skm, size_t skm_len, 
+                   ...)
 {
   va_list argp;
   int ret;