-use valid ECC keys for testing

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

diff --git a/src/gns/test_gns_cname_lookup.c b/src/gns/test_gns_cname_lookup.c
index f73d7b0d8958f1833919d7046f485c5768689287..4d15175e1377f61155502ecb8be04448e33e764b 100644 (file)
--- a/src/gns/test_gns_cname_lookup.c
+++ b/src/gns/test_gns_cname_lookup.c
@@ -23,7 +23,7 @@
  * @author Martin Schanzenbach
  */
 #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"
@@ -164,32 +164,32 @@ on_lookup_result_dns (void *cls,
   if (rd_count == 0)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Lookup failed, rp_filtering?\n");
-    ok = 2;
-    GNUNET_SCHEDULER_shutdown ();
-    return;
+                "CNAME to DNS delegation failed. System offline?\n");
   }
-  ok = 1;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
-  for (i=0; i<rd_count; i++)
+  else
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
-    if (rd[i].record_type == GNUNET_GNS_RECORD_A)
+    ok = 1;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
+    for (i=0; i<rd_count; i++)
     {
-      memcpy(&a, rd[i].data, sizeof(a));
-      addr = inet_ntoa(a);
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
-      if (0 == strcmp(addr, TEST_IP_DNS))
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
+      if (rd[i].record_type == GNUNET_GNS_RECORD_A)
       {
-       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                   "%s correctly resolved to %s!\n", TEST_DOMAIN_DNS, addr);
-       ok = 0;
+       memcpy(&a, rd[i].data, sizeof(a));
+       addr = inet_ntoa(a);
+       GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
+       if (0 == strcmp(addr, TEST_IP_DNS))
+       {
+         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                     "%s correctly resolved to %s!\n", TEST_DOMAIN_DNS, addr);
+         ok = 0;
+       }
       }
-    }
-    else
+      else
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
       }
+    }
   }
   GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_PLUS, GNUNET_GNS_RECORD_CNAME,
                      GNUNET_YES,
@@ -334,9 +334,9 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
-  struct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
-  struct GNUNET_CRYPTO_RsaPrivateKey *bob_key;
+  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
+  struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
+  struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
   char* alice_keyfile;
   struct GNUNET_NAMESTORE_RecordData rd;
   const char* ip = TEST_IP_PLUS;
@@ -365,11 +365,11 @@ do_check (void *cls,
     return;
   }
 
-  alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile);
-  GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey);
+  alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile);
+  GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey);
   GNUNET_free(alice_keyfile);
 
-  bob_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_BOB);
+  bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB);
 
   rd.expiration_time = UINT64_MAX;
   GNUNET_assert(1 == inet_pton (AF_INET, ip, &web));
@@ -429,8 +429,8 @@ do_check (void *cls,
                                  &rd,
                                  &commence_testing,
                                  NULL);
-  GNUNET_CRYPTO_rsa_key_free(alice_key);
-  GNUNET_CRYPTO_rsa_key_free(bob_key);
+  GNUNET_CRYPTO_ecc_key_free(alice_key);
+  GNUNET_CRYPTO_ecc_key_free(bob_key);
 }