1 files changed, 38 insertions, 38 deletions

diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c
index 5e2f1fc11..a104d38fc 100644
--- a/src/gns/test_gns_pseu_shorten.c
+++ b/src/gns/test_gns_pseu_shorten.c
@@ -71,16 +71,16 @@ static struct GNUNET_DHT_Handle *dht_handle;
 
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
-static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded bob_pkey;
-static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded our_pkey;
-static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded priv_pkey;
-static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded short_pkey;
-static struct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
-static struct GNUNET_CRYPTO_RsaPrivateKey *bob_key;
-static struct GNUNET_CRYPTO_RsaPrivateKey *our_key;
-static struct GNUNET_CRYPTO_RsaPrivateKey *priv_key;
-static struct GNUNET_CRYPTO_RsaPrivateKey *short_key;
+static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
+static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded bob_pkey;
+static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded our_pkey;
+static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded priv_pkey;
+static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded short_pkey;
+static struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
+static struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
+static struct GNUNET_CRYPTO_EccPrivateKey *our_key;
+static struct GNUNET_CRYPTO_EccPrivateKey *priv_key;
+static struct GNUNET_CRYPTO_EccPrivateKey *short_key;
 static struct GNUNET_CRYPTO_ShortHashCode alice_hash;
 static struct GNUNET_CRYPTO_ShortHashCode bob_hash;
 static struct GNUNET_CRYPTO_ShortHashCode our_zone;
@@ -236,9 +236,9 @@ on_lookup_result(void *cls, uint32_t rd_count,
 static void
 commence_testing (void *cls, int success)
 {
-  GNUNET_CRYPTO_rsa_key_free(our_key);
-  GNUNET_CRYPTO_rsa_key_free(bob_key);
-  GNUNET_CRYPTO_rsa_key_free(alice_key);
+  GNUNET_CRYPTO_ecc_key_free(our_key);
+  GNUNET_CRYPTO_ecc_key_free(bob_key);
+  GNUNET_CRYPTO_ecc_key_free(alice_key);
   GNUNET_NAMESTORE_disconnect (namestore_handle);
   namestore_handle = NULL;
   gns_handle = GNUNET_GNS_connect(cfg);
@@ -267,7 +267,7 @@ put_pseu_dht (void *cls, int success)
   struct GNUNET_HashCode zone_hash_double;
   uint32_t rd_payload_length;
   char* nrb_data = NULL;
-  struct GNUNET_CRYPTO_RsaSignature *sig;
+  struct GNUNET_CRYPTO_EccSignature *sig;
   struct GNUNET_NAMESTORE_RecordData rd;
   
   memset (&rd, 0, sizeof (struct GNUNET_NAMESTORE_RecordData));
@@ -308,9 +308,9 @@ put_pseu_dht (void *cls, int success)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
     ok = 3;
-    GNUNET_CRYPTO_rsa_key_free(our_key);
-    GNUNET_CRYPTO_rsa_key_free(bob_key);
-    GNUNET_CRYPTO_rsa_key_free(alice_key);
+    GNUNET_CRYPTO_ecc_key_free(our_key);
+    GNUNET_CRYPTO_ecc_key_free(bob_key);
+    GNUNET_CRYPTO_ecc_key_free(alice_key);
     GNUNET_free(sig);
     GNUNET_free (nrb);
     end_badly_now ();
@@ -318,7 +318,7 @@ put_pseu_dht (void *cls, int success)
   }
   GNUNET_CRYPTO_short_hash(GNUNET_GNS_MASTERZONE_STR, strlen(GNUNET_GNS_MASTERZONE_STR), &name_hash);
   GNUNET_CRYPTO_short_hash(&alice_pkey,
-                     sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+                     sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
                      &zone_hash);
 
   GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
@@ -355,7 +355,7 @@ put_www_dht(void *cls, int success)
   struct GNUNET_HashCode zone_hash_double;
   uint32_t rd_payload_length;
   char* nrb_data = NULL;
-  struct GNUNET_CRYPTO_RsaSignature *sig;
+  struct GNUNET_CRYPTO_EccSignature *sig;
   struct GNUNET_NAMESTORE_RecordData rd;
   char* ip = TEST_IP;
   struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
@@ -396,9 +396,9 @@ put_www_dht(void *cls, int success)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
     ok = 3;
-    GNUNET_CRYPTO_rsa_key_free(our_key);
-    GNUNET_CRYPTO_rsa_key_free(bob_key);
-    GNUNET_CRYPTO_rsa_key_free(alice_key);
+    GNUNET_CRYPTO_ecc_key_free(our_key);
+    GNUNET_CRYPTO_ecc_key_free(bob_key);
+    GNUNET_CRYPTO_ecc_key_free(alice_key);
     GNUNET_free (sig);
     GNUNET_free(web);
     GNUNET_free (nrb);
@@ -407,7 +407,7 @@ put_www_dht(void *cls, int success)
   }
   GNUNET_CRYPTO_short_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash);
   GNUNET_CRYPTO_short_hash(&alice_pkey,
-                     sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+                     sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
                      &zone_hash);
   GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double);
   GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
@@ -443,7 +443,7 @@ put_pkey_dht(void *cls, int32_t success, const char *emsg)
   struct GNUNET_HashCode zone_hash_double;
   uint32_t rd_payload_length;
   char* nrb_data = NULL;
-  struct GNUNET_CRYPTO_RsaSignature *sig;
+  struct GNUNET_CRYPTO_EccSignature *sig;
   struct GNUNET_NAMESTORE_RecordData rd;
   
   rd.expiration_time = UINT64_MAX;
@@ -477,9 +477,9 @@ put_pkey_dht(void *cls, int32_t success, const char *emsg)
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
     ok = 3;
     
-    GNUNET_CRYPTO_rsa_key_free (our_key);
-    GNUNET_CRYPTO_rsa_key_free (bob_key);
-    GNUNET_CRYPTO_rsa_key_free (alice_key);
+    GNUNET_CRYPTO_ecc_key_free (our_key);
+    GNUNET_CRYPTO_ecc_key_free (bob_key);
+    GNUNET_CRYPTO_ecc_key_free (alice_key);
     GNUNET_free (sig);
     GNUNET_free (nrb);
     end_badly_now ();
@@ -490,7 +490,7 @@ put_pkey_dht(void *cls, int32_t success, const char *emsg)
   GNUNET_CRYPTO_short_hash(TEST_AUTHORITY_ALICE,
                      strlen(TEST_AUTHORITY_ALICE), &name_hash);
   GNUNET_CRYPTO_short_hash(&bob_pkey,
-                     sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+                     sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
                      &zone_hash);
   GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double);
   GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
@@ -610,21 +610,21 @@ do_check (void *cls,
     end_badly_now();
     return;
   }
-  our_key = GNUNET_CRYPTO_rsa_key_create_from_file (our_keyfile);
-  priv_key = GNUNET_CRYPTO_rsa_key_create_from_file (private_keyfile);
-  short_key = GNUNET_CRYPTO_rsa_key_create_from_file (shorten_keyfile);
-  bob_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_BOB);
-  alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_ALICE);
+  our_key = GNUNET_CRYPTO_ecc_key_create_from_file (our_keyfile);
+  priv_key = GNUNET_CRYPTO_ecc_key_create_from_file (private_keyfile);
+  short_key = GNUNET_CRYPTO_ecc_key_create_from_file (shorten_keyfile);
+  bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB);
+  alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_ALICE);
   
   GNUNET_free(our_keyfile);
   GNUNET_free(shorten_keyfile);
   GNUNET_free(private_keyfile);
 
-  GNUNET_CRYPTO_rsa_key_get_public (our_key, &our_pkey);
-  GNUNET_CRYPTO_rsa_key_get_public (priv_key, &priv_pkey);
-  GNUNET_CRYPTO_rsa_key_get_public (short_key, &short_pkey);
-  GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey);
-  GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey);
+  GNUNET_CRYPTO_ecc_key_get_public (our_key, &our_pkey);
+  GNUNET_CRYPTO_ecc_key_get_public (priv_key, &priv_pkey);
+  GNUNET_CRYPTO_ecc_key_get_public (short_key, &short_pkey);
+  GNUNET_CRYPTO_ecc_key_get_public (bob_key, &bob_pkey);
+  GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey);
   GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash);
   GNUNET_CRYPTO_short_hash(&alice_pkey, sizeof(alice_pkey), &alice_hash);
   GNUNET_CRYPTO_short_hash(&our_pkey, sizeof(our_pkey), &our_zone);