[GNUnet-SVN] r20326 - gnunet/src/gns

[gnunet]

Author: grothoff
Date: 2012-03-07 10:33:59 +0100 (Wed, 07 Mar 2012)
New Revision: 20326

Modified:
   gnunet/src/gns/gns.conf.in
   gnunet/src/gns/gnunet-gns-fcfsd.c
Log:
-PKEY records should contain hash of public key, not public key

Modified: gnunet/src/gns/gns.conf.in
===================================================================
--- gnunet/src/gns/gns.conf.in  2012-03-07 08:55:06 UTC (rev 20325)
+++ gnunet/src/gns/gns.conf.in  2012-03-07 09:33:59 UTC (rev 20326)
@@ -5,7 +5,7 @@
 CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-gns
 UNIXPATH = /tmp/gnunet-service-gns.sock
-ZONEKEY = zonekey
+ZONEKEY = $SERVICEHOME/gns/zonekey
 HIJACK_DNS = YES
 OPTIONS = -L INFO
 

Modified: gnunet/src/gns/gnunet-gns-fcfsd.c
===================================================================
--- gnunet/src/gns/gnunet-gns-fcfsd.c   2012-03-07 08:55:06 UTC (rev 20325)
+++ gnunet/src/gns/gnunet-gns-fcfsd.c   2012-03-07 09:33:59 UTC (rev 20326)
@@ -368,12 +368,12 @@
 {
   struct Request *request = cls;
   struct GNUNET_NAMESTORE_RecordData r;
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
+  GNUNET_HashCode pub;
   
   GNUNET_assert (GNUNET_OK ==
-                GNUNET_CRYPTO_rsa_public_key_from_string (request->public_key,
-                                                          strlen 
(request->public_key),
-                                                          &pub));
+                GNUNET_CRYPTO_hash_from_string2 (request->public_key,
+                                                 strlen (request->public_key),
+                                                 &pub));
   request->qe = NULL;
   if (0 != rd_count)
   {
@@ -435,7 +435,7 @@
   struct MHD_Response *response;
   struct Request *request;
   int ret;
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
+  GNUNET_HashCode pub;
 
   if ( (0 == strcmp (method, MHD_HTTP_METHOD_GET)) ||
        (0 == strcmp (method, MHD_HTTP_METHOD_HEAD)) )
@@ -481,9 +481,9 @@
        request->pp = NULL;
       }
       if (GNUNET_OK !=
-         GNUNET_CRYPTO_rsa_public_key_from_string (request->public_key,
-                                                   strlen 
(request->public_key),
-                                                   &pub))
+         GNUNET_CRYPTO_hash_from_string2 (request->public_key,
+                                          strlen (request->public_key),
+                                          &pub))
       {
        /* parse error */
        return fill_s_reply ("Failed to parse given public key",