1 files changed, 19 insertions, 19 deletions

diff --git a/src/abd/gnunet-abd.c b/src/abd/gnunet-abd.c
index 6f6521d98..1ed1adbe7 100644
--- a/src/abd/gnunet-abd.c
+++ b/src/abd/gnunet-abd.c
@@ -43,7 +43,7 @@ static struct GNUNET_NAMESTORE_Handle *ns;
 /**
  * Private key for the our zone.
  */
-static struct GNUNET_IDENTITY_PrivateKey zone_pkey;
+static struct GNUNET_CRYPTO_PrivateKey zone_pkey;
 
 /**
  * EgoLookup
@@ -98,12 +98,12 @@ static char *expiration;
 /**
  * Subject key
  */
-struct GNUNET_IDENTITY_PublicKey subject_pkey;
+struct GNUNET_CRYPTO_PublicKey subject_pkey;
 
 /**
  * Issuer key
  */
-struct GNUNET_IDENTITY_PublicKey issuer_pkey;
+struct GNUNET_CRYPTO_PublicKey issuer_pkey;
 
 
 /**
@@ -277,9 +277,9 @@ handle_intermediate_result (void *cls,
 
   printf ("%s Intermediate result: %s.%s <- %s.%s\n",
           prefix,
-          GNUNET_IDENTITY_public_key_to_string (&dd->issuer_key),
+          GNUNET_CRYPTO_public_key_to_string (&dd->issuer_key),
           dd->issuer_attribute,
-          GNUNET_IDENTITY_public_key_to_string (&dd->subject_key),
+          GNUNET_CRYPTO_public_key_to_string (&dd->subject_key),
           dd->subject_attribute);
 }
 
@@ -332,8 +332,8 @@ handle_verify_result (void *cls,
     printf ("Delegation Chain:\n");
     for (i = 0; i < d_count; i++)
     {
-      iss_key = GNUNET_IDENTITY_public_key_to_string (&dc[i].issuer_key);
-      sub_key = GNUNET_IDENTITY_public_key_to_string (&dc[i].subject_key);
+      iss_key = GNUNET_CRYPTO_public_key_to_string (&dc[i].issuer_key);
+      sub_key = GNUNET_CRYPTO_public_key_to_string (&dc[i].subject_key);
 
       if (0 != dc[i].subject_attribute_len)
       {
@@ -358,8 +358,8 @@ handle_verify_result (void *cls,
     printf ("\nDelegate(s):\n");
     for (i = 0; i < c_count; i++)
     {
-      iss_key = GNUNET_IDENTITY_public_key_to_string (&dele[i].issuer_key);
-      sub_key = GNUNET_IDENTITY_public_key_to_string (&dele[i].subject_key);
+      iss_key = GNUNET_CRYPTO_public_key_to_string (&dele[i].issuer_key);
+      sub_key = GNUNET_CRYPTO_public_key_to_string (&dele[i].subject_key);
       printf ("%s.%s <- %s\n", iss_key, dele[i].issuer_attribute, sub_key);
       GNUNET_free (iss_key);
       GNUNET_free (sub_key);
@@ -381,7 +381,7 @@ handle_verify_result (void *cls,
 static void
 identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
 {
-  const struct GNUNET_IDENTITY_PrivateKey *privkey;
+  const struct GNUNET_CRYPTO_PrivateKey *privkey;
 
   el = NULL;
   if (NULL == ego)
@@ -400,7 +400,7 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
   {
 
     if (GNUNET_OK !=
-        GNUNET_IDENTITY_public_key_from_string (issuer_key,
+        GNUNET_CRYPTO_public_key_from_string (issuer_key,
                                                     &issuer_pkey))
     {
       fprintf (stderr,
@@ -501,7 +501,7 @@ add_continuation (void *cls, int32_t success, const char *emsg)
 
 static void
 get_existing_record (void *cls,
-                     const struct GNUNET_IDENTITY_PrivateKey *zone_key,
+                     const struct GNUNET_CRYPTO_PrivateKey *zone_key,
                      const char *rec_name,
                      unsigned int rd_count,
                      const struct GNUNET_GNSRECORD_Data *rd)
@@ -545,7 +545,7 @@ store_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
 {
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   struct GNUNET_ABD_Delegate *cred;
-  struct GNUNET_IDENTITY_PublicKey zone_pubkey;
+  struct GNUNET_CRYPTO_PublicKey zone_pubkey;
   char *subject_pubkey_str;
   char *zone_pubkey_str;
 
@@ -586,12 +586,12 @@ store_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
 
     // Get import subject public key string
     subject_pubkey_str =
-      GNUNET_IDENTITY_public_key_to_string (&cred->subject_key);
+      GNUNET_CRYPTO_public_key_to_string (&cred->subject_key);
 
     // Get zone public key string
     GNUNET_IDENTITY_ego_get_public_key (ego, &zone_pubkey);
     zone_pubkey_str =
-      GNUNET_IDENTITY_public_key_to_string (&zone_pubkey);
+      GNUNET_CRYPTO_public_key_to_string (&zone_pubkey);
 
     // Check if the subject key in the signed import matches the zone's key it is issued to
     if (strcmp (zone_pubkey_str, subject_pubkey_str) != 0)
@@ -668,7 +668,7 @@ store_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
 static void
 sign_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
 {
-  const struct GNUNET_IDENTITY_PrivateKey *privkey;
+  const struct GNUNET_CRYPTO_PrivateKey *privkey;
   struct GNUNET_ABD_Delegate *dele;
   struct GNUNET_TIME_Absolute etime_abs;
   char *res;
@@ -718,7 +718,7 @@ sign_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
     return;
   }
   if (GNUNET_OK !=
-      GNUNET_IDENTITY_public_key_from_string (subject_pubkey_str,
+      GNUNET_CRYPTO_public_key_from_string (subject_pubkey_str,
                                                   &subject_pkey))
   {
     fprintf (stderr,
@@ -883,7 +883,7 @@ run (void *cls,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  if (GNUNET_OK != GNUNET_IDENTITY_public_key_from_string (subject,
+  if (GNUNET_OK != GNUNET_CRYPTO_public_key_from_string (subject,
                                                                &subject_pkey))
   {
     fprintf (stderr,
@@ -902,7 +902,7 @@ run (void *cls,
       return;
     }
     if (GNUNET_OK !=
-        GNUNET_IDENTITY_public_key_from_string (issuer_key,
+        GNUNET_CRYPTO_public_key_from_string (issuer_key,
                                                     &issuer_pkey))
     {
       fprintf (stderr,