From: Christian Grothoff Date: Tue, 5 Oct 2010 14:13:43 +0000 (+0000) Subject: fix warnings X-Git-Tag: initial-import-from-subversion-38251~20181 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0f8fe7f9eedfe9f70333b9bc7105cbc096af5f05;p=oweals%2Fgnunet.git fix warnings --- diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h index c9c734842..8cba8a588 100644 --- a/src/include/gnunet_crypto_lib.h +++ b/src/include/gnunet_crypto_lib.h @@ -348,7 +348,7 @@ 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, const va_list argp); + size_t salt_len, va_list argp); /** @@ -584,7 +584,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, - const va_list argp); + va_list argp); /** @@ -638,7 +638,7 @@ GNUNET_CRYPTO_hkdf (void *result, const unsigned long long out_len, 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, const va_list argp); + const void *skm, const size_t skm_len, va_list argp); /** @@ -654,8 +654,8 @@ GNUNET_CRYPTO_hkdf_v (void *result, const unsigned long long out_len, */ 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, const va_list argp); + const void *xts, const size_t xts_len, const void *skm, + const size_t skm_len, va_list argp); /** diff --git a/src/util/crypto_aes.c b/src/util/crypto_aes.c index db4d843b5..bf618ffc3 100644 --- a/src/util/crypto_aes.c +++ b/src/util/crypto_aes.c @@ -179,7 +179,7 @@ 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, const va_list argp) + 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 db911aa5f..6cad12c6b 100644 --- a/src/util/crypto_hash.c +++ b/src/util/crypto_hash.c @@ -867,7 +867,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, - const va_list argp) + va_list argp) { GNUNET_CRYPTO_kdf_v (key->key, sizeof(key->key), salt, salt_len, rkey->key, sizeof(rkey->key), argp); diff --git a/src/util/crypto_hkdf.c b/src/util/crypto_hkdf.c index a26f1afe1..00750554f 100644 --- a/src/util/crypto_hkdf.c +++ b/src/util/crypto_hkdf.c @@ -107,7 +107,7 @@ static void dump(char *src, void *p, unsigned int l) 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, const va_list argp) + const void *skm, const size_t skm_len, va_list argp) { void *prk, *hc, *plain; unsigned long long plain_len; diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c index 2fae10c23..785603c8c 100644 --- a/src/util/crypto_kdf.c +++ b/src/util/crypto_kdf.c @@ -43,7 +43,7 @@ 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, const va_list argp) + const size_t skm_len, va_list argp) { /* "Finally, we point out to a particularly advantageous instantiation using