[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37495 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37495 - gnunet/src/util |
Date: |
Fri, 8 Jul 2016 19:00:19 +0200 |
Author: grothoff
Date: 2016-07-08 19:00:18 +0200 (Fri, 08 Jul 2016)
New Revision: 37495
Modified:
gnunet/src/util/crypto_symmetric.c
gnunet/src/util/mq.c
Log:
-lower log level
Modified: gnunet/src/util/crypto_symmetric.c
===================================================================
--- gnunet/src/util/crypto_symmetric.c 2016-07-08 16:51:30 UTC (rev 37494)
+++ gnunet/src/util/crypto_symmetric.c 2016-07-08 17:00:18 UTC (rev 37495)
@@ -158,7 +158,8 @@
* 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 @@
*/
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 @@
*/
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 @@
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 */
Modified: gnunet/src/util/mq.c
===================================================================
--- gnunet/src/util/mq.c 2016-07-08 16:51:30 UTC (rev 37494)
+++ gnunet/src/util/mq.c 2016-07-08 17:00:18 UTC (rev 37495)
@@ -253,7 +253,7 @@
}
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));
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37495 - gnunet/src/util,
gnunet <=