-handle failure to load certs more nicely

[oweals/gnunet.git] / src / gns / test_gns_dht_three_peers.c

diff --git a/src/gns/test_gns_dht_three_peers.c b/src/gns/test_gns_dht_three_peers.c
index d9e1b76ca5ff2d43e881d2ec0df4282ea745a842..688e355ed31a30d2c04b6e22de57979e68c3bb1b 100644 (file)
--- a/src/gns/test_gns_dht_three_peers.c
+++ b/src/gns/test_gns_dht_three_peers.c
@@ -312,7 +312,7 @@ setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
 {
   char* keyfile;
   struct GNUNET_CRYPTO_EccPrivateKey *key;
-  struct GNUNET_CRYPTO_EccPublicKey pkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
   struct in_addr *web;
   struct GNUNET_NAMESTORE_RecordData rd;
 
@@ -339,12 +339,12 @@ setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
   if (NULL == nh[0])
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-    GNUNET_CRYPTO_ecc_key_free (key);
+    GNUNET_free (key);
     GNUNET_free (keyfile);
     return GNUNET_SYSERR;
   }
 
-  GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (key, &pkey);
   GNUNET_CRYPTO_short_hash(&pkey, sizeof(pkey), &dave_hash);
 
   rd.expiration_time = UINT64_MAX;
@@ -354,7 +354,7 @@ setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
   rd.data_size = sizeof(struct in_addr);
   rd.data = web;
   rd.record_type = GNUNET_DNSPARSER_TYPE_A;
-  rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+  rd.flags = GNUNET_NAMESTORE_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (nh[0], key, "www", 
                                            1, &rd,
@@ -370,7 +370,7 @@ setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
                                            1, &rd, 
                                            &cont_ns, nh[0]);
 
-  GNUNET_CRYPTO_ecc_key_free(key);
+  GNUNET_free(key);
   GNUNET_free(keyfile);
   GNUNET_free(web);
   dave_is_setup = GNUNET_YES;
@@ -383,7 +383,7 @@ setup_bob (const struct GNUNET_CONFIGURATION_Handle * cfg)
 {
   char* keyfile;
   struct GNUNET_CRYPTO_EccPrivateKey *key;
-  struct GNUNET_CRYPTO_EccPublicKey pkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
   struct GNUNET_NAMESTORE_RecordData rd;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob\n");
@@ -410,25 +410,25 @@ setup_bob (const struct GNUNET_CONFIGURATION_Handle * cfg)
   if (NULL == nh[1])
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-    GNUNET_CRYPTO_ecc_key_free (key);
+    GNUNET_free (key);
     GNUNET_free (keyfile);
     return GNUNET_SYSERR;
   }
   
-  GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (key, &pkey);
   GNUNET_CRYPTO_short_hash(&pkey, sizeof(pkey), &bob_hash);
 
   rd.expiration_time = UINT64_MAX;
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &dave_hash;
   rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
-  rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+  rd.flags = GNUNET_NAMESTORE_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (nh[1], key, "buddy",
                                            1, &rd,
                                            &cont_ns, nh[1]);
 
-  GNUNET_CRYPTO_ecc_key_free(key);
+  GNUNET_free(key);
   GNUNET_free(keyfile);
   bob_is_setup = GNUNET_YES;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob done\n");
@@ -465,7 +465,7 @@ setup_alice (const struct GNUNET_CONFIGURATION_Handle * cfg)
   if (NULL == nh[2])
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-    GNUNET_CRYPTO_ecc_key_free (key);
+    GNUNET_free (key);
     GNUNET_free (keyfile);
     return GNUNET_SYSERR;
   }
@@ -474,7 +474,7 @@ setup_alice (const struct GNUNET_CONFIGURATION_Handle * cfg)
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
   rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
-  rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+  rd.flags = GNUNET_NAMESTORE_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (nh[2], key, "bob", 
                                            1, &rd, 
@@ -485,12 +485,12 @@ setup_alice (const struct GNUNET_CONFIGURATION_Handle * cfg)
   if (NULL == gh)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to gns\n");
-    GNUNET_CRYPTO_ecc_key_free (key);
+    GNUNET_free (key);
     GNUNET_free (keyfile);
     return GNUNET_SYSERR;
   }
 
-  GNUNET_CRYPTO_ecc_key_free (key);
+  GNUNET_free (key);
   GNUNET_free (keyfile);
   alice_is_setup = GNUNET_YES;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up alice  done\n");
@@ -596,6 +596,7 @@ peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op,
 
 
 void testbed_master (void *cls,
+                     struct GNUNET_TESTBED_RunHandle *h,
                      unsigned int num_peers,
                      struct GNUNET_TESTBED_Peer **peers,
                      unsigned int links_succeeded,