aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-05-10 09:13:14 +0000
committerChristian Grothoff <christian@grothoff.org>2012-05-10 09:13:14 +0000
commit2c11dcfd682912d8f898cab9d8c5f8c3ed98088c (patch)
tree07f66d174ea8bac8f22be9bfd19892c9fa6beb26 /src/core
parent887ac96f4b705ae2289fcdb11ddeca07d1e0d8ff (diff)
downloadgnunet-2c11dcfd682912d8f898cab9d8c5f8c3ed98088c.tar.gz
gnunet-2c11dcfd682912d8f898cab9d8c5f8c3ed98088c.zip
-better
Diffstat (limited to 'src/core')
-rw-r--r--src/core/gnunet-service-core_kx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c
index f3f0906d6..cf825336d 100644
--- a/src/core/gnunet-service-core_kx.c
+++ b/src/core/gnunet-service-core_kx.c
@@ -1064,7 +1064,7 @@ setup_fresh_setkey (struct GSC_KeyExchangeInfo *kx)
1064 GNUNET_CRYPTO_AesSessionKey), 1064 GNUNET_CRYPTO_AesSessionKey),
1065 kx->public_key, 1065 kx->public_key,
1066 &skm->encrypted_key)); 1066 &skm->encrypted_key));
1067 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 1067 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1068 "Encrypting key %x for %s resulting in message %u (origin: %s)\n", 1068 "Encrypting key %x for %s resulting in message %u (origin: %s)\n",
1069 (unsigned int) GNUNET_CRYPTO_crc32_n (&kx->encrypt_key, sizeof (struct GNUNET_CRYPTO_AesSessionKey)), 1069 (unsigned int) GNUNET_CRYPTO_crc32_n (&kx->encrypt_key, sizeof (struct GNUNET_CRYPTO_AesSessionKey)),
1070 GNUNET_i2s (&kx->peer), 1070 GNUNET_i2s (&kx->peer),
@@ -1178,6 +1178,7 @@ trigger_rekey (void *cls,
1178{ 1178{
1179 struct GSC_KeyExchangeInfo *kx = cls; 1179 struct GSC_KeyExchangeInfo *kx = cls;
1180 1180
1181 GNUNET_break (KX_STATE_UP == kx->status);
1181 kx->status = KX_STATE_REKEY; 1182 kx->status = KX_STATE_REKEY;
1182 kx->set_key_retry_frequency = INITIAL_SET_KEY_RETRY_FREQUENCY; 1183 kx->set_key_retry_frequency = INITIAL_SET_KEY_RETRY_FREQUENCY;
1183 kx->retry_set_key_task = 1184 kx->retry_set_key_task =