diff options
author | Nils Durner <durner@gnunet.org> | 2010-10-03 15:42:38 +0000 |
---|---|---|
committer | Nils Durner <durner@gnunet.org> | 2010-10-03 15:42:38 +0000 |
commit | a339af3c6f42f5dfcd6117e831296399f7e31b95 (patch) | |
tree | 86c5534a967db576f4073cab701f6e76b57110f7 | |
parent | c7594ff34a47257328f79accd9214c01c3b87703 (diff) | |
download | gnunet-a339af3c6f42f5dfcd6117e831296399f7e31b95.tar.gz gnunet-a339af3c6f42f5dfcd6117e831296399f7e31b95.zip |
const
-rw-r--r-- | src/include/gnunet_crypto_lib.h | 6 | ||||
-rw-r--r-- | src/util/crypto_aes.c | 2 | ||||
-rw-r--r-- | src/util/crypto_hkdf.c | 2 | ||||
-rw-r--r-- | src/util/crypto_kdf.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h index baea6859a..c9c734842 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, | |||
348 | void | 348 | void |
349 | GNUNET_CRYPTO_aes_derive_iv_v (struct GNUNET_CRYPTO_AesInitializationVector *iv, | 349 | GNUNET_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, va_list argp); | 351 | size_t salt_len, const va_list argp); |
352 | 352 | ||
353 | 353 | ||
354 | /** | 354 | /** |
@@ -638,7 +638,7 @@ GNUNET_CRYPTO_hkdf (void *result, const unsigned long long out_len, | |||
638 | int | 638 | int |
639 | GNUNET_CRYPTO_hkdf_v (void *result, const unsigned long long out_len, | 639 | GNUNET_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, va_list argp); | 641 | const void *skm, const size_t skm_len, const va_list argp); |
642 | 642 | ||
643 | 643 | ||
644 | /** | 644 | /** |
@@ -655,7 +655,7 @@ GNUNET_CRYPTO_hkdf_v (void *result, const unsigned long long out_len, | |||
655 | int | 655 | int |
656 | GNUNET_CRYPTO_kdf_v (void *result, const unsigned long long out_len, | 656 | GNUNET_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, va_list argp); | 658 | const size_t skm_len, const va_list argp); |
659 | 659 | ||
660 | 660 | ||
661 | /** | 661 | /** |
diff --git a/src/util/crypto_aes.c b/src/util/crypto_aes.c index bf618ffc3..db4d843b5 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, | |||
179 | void | 179 | void |
180 | GNUNET_CRYPTO_aes_derive_iv_v (struct GNUNET_CRYPTO_AesInitializationVector *iv, | 180 | GNUNET_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, va_list argp) | 182 | size_t salt_len, const 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_hkdf.c b/src/util/crypto_hkdf.c index 00750554f..a26f1afe1 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) | |||
107 | int | 107 | int |
108 | GNUNET_CRYPTO_hkdf_v (void *result, const unsigned long long out_len, | 108 | GNUNET_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, va_list argp) | 110 | const void *skm, const size_t skm_len, const 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 785603c8c..2fae10c23 100644 --- a/src/util/crypto_kdf.c +++ b/src/util/crypto_kdf.c | |||
@@ -43,7 +43,7 @@ | |||
43 | int | 43 | int |
44 | GNUNET_CRYPTO_kdf_v (void *result, const unsigned long long out_len, | 44 | GNUNET_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, va_list argp) | 46 | const size_t skm_len, const 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 |