small fixes and style issues

1 files changed, 18 insertions, 9 deletions

diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 8cba8a588..08da06c70 100644
--- 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);
 
 
 /**