-handle failure to load certs more nicely

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

diff --git a/src/gns/test_gns_simple_delegated_lookup.c b/src/gns/test_gns_simple_delegated_lookup.c
index c01bd8cce02266132baf7f83688b38e686f17dcc..937049dbeda1ef88964642f5db8c781d0a6db0c2 100644 (file)
--- a/src/gns/test_gns_simple_delegated_lookup.c
+++ b/src/gns/test_gns_simple_delegated_lookup.c
@@ -37,7 +37,7 @@
  * the peers.
  */
 #include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 #include "gnunet_core_service.h"
 #include "block_dns.h"
 #include "gnunet_signatures.h"
@@ -50,7 +50,7 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
 /* test records to resolve */
-#define TEST_DOMAIN "www.bob.gads"
+#define TEST_DOMAIN "www.bob.gnu"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "www"
 
@@ -138,7 +138,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)
       continue;
     memcpy (&a, rd[i].data, sizeof (a));
     addr = inet_ntoa (a);
@@ -177,7 +177,7 @@ commence_testing (void *cls, int32_t success, const char *emsg)
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
+  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_DNSPARSER_TYPE_A,
                     GNUNET_NO,
                     NULL,
                     &on_lookup_result, TEST_DOMAIN);
@@ -189,12 +189,12 @@ 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;
   struct GNUNET_CRYPTO_ShortHashCode bob_hash;
-  struct GNUNET_CRYPTO_RsaSignature *sig;
+  struct GNUNET_CRYPTO_EccSignature *sig;
   char* alice_keyfile;
   struct GNUNET_TIME_Absolute et;
   struct GNUNET_NAMESTORE_RecordData rd;
@@ -223,23 +223,23 @@ do_check (void *cls,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile);
-  bob_key = GNUNET_CRYPTO_rsa_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);
+  alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile);
+  bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey);
   rd.expiration_time = UINT64_MAX;
   GNUNET_assert (1 == inet_pton (AF_INET, ip, &web));
   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;
-  rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
-  GNUNET_NAMESTORE_record_create (namestore_handle,
-                                  alice_key,
-                                  TEST_AUTHORITY_NAME,
-                                  &rd,
-                                  NULL,
-                                  NULL);
+  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+  rd.flags = GNUNET_NAMESTORE_RF_NONE;
+  GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
+                                           alice_key,
+                                           TEST_AUTHORITY_NAME,
+                                           1, &rd,
+                                           NULL,
+                                           NULL);
   rd.data_size = sizeof(struct in_addr);
   rd.data = &web;
   rd.record_type = GNUNET_DNSPARSER_TYPE_A;
@@ -247,7 +247,7 @@ do_check (void *cls,
                                           GNUNET_TIME_UNIT_FOREVER_ABS,
                                           TEST_RECORD_NAME,
                                           &rd, 1);
-  et.abs_value = rd.expiration_time;
+  et.abs_value_us = rd.expiration_time;
   GNUNET_NAMESTORE_record_put (namestore_handle,
                                &bob_pkey,
                                TEST_RECORD_NAME,
@@ -259,8 +259,8 @@ do_check (void *cls,
                                NULL);
   GNUNET_free (sig);
   GNUNET_free (alice_keyfile);
-  GNUNET_CRYPTO_rsa_key_free (bob_key);
-  GNUNET_CRYPTO_rsa_key_free (alice_key);
+  GNUNET_free (bob_key);
+  GNUNET_free (alice_key);
 }