[GNUnet-SVN] r26288 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2013-03-04 06:52:32 +0100 (Mon, 04 Mar 2013)
New Revision: 26288

Modified:
   gnunet/src/core/gnunet-service-core_kx.c
Log:
-if we do not use ephemeral keys, use validity of 'forever'

Modified: gnunet/src/core/gnunet-service-core_kx.c
===================================================================
--- gnunet/src/core/gnunet-service-core_kx.c    2013-03-04 05:47:46 UTC (rev 
26287)
+++ gnunet/src/core/gnunet-service-core_kx.c    2013-03-04 05:52:32 UTC (rev 
26288)
@@ -1495,8 +1495,18 @@
                                    sizeof (struct 
GNUNET_CRYPTO_EccPublicKeyBinaryEncoded) +
                                    sizeof (struct 
GNUNET_CRYPTO_EccPublicKeyBinaryEncoded));
   current_ekm.creation_time = GNUNET_TIME_absolute_hton 
(GNUNET_TIME_absolute_get ());
-  current_ekm.expiration_time = GNUNET_TIME_absolute_hton 
(GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_add (REKEY_FREQUENCY,
-                                                                               
                                       REKEY_TOLERANCE)));
+  if (GNUNET_YES ==
+      GNUNET_CONFIGURATION_get_value_yesno (GSC_cfg,
+                                           "core",
+                                           "USE_EPHEMERAL_KEYS"))
+  {
+    current_ekm.expiration_time = GNUNET_TIME_absolute_hton 
(GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_add (REKEY_FREQUENCY,
+                                                                               
                                         REKEY_TOLERANCE)));
+  }
+  else
+  {
+    current_ekm.expiration_time = GNUNET_TIME_absolute_hton 
(GNUNET_TIME_UNIT_FOREVER_ABS);
+  }
   GNUNET_CRYPTO_ecc_key_get_public (my_ephemeral_key,
                                    &current_ekm.ephemeral_key);
   current_ekm.origin_public_key = my_public_key;