[GNUnet-SVN] r25962 - in gnunet/src: core util

[gnunet]

Author: grothoff
Date: 2013-01-31 13:02:43 +0100 (Thu, 31 Jan 2013)
New Revision: 25962

Modified:
   gnunet/src/core/gnunet-service-core.c
   gnunet/src/util/crypto_ecc.c
Log:
-cleanup

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2013-01-31 11:26:51 UTC (rev 
25961)
+++ gnunet/src/core/gnunet-service-core.c       2013-01-31 12:02:43 UTC (rev 
25962)
@@ -56,7 +56,7 @@
 /**
  * Hostkey generation context
  */
-struct GNUNET_CRYPTO_RsaKeyGenerationContext *GST_keygen;
+static struct GNUNET_CRYPTO_RsaKeyGenerationContext *keygen;
 
 
 /**
@@ -70,10 +70,10 @@
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Core service shutting down.\n");
-  if (NULL != GST_keygen)
+  if (NULL != keygen)
   {
-    GNUNET_CRYPTO_rsa_key_create_stop (GST_keygen);
-    GST_keygen = NULL;
+    GNUNET_CRYPTO_rsa_key_create_stop (keygen);
+    keygen = NULL;
   }
   GSC_CLIENTS_done ();
   GSC_NEIGHBOURS_done ();
@@ -102,7 +102,7 @@
                    struct GNUNET_CRYPTO_RsaPrivateKey *pk,
                    const char *emsg)
 {
-  GST_keygen = NULL;
+  keygen = NULL;
   if (NULL == pk)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -155,9 +155,9 @@
                                 NULL);
   GNUNET_SERVER_suspend (server);
   GSC_TYPEMAP_init ();
-  GST_keygen = GNUNET_CRYPTO_rsa_key_create_start (keyfile, 
&key_generation_cb, NULL);
+  keygen = GNUNET_CRYPTO_rsa_key_create_start (keyfile, &key_generation_cb, 
NULL);
   GNUNET_free (keyfile);
-  if (NULL == GST_keygen)
+  if (NULL == keygen)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Transport service is unable to access hostkey. 
Exiting.\n"));

Modified: gnunet/src/util/crypto_ecc.c
===================================================================
--- gnunet/src/util/crypto_ecc.c        2013-01-31 11:26:51 UTC (rev 25961)
+++ gnunet/src/util/crypto_ecc.c        2013-01-31 12:02:43 UTC (rev 25962)
@@ -22,13 +22,6 @@
  * @file util/crypto_ecc.c
  * @brief public key cryptography (ECC) with libgcrypt
  * @author Christian Grothoff
- *
- * This is just a first, completely untested, draft hack for future ECC 
support.
- * TODO:
- * - fix public key generation; somehow the result is currently considered 
invalid by libgcrypt
- *   => suspect that libgcrypt does NOT take pabgn from "CURVE" for public key 
if not
- *      explicitly given!
- * - actually test it!
  */
 #include "platform.h"
 #include <gcrypt.h>