diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-30 11:32:30 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-30 11:32:30 +0000 |
commit | 45b5c1f11144bc14fae34c991ae9db89d6ba8913 (patch) | |
tree | f4a2fbe70573e0d9bb56d4ccb8be29fcf0c50c55 /src/util/crypto_hash.c | |
parent | 05ef63d9f8cf65561b7ed2234efdc80e3fb40bd0 (diff) | |
download | gnunet-45b5c1f11144bc14fae34c991ae9db89d6ba8913.tar.gz gnunet-45b5c1f11144bc14fae34c991ae9db89d6ba8913.zip |
-rename files/symbols from _aes to _symmetric
Diffstat (limited to 'src/util/crypto_hash.c')
-rw-r--r-- | src/util/crypto_hash.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c index 47baf660f..e1997c3bb 100644 --- a/src/util/crypto_hash.c +++ b/src/util/crypto_hash.c | |||
@@ -395,16 +395,16 @@ GNUNET_CRYPTO_hash_xor (const struct GNUNET_HashCode * a, const struct GNUNET_Ha | |||
395 | */ | 395 | */ |
396 | void | 396 | void |
397 | GNUNET_CRYPTO_hash_to_aes_key (const struct GNUNET_HashCode *hc, | 397 | GNUNET_CRYPTO_hash_to_aes_key (const struct GNUNET_HashCode *hc, |
398 | struct GNUNET_CRYPTO_AesSessionKey *skey, | 398 | struct GNUNET_CRYPTO_SymmetricSessionKey *skey, |
399 | struct GNUNET_CRYPTO_AesInitializationVector *iv) | 399 | struct GNUNET_CRYPTO_SymmetricInitializationVector *iv) |
400 | { | 400 | { |
401 | GNUNET_assert (GNUNET_YES == | 401 | GNUNET_assert (GNUNET_YES == |
402 | GNUNET_CRYPTO_kdf (skey, sizeof (struct GNUNET_CRYPTO_AesSessionKey), | 402 | GNUNET_CRYPTO_kdf (skey, sizeof (struct GNUNET_CRYPTO_SymmetricSessionKey), |
403 | "Hash key derivation", strlen ("Hash key derivation"), | 403 | "Hash key derivation", strlen ("Hash key derivation"), |
404 | hc, sizeof (struct GNUNET_HashCode), | 404 | hc, sizeof (struct GNUNET_HashCode), |
405 | NULL, 0)); | 405 | NULL, 0)); |
406 | GNUNET_assert (GNUNET_YES == | 406 | GNUNET_assert (GNUNET_YES == |
407 | GNUNET_CRYPTO_kdf (iv, sizeof (struct GNUNET_CRYPTO_AesInitializationVector), | 407 | GNUNET_CRYPTO_kdf (iv, sizeof (struct GNUNET_CRYPTO_SymmetricInitializationVector), |
408 | "Initialization vector derivation", strlen ("Initialization vector derivation"), | 408 | "Initialization vector derivation", strlen ("Initialization vector derivation"), |
409 | hc, sizeof (struct GNUNET_HashCode), | 409 | hc, sizeof (struct GNUNET_HashCode), |
410 | NULL, 0)); | 410 | NULL, 0)); |
@@ -521,7 +521,7 @@ GNUNET_CRYPTO_hash_xorcmp (const struct GNUNET_HashCode *h1, | |||
521 | */ | 521 | */ |
522 | void | 522 | void |
523 | GNUNET_CRYPTO_hmac_derive_key (struct GNUNET_CRYPTO_AuthKey *key, | 523 | GNUNET_CRYPTO_hmac_derive_key (struct GNUNET_CRYPTO_AuthKey *key, |
524 | const struct GNUNET_CRYPTO_AesSessionKey *rkey, | 524 | const struct GNUNET_CRYPTO_SymmetricSessionKey *rkey, |
525 | const void *salt, size_t salt_len, ...) | 525 | const void *salt, size_t salt_len, ...) |
526 | { | 526 | { |
527 | va_list argp; | 527 | va_list argp; |
@@ -542,13 +542,13 @@ GNUNET_CRYPTO_hmac_derive_key (struct GNUNET_CRYPTO_AuthKey *key, | |||
542 | */ | 542 | */ |
543 | void | 543 | void |
544 | GNUNET_CRYPTO_hmac_derive_key_v (struct GNUNET_CRYPTO_AuthKey *key, | 544 | GNUNET_CRYPTO_hmac_derive_key_v (struct GNUNET_CRYPTO_AuthKey *key, |
545 | const struct GNUNET_CRYPTO_AesSessionKey *rkey, | 545 | const struct GNUNET_CRYPTO_SymmetricSessionKey *rkey, |
546 | const void *salt, size_t salt_len, | 546 | const void *salt, size_t salt_len, |
547 | va_list argp) | 547 | va_list argp) |
548 | { | 548 | { |
549 | GNUNET_CRYPTO_kdf_v (key->key, sizeof (key->key), | 549 | GNUNET_CRYPTO_kdf_v (key->key, sizeof (key->key), |
550 | salt, salt_len, | 550 | salt, salt_len, |
551 | rkey, sizeof (struct GNUNET_CRYPTO_AesSessionKey), | 551 | rkey, sizeof (struct GNUNET_CRYPTO_SymmetricSessionKey), |
552 | argp); | 552 | argp); |
553 | } | 553 | } |
554 | 554 | ||