-fix 2447

1 files changed, 43 insertions, 0 deletions

diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index 069dc2121..95733618c 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -152,6 +152,9 @@ run (void *cls, char *const *args, const char *cfgfile,
   struct GNUNET_CRYPTO_ShortHashCode user_zone;
   struct GNUNET_CRYPTO_ShortHashAsciiEncoded zonename;
   struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key = NULL;
+  struct GNUNET_CRYPTO_RsaPrivateKey *private_key = NULL;
+  struct GNUNET_CRYPTO_ShortHashCode private_zone;
+  struct GNUNET_CRYPTO_ShortHashCode shorten_zone;
 
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
                                                            "ZONEKEY", &keyfile))
@@ -193,10 +196,48 @@ run (void *cls, char *const *args, const char *cfgfile,
     if (GNUNET_YES == GNUNET_DISK_file_test (keyfile))
     {
       shorten_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+      GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
+      GNUNET_CRYPTO_short_hash(&pkey,
+                         sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+                         &shorten_zone);
+      GNUNET_CRYPTO_short_hash_to_enc (&shorten_zone, &zonename);
+      if (!raw)
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Using shorten zone: %s!\n", &zonename);
+
+    }
+    GNUNET_free(keyfile);
+  }
+  
+  
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
+                                                   "PRIVATE_ZONEKEY", &keyfile))
+  {
+    if (!raw)
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "No private zone key found!\n");
+    shorten_key = NULL;
+  }
+  else
+  {
+    if (GNUNET_YES == GNUNET_DISK_file_test (keyfile))
+    {
+      private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+      GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
+      GNUNET_CRYPTO_short_hash(&pkey,
+                         sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+                         &private_zone);
+      GNUNET_CRYPTO_short_hash_to_enc (&private_zone, &zonename);
+      if (!raw)
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Using private zone: %s!\n", &zonename);
+
     }
     GNUNET_free(keyfile);
+    GNUNET_CRYPTO_rsa_key_free (private_key);
   }
   
+  
   gns = GNUNET_GNS_connect (cfg);
   if (lookup_type != NULL)
     rtype = GNUNET_NAMESTORE_typename_to_number(lookup_type);
@@ -214,6 +255,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   {
     /** shorten name */
     GNUNET_GNS_shorten_zone (gns, shorten_name,
+                             &private_zone,
+                             &shorten_zone,
                              zone,
                              &process_shorten_result,
                              shorten_name);