- use short hashes

3 files changed, 16 insertions, 12 deletions

diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index a4c6cac0..c7b47363 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -288,6 +288,7 @@ static void
 run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_GNS_Context *gns = GNUNET_malloc (sizeof (struct GNUNET_GNS_Context));
+  struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc;
   char *keyfile;
   char *label;
 
@@ -296,7 +297,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (get_configuration (),
                                                             "gns",
                                                             "ZONEKEY_DIRECTORY",
-                                                            &zonekey_directory))
+                                                            &zonekey_direc  struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc;
+  GNUNET_CRYPTO_short_hash_to_enc(&zc_ctx->zone, &shenc);tory))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Option `%s' missing in section `%s'\n"),
@@ -315,10 +317,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     return;
   }
   else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Using `%s'\n", keyfile);
-  }
   gns->pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
   GNUNET_free (keyfile);
   keyfile = NULL;
@@ -329,7 +329,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     return;
   }
   GNUNET_CRYPTO_rsa_key_get_public (gns->pkey, &gns->pubkey);
-  GNUNET_CRYPTO_hash (&gns->pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &gns->zone);
+  GNUNET_CRYPTO_short_hash (&gns->pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &gns->zone);
 
 
   gns->ns = GNUNET_NAMESTORE_connect (get_configuration ());
@@ -352,7 +352,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   gns->ls =  GTK_LIST_STORE (gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_type_liststore"));
   GNUNET_assert (NULL != gns->ts);
 
-  zone_as_string = GNUNET_strdup (GNUNET_h2s_full (&gns->zone));
+  GNUNET_CRYPTO_short_hash_to_enc(&gns->zone, &shenc);
+  zone_as_string = GNUNET_strdup ((char *) &shenc);
   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")),
diff --git a/src/gns/gnunet-gns-gtk.h b/src/gns/gnunet-gns-gtk.h
index 0eb8db14..4148918b 100644
--- a/src/gns/gnunet-gns-gtk.h
+++ b/src/gns/gnunet-gns-gtk.h
@@ -42,7 +42,7 @@ struct GNUNET_GNS_Context
   struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
 
-  GNUNET_HashCode zone;
+  struct GNUNET_CRYPTO_ShortHashCode zone;
 
 };
 
diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index 61f74ee2..7a63ee1e 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -339,7 +339,7 @@ GNUNET_GNS_GTK_main_treeview_key_press_popup_menu_cb (GtkWidget *widget, GdkEven
 struct ZoneIteration_Context
 {
   struct GNUNET_GNS_Context *gns;
-  GNUNET_HashCode zone;
+  struct GNUNET_CRYPTO_ShortHashCode zone;
   struct GNUNET_NAMESTORE_ZoneIterator * it;
 };
 
@@ -381,12 +381,17 @@ void zone_iteration_proc (void *cls,
   GNUNET_assert (zc_ctx != NULL);
   if ((NULL == zone_key) && (NULL == name))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone `%s 'iteration done\n", GNUNET_h2s(&zc_ctx->zone));
+    struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc;
+    GNUNET_CRYPTO_short_hash_to_enc(&zc_ctx->zone, &shenc);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone `%s 'iteration done\n", &shenc);
     GNUNET_free (zc_ctx);
     return;
   }
+
+  struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc;
+  GNUNET_CRYPTO_short_hash_to_enc(&zc_ctx->zone, &shenc);
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone `%s' iteration result `%s', %u records\n",
-      GNUNET_h2s(&zc_ctx->zone), name, rd_count);
+      shenc, name, rd_count);
 
   GNUNET_assert(GTK_IS_TREE_STORE(zc_ctx->gns->ts));
   gtk_tree_store_append(zc_ctx->gns->ts, &iter_name, NULL);
@@ -476,8 +481,6 @@ GNUNET_GNS_GTK_main_treeview_realize_cb (GtkWidget *widget,
   zc_ctx = GNUNET_malloc (sizeof (struct ZoneIteration_Context));
   zc_ctx->gns = user_data;
   zc_ctx->zone = gns->zone;
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Starting one `%s' iteration\n", GNUNET_h2s(&zc_ctx->zone));
-
   zc_ctx->it = GNUNET_NAMESTORE_zone_iteration_start(gns->ns, &gns->zone,
       GNUNET_NAMESTORE_RF_NONE,
       GNUNET_NAMESTORE_RF_NONE,