aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-10-05 14:13:43 +0000
committerChristian Grothoff <christian@grothoff.org>2010-10-05 14:13:43 +0000
commit0f8fe7f9eedfe9f70333b9bc7105cbc096af5f05 (patch)
tree60195845b118f79a1529c62f249ff278fd991214 /src
parent7f0c066a76626ba7d126a8f43d18289f6cbf77f8 (diff)
downloadgnunet-0f8fe7f9eedfe9f70333b9bc7105cbc096af5f05.tar.gz
gnunet-0f8fe7f9eedfe9f70333b9bc7105cbc096af5f05.zip
fix warnings
Diffstat (limited to 'src')
-rw-r--r--src/include/gnunet_crypto_lib.h10
-rw-r--r--src/util/crypto_aes.c2
-rw-r--r--src/util/crypto_hash.c2
-rw-r--r--src/util/crypto_hkdf.c2
-rw-r--r--src/util/crypto_kdf.c2
5 files changed, 9 insertions, 9 deletions
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,
348void 348void
349GNUNET_CRYPTO_aes_derive_iv_v (struct GNUNET_CRYPTO_AesInitializationVector *iv, 349GNUNET_CRYPTO_aes_derive_iv_v (struct GNUNET_CRYPTO_AesInitializationVector *iv,
350 const struct GNUNET_CRYPTO_AesSessionKey *skey, void *salt, 350 const struct GNUNET_CRYPTO_AesSessionKey *skey, void *salt,
351 size_t salt_len, const va_list argp); 351 size_t salt_len, va_list argp);
352 352
353 353
354/** 354/**
@@ -584,7 +584,7 @@ GNUNET_CRYPTO_hmac_derive_key_v(struct GNUNET_CRYPTO_AuthKey *key,
584 const struct GNUNET_CRYPTO_AesSessionKey *rkey, 584 const struct GNUNET_CRYPTO_AesSessionKey *rkey,
585 const void *salt, 585 const void *salt,
586 const size_t salt_len, 586 const size_t salt_len,
587 const va_list argp); 587 va_list argp);
588 588
589 589
590/** 590/**
@@ -638,7 +638,7 @@ GNUNET_CRYPTO_hkdf (void *result, const unsigned long long out_len,
638int 638int
639GNUNET_CRYPTO_hkdf_v (void *result, const unsigned long long out_len, 639GNUNET_CRYPTO_hkdf_v (void *result, const unsigned long long out_len,
640 int xtr_algo, int prf_algo, const void *xts, const size_t xts_len, 640 int xtr_algo, int prf_algo, const void *xts, const size_t xts_len,
641 const void *skm, const size_t skm_len, const va_list argp); 641 const void *skm, const size_t skm_len, va_list argp);
642 642
643 643
644/** 644/**
@@ -654,8 +654,8 @@ GNUNET_CRYPTO_hkdf_v (void *result, const unsigned long long out_len,
654 */ 654 */
655int 655int
656GNUNET_CRYPTO_kdf_v (void *result, const unsigned long long out_len, 656GNUNET_CRYPTO_kdf_v (void *result, const unsigned long long out_len,
657 const void *xts, const size_t xts_len, const void *skm, 657 const void *xts, const size_t xts_len, const void *skm,
658 const size_t skm_len, const va_list argp); 658 const size_t skm_len, va_list argp);
659 659
660 660
661/** 661/**
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,
179void 179void
180GNUNET_CRYPTO_aes_derive_iv_v (struct GNUNET_CRYPTO_AesInitializationVector *iv, 180GNUNET_CRYPTO_aes_derive_iv_v (struct GNUNET_CRYPTO_AesInitializationVector *iv,
181 const struct GNUNET_CRYPTO_AesSessionKey *skey, void *salt, 181 const struct GNUNET_CRYPTO_AesSessionKey *skey, void *salt,
182 size_t salt_len, const va_list argp) 182 size_t salt_len, va_list argp)
183{ 183{
184 GNUNET_CRYPTO_kdf_v (iv->iv, sizeof(iv->iv), salt, salt_len, skey->key, 184 GNUNET_CRYPTO_kdf_v (iv->iv, sizeof(iv->iv), salt, salt_len, skey->key,
185 sizeof(skey->key), argp); 185 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,
867 const struct GNUNET_CRYPTO_AesSessionKey *rkey, 867 const struct GNUNET_CRYPTO_AesSessionKey *rkey,
868 const void *salt, 868 const void *salt,
869 const size_t salt_len, 869 const size_t salt_len,
870 const va_list argp) 870 va_list argp)
871{ 871{
872 GNUNET_CRYPTO_kdf_v (key->key, sizeof(key->key), salt, salt_len, rkey->key, 872 GNUNET_CRYPTO_kdf_v (key->key, sizeof(key->key), salt, salt_len, rkey->key,
873 sizeof(rkey->key), argp); 873 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)
107int 107int
108GNUNET_CRYPTO_hkdf_v (void *result, const unsigned long long out_len, 108GNUNET_CRYPTO_hkdf_v (void *result, const unsigned long long out_len,
109 int xtr_algo, int prf_algo, const void *xts, const size_t xts_len, 109 int xtr_algo, int prf_algo, const void *xts, const size_t xts_len,
110 const void *skm, const size_t skm_len, const va_list argp) 110 const void *skm, const size_t skm_len, va_list argp)
111{ 111{
112 void *prk, *hc, *plain; 112 void *prk, *hc, *plain;
113 unsigned long long plain_len; 113 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 @@
43int 43int
44GNUNET_CRYPTO_kdf_v (void *result, const unsigned long long out_len, 44GNUNET_CRYPTO_kdf_v (void *result, const unsigned long long out_len,
45 const void *xts, const size_t xts_len, const void *skm, 45 const void *xts, const size_t xts_len, const void *skm,
46 const size_t skm_len, const va_list argp) 46 const size_t skm_len, va_list argp)
47{ 47{
48 /* 48 /*
49 "Finally, we point out to a particularly advantageous instantiation using 49 "Finally, we point out to a particularly advantageous instantiation using