1 files changed, 19 insertions, 19 deletions

diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c
index 7adc86eb8..9fe4ccc51 100644
--- a/src/identity/gnunet-identity.c
+++ b/src/identity/gnunet-identity.c
@@ -123,7 +123,7 @@ static struct GNUNET_IDENTITY_Operation *delete_op;
 /**
  * Private key from command line option, or NULL.
  */
-struct GNUNET_IDENTITY_PrivateKey pk;
+struct GNUNET_CRYPTO_PrivateKey pk;
 
 /**
  * Value to return from #main().
@@ -213,7 +213,7 @@ delete_finished (void *cls,
  */
 static void
 create_finished (void *cls,
-                 const struct GNUNET_IDENTITY_PrivateKey *pk,
+                 const struct GNUNET_CRYPTO_PrivateKey *pk,
                  enum GNUNET_ErrorCode ec)
 {
   struct GNUNET_IDENTITY_Operation **op = cls;
@@ -228,16 +228,16 @@ create_finished (void *cls,
   }
   else if (verbose)
   {
-    struct GNUNET_IDENTITY_PublicKey pub;
+    struct GNUNET_CRYPTO_PublicKey pub;
     char *pubs;
 
-    GNUNET_IDENTITY_key_get_public (pk, &pub);
-    pubs = GNUNET_IDENTITY_public_key_to_string (&pub);
+    GNUNET_CRYPTO_key_get_public (pk, &pub);
+    pubs = GNUNET_CRYPTO_public_key_to_string (&pub);
     if (private_keys)
     {
       char *privs;
 
-      privs = GNUNET_IDENTITY_private_key_to_string (pk);
+      privs = GNUNET_CRYPTO_private_key_to_string (pk);
       fprintf (stdout, "%s - %s\n", pubs, privs);
       GNUNET_free (privs);
     }
@@ -258,15 +258,15 @@ create_finished (void *cls,
 static void
 write_encrypted_message (void)
 {
-  struct GNUNET_IDENTITY_PublicKey recipient;
+  struct GNUNET_CRYPTO_PublicKey recipient;
   size_t ct_len = strlen (write_msg) + 1
-                  + GNUNET_IDENTITY_ENCRYPT_OVERHEAD_BYTES;
+                  + GNUNET_CRYPTO_ENCRYPT_OVERHEAD_BYTES;
   unsigned char ct[ct_len];
-  if (GNUNET_IDENTITY_public_key_from_string (pubkey_msg, &recipient) !=
+  if (GNUNET_CRYPTO_public_key_from_string (pubkey_msg, &recipient) !=
       GNUNET_SYSERR)
   {
     size_t msg_len = strlen (write_msg) + 1;
-    if (GNUNET_OK == GNUNET_IDENTITY_encrypt (write_msg,
+    if (GNUNET_OK == GNUNET_CRYPTO_encrypt (write_msg,
                                               msg_len,
                                               &recipient,
                                               ct, ct_len))
@@ -309,7 +309,7 @@ read_encrypted_message (struct GNUNET_IDENTITY_Ego *ego)
                                                         deserialized_msg,
                                                         &msg_len))
   {
-    if (GNUNET_OK == GNUNET_IDENTITY_decrypt (deserialized_msg,
+    if (GNUNET_OK == GNUNET_CRYPTO_decrypt (deserialized_msg,
                                               msg_len,
                                               GNUNET_IDENTITY_ego_get_private_key (
                                                 ego),
@@ -373,7 +373,7 @@ print_ego (void *cls,
            void **ctx,
            const char *identifier)
 {
-  struct GNUNET_IDENTITY_PublicKey pk;
+  struct GNUNET_CRYPTO_PublicKey pk;
   char *s;
   char *privs;
 
@@ -405,8 +405,8 @@ print_ego (void *cls,
                      set_ego)) )
     return;
   GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
-  s = GNUNET_IDENTITY_public_key_to_string (&pk);
-  privs = GNUNET_IDENTITY_private_key_to_string (
+  s = GNUNET_CRYPTO_public_key_to_string (&pk);
+  privs = GNUNET_CRYPTO_private_key_to_string (
     GNUNET_IDENTITY_ego_get_private_key (ego));
   if ((NULL != read_msg) && (NULL != set_ego))
   {
@@ -429,12 +429,12 @@ print_ego (void *cls,
       if (private_keys)
         fprintf (stdout, "%s - %s - %s - %s\n",
                  identifier, s, privs,
-                 (ntohl (pk.type) == GNUNET_IDENTITY_TYPE_ECDSA) ?
+                 (ntohl (pk.type) == GNUNET_PUBLIC_KEY_TYPE_ECDSA) ?
                  "ECDSA" : "EdDSA");
       else
         fprintf (stdout, "%s - %s - %s\n",
                  identifier, s,
-                 (ntohl (pk.type) == GNUNET_IDENTITY_TYPE_ECDSA) ?
+                 (ntohl (pk.type) == GNUNET_PUBLIC_KEY_TYPE_ECDSA) ?
                  "ECDSA" : "EdDSA");
 
     }
@@ -497,7 +497,7 @@ run (void *cls,
                                      strlen (privkey_ego),
                                      &pk,
                                      sizeof(struct
-                                            GNUNET_IDENTITY_PrivateKey));
+                                            GNUNET_CRYPTO_PrivateKey));
       create_op =
         GNUNET_IDENTITY_create (sh,
                                 create_ego,
@@ -512,8 +512,8 @@ run (void *cls,
                                 create_ego,
                                 NULL,
                                 (type_eddsa) ?
-                                GNUNET_IDENTITY_TYPE_EDDSA :
-                                GNUNET_IDENTITY_TYPE_ECDSA,
+                                GNUNET_PUBLIC_KEY_TYPE_EDDSA :
+                                GNUNET_PUBLIC_KEY_TYPE_ECDSA,
                                 &create_finished,
                                 &create_op);
   }