From 49222564d195f9d26eb0d02e036d38743f9d7da2 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 8 Jul 2016 17:00:18 +0000 Subject: [PATCH] -lower log level --- src/util/crypto_symmetric.c | 35 +++++++++++++++++++++++------------ src/util/mq.c | 2 +- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c index bea9c3233..58ad33170 100644 --- a/src/util/crypto_symmetric.c +++ b/src/util/crypto_symmetric.c @@ -158,7 +158,8 @@ GNUNET_CRYPTO_symmetric_encrypt (const void *block, * this size should be the same as @c size. */ ssize_t -GNUNET_CRYPTO_symmetric_decrypt (const void *block, size_t size, +GNUNET_CRYPTO_symmetric_decrypt (const void *block, + size_t size, const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey, const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, void *result) @@ -190,8 +191,10 @@ GNUNET_CRYPTO_symmetric_decrypt (const void *block, size_t size, */ void GNUNET_CRYPTO_symmetric_derive_iv (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, - const struct GNUNET_CRYPTO_SymmetricSessionKey *skey, - const void *salt, size_t salt_len, ...) + const struct GNUNET_CRYPTO_SymmetricSessionKey *skey, + const void *salt, + size_t salt_len, + ...) { va_list argp; @@ -212,8 +215,10 @@ GNUNET_CRYPTO_symmetric_derive_iv (struct GNUNET_CRYPTO_SymmetricInitializationV */ void GNUNET_CRYPTO_symmetric_derive_iv_v (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, - const struct GNUNET_CRYPTO_SymmetricSessionKey *skey, - const void *salt, size_t salt_len, va_list argp) + const struct GNUNET_CRYPTO_SymmetricSessionKey *skey, + const void *salt, + size_t salt_len, + va_list argp) { char aes_salt[salt_len + 4]; char twofish_salt[salt_len + 4]; @@ -222,14 +227,20 @@ GNUNET_CRYPTO_symmetric_derive_iv_v (struct GNUNET_CRYPTO_SymmetricInitializatio memcpy (&aes_salt[salt_len], "AES!", 4); memcpy (twofish_salt, salt, salt_len); memcpy (&twofish_salt[salt_len], "FISH", 4); - GNUNET_CRYPTO_kdf_v (iv->aes_iv, sizeof (iv->aes_iv), - aes_salt, salt_len + 4, - skey->aes_key, sizeof (skey->aes_key), + GNUNET_CRYPTO_kdf_v (iv->aes_iv, + sizeof (iv->aes_iv), + aes_salt, + salt_len + 4, + skey->aes_key, + sizeof (skey->aes_key), argp); - GNUNET_CRYPTO_kdf_v (iv->twofish_iv, sizeof (iv->twofish_iv), - twofish_salt, salt_len + 4, - skey->twofish_key, sizeof (skey->twofish_key), + GNUNET_CRYPTO_kdf_v (iv->twofish_iv, + sizeof (iv->twofish_iv), + twofish_salt, + salt_len + 4, + skey->twofish_key, + sizeof (skey->twofish_key), argp); } -/* end of crypto_aes.c */ +/* end of crypto_symmetric.c */ diff --git a/src/util/mq.c b/src/util/mq.c index b9bc4f2f1..59a5f177a 100644 --- a/src/util/mq.c +++ b/src/util/mq.c @@ -253,7 +253,7 @@ GNUNET_MQ_inject_message (struct GNUNET_MQ_Handle *mq, } done: if (GNUNET_NO == handled) - LOG (GNUNET_ERROR_TYPE_WARNING, + LOG (GNUNET_ERROR_TYPE_DEBUG, "No handler for message of type %d\n", ntohs (mh->type)); } -- 2.25.1