[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33700 - gnunet/src/cadet
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33700 - gnunet/src/cadet |
Date: |
Tue, 17 Jun 2014 14:13:43 +0200 |
Author: bartpolot
Date: 2014-06-17 14:13:43 +0200 (Tue, 17 Jun 2014)
New Revision: 33700
Modified:
gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- fixes, renaming
Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c 2014-06-17 12:13:42 UTC
(rev 33699)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c 2014-06-17 12:13:43 UTC
(rev 33700)
@@ -39,9 +39,9 @@
#define CONNECTIONS_PER_TUNNEL 3
#if !defined(GNUNET_CULL_LOGGING)
-#define DUMP_KEYS_TO_STDIN GNUNET_YES
+#define DUMP_KEYS_TO_STDERR GNUNET_YES
#else
-#define DUMP_KEYS_TO_STDIN GNUNET_NO
+#define DUMP_KEYS_TO_STDERR GNUNET_NO
#endif
/******************************************************************************/
@@ -613,6 +613,10 @@
struct GNUNET_CRYPTO_AuthKey auth_key;
struct GNUNET_HashCode hash;
+#if DUMP_KEYS_TO_STDERR
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " HMAC with key %s\n",
+ GNUNET_h2s ((struct GNUNET_HashCode *) key));
+#endif
GNUNET_CRYPTO_hmac_derive_key (&auth_key, key,
&iv, sizeof (iv),
key, sizeof (*key),
@@ -703,11 +707,11 @@
{
size_t out_size;
-#if DUMP_KEYS_TO_STDIN
+#if DUMP_KEYS_TO_STDERR
LOG (GNUNET_ERROR_TYPE_DEBUG, " t_decrypt with %s\n",
GNUNET_h2s ((struct GNUNET_HashCode *) &t->d_key));
#endif
- if (t->estate != CADET_TUNNEL3_KEY_OK && t->estate != CADET_TUNNEL3_KEY_PING)
+ if (t->estate == CADET_TUNNEL3_KEY_UNINITIALIZED)
{
GNUNET_STATISTICS_update (stats, "# non decryptable data", 1, GNUNET_NO);
LOG (GNUNET_ERROR_TYPE_WARNING,
@@ -837,7 +841,7 @@
derive_key_material (&km, &t->peers_ephemeral_key);
derive_symmertic (&t->e_key, &my_full_id, GCP_get_id (t->peer), &km);
derive_symmertic (&t->d_key, GCP_get_id (t->peer), &my_full_id, &km);
-#if DUMP_KEYS_TO_STDIN
+#if DUMP_KEYS_TO_STDERR
LOG (GNUNET_ERROR_TYPE_INFO, "ME: %s\n",
GNUNET_h2s ((struct GNUNET_HashCode *) &kx_msg.ephemeral_key));
LOG (GNUNET_ERROR_TYPE_INFO, "PE: %s\n",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33700 - gnunet/src/cadet,
gnunet <=