[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33683 - gnunet/src/cadet
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33683 - gnunet/src/cadet |
Date: |
Tue, 17 Jun 2014 14:13:22 +0200 |
Author: bartpolot
Date: 2014-06-17 14:13:22 +0200 (Tue, 17 Jun 2014)
New Revision: 33683
Modified:
gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- debug info, refactor
Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c 2014-06-17 12:13:20 UTC
(rev 33682)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c 2014-06-17 12:13:22 UTC
(rev 33683)
@@ -38,6 +38,12 @@
#define CONNECTIONS_PER_TUNNEL 3
+#if !defined(GNUNET_CULL_LOGGING)
+#define DUMP_KEYS_TO_STDIN GNUNET_YES
+#else
+#define DUMP_KEYS_TO_STDIN GNUNET_NO
+#endif
+
/******************************************************************************/
/******************************** STRUCTS
**********************************/
/******************************************************************************/
@@ -672,16 +678,14 @@
t_decrypt (struct CadetTunnel *t, void *dst, const void *src,
size_t size, uint32_t iv)
{
- struct GNUNET_CRYPTO_SymmetricSessionKey *key;
size_t out_size;
- LOG (GNUNET_ERROR_TYPE_DEBUG, " t_decrypt start\n");
- if (t->estate == CADET_TUNNEL3_KEY_OK || t->estate == CADET_TUNNEL3_KEY_PING)
+#if DUMP_KEYS_TO_STDIN
+ 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)
{
- key = &t->d_key;
- }
- else
- {
GNUNET_STATISTICS_update (stats, "# non decryptable data", 1, GNUNET_NO);
LOG (GNUNET_ERROR_TYPE_WARNING,
"got data on %s without a valid key\n",
@@ -690,7 +694,7 @@
return -1;
}
- out_size = decrypt (key, dst, src, size, iv);
+ out_size = decrypt (&t->d_key, dst, src, size, iv);
return out_size;
}
@@ -810,6 +814,13 @@
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
+ LOG (GNUNET_ERROR_TYPE_INFO, "KM: %s\n", GNUNET_h2s (&km));
+ LOG (GNUNET_ERROR_TYPE_INFO, "EK: %s\n",
+ GNUNET_h2s ((struct GNUNET_HashCode *) &t->e_key));
+ LOG (GNUNET_ERROR_TYPE_INFO, "DK: %s\n",
+ GNUNET_h2s ((struct GNUNET_HashCode *) &t->d_key));
+#endif
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33683 - gnunet/src/cadet,
gnunet <=