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

[gnunet]

Author: schanzen
Date: 2012-02-26 21:55:37 +0100 (Sun, 26 Feb 2012)
New Revision: 20049

Modified:
   gnunet/src/gns/gns.conf.in
   gnunet/src/gns/gnunet-service-gns.c
Log:
-try to get keys form config


Modified: gnunet/src/gns/gns.conf.in
===================================================================
--- gnunet/src/gns/gns.conf.in  2012-02-26 19:28:18 UTC (rev 20048)
+++ gnunet/src/gns/gns.conf.in  2012-02-26 20:55:37 UTC (rev 20049)
@@ -5,6 +5,9 @@
 CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-gns
 UNIXPATH = /tmp/gnunet-service-gns.sock
+ZONEKEY = $SERVICEHOME/zonekey
+TRUSTED = bob:$SERVICEHOME/bobkey
+OPTIONS = -L INFO
 
 # Access to this service can compromise all DNS queries in this
 # system.  Thus access should be restricted to the same UID.

Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2012-02-26 19:28:18 UTC (rev 20048)
+++ gnunet/src/gns/gnunet-service-gns.c 2012-02-26 20:55:37 UTC (rev 20049)
@@ -1064,7 +1064,8 @@
   
   nrb = GNUNET_malloc(rd_payload_length);
   
-  memcpy(&nrb->signature, signature,
+  if (signature != NULL)
+    memcpy(&nrb->signature, signature,
          sizeof(struct GNUNET_CRYPTO_RsaSignature));
   //FIXME signature purpose
   memcpy(&nrb->public_key, key,
@@ -1158,7 +1159,17 @@
 {
   
   GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Init GNS\n");
-  zone_key = GNUNET_CRYPTO_rsa_key_create ();
+  char* keyfile;
+  //this always returns syserr
+  if (GNUNET_SYSERR ==
+      GNUNET_CONFIGURATION_get_value_string (c, "gns",
+                                             "ZONEKEY", &keyfile));
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "No private key for root zone specified%s!\n", keyfile);
+  }
+  zone_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+  //zone_key = GNUNET_CRYPTO_rsa_key_create ();
 
   GNUNET_CRYPTO_hash(zone_key, GNUNET_CRYPTO_RSA_KEY_LENGTH,//FIXME is this ok?
                      &zone_hash);