diff options
| author | Christian Grothoff <christian@grothoff.org> | 2013-09-30 11:22:48 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2013-09-30 11:22:48 +0000 |
| commit | 05ef63d9f8cf65561b7ed2234efdc80e3fb40bd0 (patch) | |
| tree | 7c00b58220e87d7f2f050b46e0e2f59c3795e703 /src/util/crypto_kdf.c | |
| parent | 814457c05d62c8f0c167c6bc2015201151355249 (diff) | |
| download | gnunet-05ef63d9f8cf65561b7ed2234efdc80e3fb40bd0.tar.gz gnunet-05ef63d9f8cf65561b7ed2234efdc80e3fb40bd0.zip | |
-encrypt using both AES and TWOFISH, with independent symmetric keys
Diffstat (limited to 'src/util/crypto_kdf.c')
| -rw-r--r-- | src/util/crypto_kdf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c index 0c957b70c..9424c2350 100644 --- a/src/util/crypto_kdf.c +++ b/src/util/crypto_kdf.c | |||
| @@ -36,11 +36,11 @@ | |||
| 36 | * @param result buffer for the derived key, allocated by caller | 36 | * @param result buffer for the derived key, allocated by caller |
| 37 | * @param out_len desired length of the derived key | 37 | * @param out_len desired length of the derived key |
| 38 | * @param xts salt | 38 | * @param xts salt |
| 39 | * @param xts_len length of xts | 39 | * @param xts_len length of @a xts |
| 40 | * @param skm source key material | 40 | * @param skm source key material |
| 41 | * @param skm_len length of skm | 41 | * @param skm_len length of @a skm |
| 42 | * @param argp va_list of void * & size_t pairs for context chunks | 42 | * @param argp va_list of void * & size_t pairs for context chunks |
| 43 | * @return GNUNET_YES on success | 43 | * @return #GNUNET_YES on success |
| 44 | */ | 44 | */ |
| 45 | int | 45 | int |
| 46 | GNUNET_CRYPTO_kdf_v (void *result, size_t out_len, const void *xts, | 46 | GNUNET_CRYPTO_kdf_v (void *result, size_t out_len, const void *xts, |
| @@ -68,11 +68,11 @@ GNUNET_CRYPTO_kdf_v (void *result, size_t out_len, const void *xts, | |||
| 68 | * @param result buffer for the derived key, allocated by caller | 68 | * @param result buffer for the derived key, allocated by caller |
| 69 | * @param out_len desired length of the derived key | 69 | * @param out_len desired length of the derived key |
| 70 | * @param xts salt | 70 | * @param xts salt |
| 71 | * @param xts_len length of xts | 71 | * @param xts_len length of @a xts |
| 72 | * @param skm source key material | 72 | * @param skm source key material |
| 73 | * @param skm_len length of skm | 73 | * @param skm_len length of @a skm |
| 74 | * @param ... void * & size_t pairs for context chunks | 74 | * @param ... void * & size_t pairs for context chunks |
| 75 | * @return GNUNET_YES on success | 75 | * @return #GNUNET_YES on success |
| 76 | */ | 76 | */ |
| 77 | int | 77 | int |
| 78 | GNUNET_CRYPTO_kdf (void *result, size_t out_len, const void *xts, | 78 | GNUNET_CRYPTO_kdf (void *result, size_t out_len, const void *xts, |