-handle failure to load certs more nicely

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

diff --git a/src/gns/test_gns_max_queries.c b/src/gns/test_gns_max_queries.c
index fae90bf72d5d06cf89f8f996de9cc9053e8bfcc1..30406601749dfcef0e119a2d05d447d5abe9c793 100644 (file)
--- a/src/gns/test_gns_max_queries.c
+++ b/src/gns/test_gns_max_queries.c
@@ -23,7 +23,7 @@
  * in particular query replacement and clean shutdown
  */
 #include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 #include "gnunet_core_service.h"
 #include "block_dns.h"
 #include "gns.h"
@@ -37,8 +37,8 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
 /* test records to resolve */
-#define TEST_DOMAIN "www.gads"
-#define TEST_DOMAIN_NACK "doesnotexist.bob.gads"
+#define TEST_DOMAIN "www.gnu"
+#define TEST_DOMAIN_NACK "doesnotexist.bob.gnu"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "www"
 #define TEST_ADDITIONAL_LOOKUPS 5
@@ -182,7 +182,7 @@ on_lookup_result (void *cls, uint32_t rd_count,
     for (i=0; i<rd_count; i++)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
-      if (rd[i].record_type == GNUNET_GNS_RECORD_A)
+      if (rd[i].record_type == GNUNET_DNSPARSER_TYPE_A)
       {
         memcpy(&a, rd[i].data, sizeof(a));
         addr = inet_ntoa(a);
@@ -212,7 +212,7 @@ static void
 commence_testing (void *cls, int32_t success, const char *emsg)
 {
   int i;
-  char lookup_name[MAX_DNS_NAME_LENGTH];
+  char lookup_name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
   struct GNUNET_GNS_LookupRequest *lr;
   
   gns_handle = GNUNET_GNS_connect(cfg);
@@ -229,15 +229,15 @@ commence_testing (void *cls, int32_t success, const char *emsg)
   for (i=0; i<max_parallel_lookups+TEST_ADDITIONAL_LOOKUPS; i++)
   {
     GNUNET_snprintf(lookup_name,
-                    MAX_DNS_NAME_LENGTH,
-                    "www.doesnotexist-%d.bob.gads", i);
-    lr = GNUNET_GNS_lookup (gns_handle, lookup_name, GNUNET_GNS_RECORD_A,
+                    GNUNET_DNSPARSER_MAX_NAME_LENGTH,
+                    "www.doesnotexist-%d.bob.gnu", i);
+    lr = GNUNET_GNS_lookup (gns_handle, lookup_name, GNUNET_DNSPARSER_TYPE_A,
                            GNUNET_NO,
                            NULL,
                            &on_lookup_result_dummy, &requests[num_requests]);
     requests[num_requests++] = lr;
   }
-  lr = GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
+  lr = GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_DNSPARSER_TYPE_A,
                          GNUNET_NO,
                          NULL,
                          &on_lookup_result, TEST_DOMAIN);
@@ -252,10 +252,10 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded bob_pkey;
-  struct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
-  struct GNUNET_CRYPTO_RsaPrivateKey *bob_key;
+  struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey;
+  struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
+  struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
   char* alice_keyfile;
   struct GNUNET_CRYPTO_ShortHashCode bob_hash;
 
@@ -292,11 +292,11 @@ do_check (void *cls,
   }
   requests = GNUNET_malloc ((max_parallel_lookups + TEST_ADDITIONAL_LOOKUPS + 1) *
                            sizeof (struct GNUNET_GNS_LookupRequest *));
-  alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile);
-  bob_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_BOB);
+  alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile);
+  bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB);
 
-  GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey);
-  GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey);
   
   GNUNET_free(alice_keyfile);
 
@@ -308,29 +308,29 @@ do_check (void *cls,
   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_create (namestore_handle,
-                                  alice_key,
-                                  TEST_RECORD_NAME,
-                                  &rd,
-                                  NULL,
-                                  NULL);
+  GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
+                                           alice_key,
+                                           TEST_RECORD_NAME,
+                                           1, &rd,
+                                           NULL,
+                                           NULL);
 
   GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash);
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
-  rd.record_type = GNUNET_GNS_RECORD_PKEY;
-
-  GNUNET_NAMESTORE_record_create (namestore_handle,
-                                  alice_key,
-                                  TEST_AUTHORITY_NAME,
-                                  &rd,
-                                  &commence_testing,
-                                  NULL);
+  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+
+  GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
+                                           alice_key,
+                                           TEST_AUTHORITY_NAME,
+                                           1, &rd,
+                                           &commence_testing,
+                                           NULL);
   
-  GNUNET_CRYPTO_rsa_key_free(alice_key);
-  GNUNET_CRYPTO_rsa_key_free(bob_key);
+  GNUNET_free(alice_key);
+  GNUNET_free(bob_key);
   GNUNET_free(web);
 
 }