- moving crypto key to ctx

2 files changed, 25 insertions, 21 deletions

diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index 143c6406..74906b83 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -36,10 +36,6 @@ static struct GNUNET_GTK_MainLoop *ml;
  */
 static int tray_only;
 
-/**
- * Hash of the public key of our zone.
- */
-static GNUNET_HashCode zone;
 
 /**
  * Private key for the our zone.
@@ -69,6 +65,12 @@ struct GNUNET_GNS_Context
 
   GtkBuilder *builder;
 
+  struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
+
+  GNUNET_HashCode zone;
+
+
 
 };
 
@@ -336,12 +338,12 @@ void zone_iteration_proc (void *cls,
 static void
 run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
   struct GNUNET_GNS_Context *gns = GNUNET_malloc (sizeof (struct GNUNET_GNS_Context));
   char *keyfile;
   char *label;
 
   ml = cls;
+  /*
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (get_configuration (),
                                                             "gns",
                                                             "ZONEKEY_DIRECTORY",
@@ -351,7 +353,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                 _("Option `%s' missing in section `%s'\n"),
                 "ZONEKEY_DIRECTORY", "namestore");
     return;
-  }
+  }*/
 
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (get_configuration (),
                                                             "gns",
@@ -363,17 +365,18 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                 "ZONEKEY", "gns");
     return;
   }
-  zone_pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+  gns->pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
   GNUNET_free (keyfile);
   keyfile = NULL;
-  if (NULL == zone_pkey)
+  if (NULL == gns->pkey)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Failed to read or create private zone key\n"));
     return;
   }
-  GNUNET_CRYPTO_rsa_key_get_public (zone_pkey, &pub);
-  GNUNET_CRYPTO_hash (&pub, sizeof (pub), &zone);
+  GNUNET_CRYPTO_rsa_key_get_public (gns->pkey, &gns->pubkey);
+  GNUNET_CRYPTO_hash (&gns->pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &gns->zone);
+
 
   gns->ns = GNUNET_NAMESTORE_connect (get_configuration ());
   if (NULL == gns->ns)
@@ -392,7 +395,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
   gns->builder = GNUNET_GTK_main_loop_get_builder(ml);
 
-  zone_as_string = GNUNET_strdup (GNUNET_h2s_full (&zone));
+  zone_as_string = GNUNET_strdup (GNUNET_h2s_full (&gns->zone));
   label = g_markup_printf_escaped (_("<b>Editing zone %s</b>"),
                                    zone_as_string);
   gtk_label_set_markup (GTK_LABEL (get_object ("GNUNET_GNS_GTK_zone_label")),
@@ -408,16 +411,6 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                "gnunet-gtk" /* FIXME: different icon? */ ,
                                "gnunet-gns-gtk");
 
-  /*
-  struct ZoneIteration_Context * zc_ctx = GNUNET_malloc (sizeof (struct ZoneIteration_Context));
-  zc_ctx->zone = zone;
-  GNUNET_NAMESTORE_zone_iteration_start(gns->ns, &zone,
-      GNUNET_NAMESTORE_RF_NONE,
-      GNUNET_NAMESTORE_RF_NONE,
-      &zone_iteration_proc,
-      zc_ctx);
-   */
-
   /* make GUI visible */
   if (!tray_only)
   {
diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index 5739c888..dd88df89 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -165,6 +165,17 @@ GNUNET_GNS_GTK_main_treeview_realize_cb (GtkWidget *widget,
   /* Append a top level row and leave it empty */
   gtk_tree_store_append(ts, &toplevel, NULL);
 
+  /*
+  struct ZoneIteration_Context * zc_ctx = GNUNET_malloc (sizeof (struct ZoneIteration_Context));
+  zc_ctx->zone = zone;
+  GNUNET_NAMESTORE_zone_iteration_start(gns->ns, &zone,
+      GNUNET_NAMESTORE_RF_NONE,
+      GNUNET_NAMESTORE_RF_NONE,
+      &zone_iteration_proc,
+      zc_ctx);
+   */
+
+
   GNUNET_break (0);
 }