diff options
author | Nils Durner <durner@gnunet.org> | 2010-10-08 13:48:51 +0000 |
---|---|---|
committer | Nils Durner <durner@gnunet.org> | 2010-10-08 13:48:51 +0000 |
commit | 41c4b74fb120a91de7a459d6b56f2332539ec4f9 (patch) | |
tree | 43c6bb78cdd491917db78c8d7ce0d784aea22f62 /src/util/crypto_hash.c | |
parent | 60cc64dd7d31a761c0c3c75e3bcb9b31bbd596c4 (diff) | |
download | gnunet-41c4b74fb120a91de7a459d6b56f2332539ec4f9.tar.gz gnunet-41c4b74fb120a91de7a459d6b56f2332539ec4f9.zip |
style improvements
Diffstat (limited to 'src/util/crypto_hash.c')
-rw-r--r-- | src/util/crypto_hash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c index 879285772..2217e6223 100644 --- a/src/util/crypto_hash.c +++ b/src/util/crypto_hash.c | |||
@@ -539,7 +539,7 @@ void | |||
539 | GNUNET_CRYPTO_hmac_derive_key(struct GNUNET_CRYPTO_AuthKey *key, | 539 | GNUNET_CRYPTO_hmac_derive_key(struct GNUNET_CRYPTO_AuthKey *key, |
540 | const struct GNUNET_CRYPTO_AesSessionKey *rkey, | 540 | const struct GNUNET_CRYPTO_AesSessionKey *rkey, |
541 | const void *salt, | 541 | const void *salt, |
542 | const size_t salt_len, | 542 | size_t salt_len, |
543 | ...) | 543 | ...) |
544 | { | 544 | { |
545 | va_list argp; | 545 | va_list argp; |
@@ -562,14 +562,14 @@ void | |||
562 | GNUNET_CRYPTO_hmac_derive_key_v(struct GNUNET_CRYPTO_AuthKey *key, | 562 | GNUNET_CRYPTO_hmac_derive_key_v(struct GNUNET_CRYPTO_AuthKey *key, |
563 | const struct GNUNET_CRYPTO_AesSessionKey *rkey, | 563 | const struct GNUNET_CRYPTO_AesSessionKey *rkey, |
564 | const void *salt, | 564 | const void *salt, |
565 | const size_t salt_len, | 565 | size_t salt_len, |
566 | va_list argp) | 566 | va_list argp) |
567 | { | 567 | { |
568 | GNUNET_CRYPTO_kdf_v (key->key, | 568 | GNUNET_CRYPTO_kdf_v (key->key, |
569 | sizeof(key->key), | 569 | sizeof(key->key), |
570 | salt, salt_len, | 570 | salt, salt_len, |
571 | rkey->key, | 571 | rkey->key, |
572 | sizeof(rkey->key), /* FIXME: this is likely wrong! */ | 572 | sizeof(rkey->key), |
573 | argp); | 573 | argp); |
574 | } | 574 | } |
575 | 575 | ||
@@ -589,7 +589,7 @@ GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key, | |||
589 | GNUNET_HashCode *hmac) | 589 | GNUNET_HashCode *hmac) |
590 | { | 590 | { |
591 | gcry_md_hd_t md; | 591 | gcry_md_hd_t md; |
592 | unsigned char *mc; | 592 | const unsigned char *mc; |
593 | 593 | ||
594 | GNUNET_assert (GPG_ERR_NO_ERROR == gcry_md_open (&md, | 594 | GNUNET_assert (GPG_ERR_NO_ERROR == gcry_md_open (&md, |
595 | GCRY_MD_SHA512, | 595 | GCRY_MD_SHA512, |