1 files changed, 11 insertions, 11 deletions

diff --git a/src/identity/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c
index 093a24c39..cae0e4d95 100644
--- a/src/identity/plugin_rest_identity.c
+++ b/src/identity/plugin_rest_identity.c
@@ -385,7 +385,7 @@ ego_get_all (struct GNUNET_REST_RequestHandle *con_handle,
         GNUNET_CONTAINER_multihashmap_contains (
           handle->rest_handle->url_param_map, &key))
     {
-      privkey_str = GNUNET_IDENTITY_private_key_to_string (
+      privkey_str = GNUNET_CRYPTO_private_key_to_string (
         GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego));
       json_object_set_new (json_ego,
                            GNUNET_REST_IDENTITY_PARAM_PRIVKEY,
@@ -440,7 +440,7 @@ ego_get_response (struct RequestHandle *handle, struct EgoEntry *ego_entry)
       GNUNET_CONTAINER_multihashmap_contains (
         handle->rest_handle->url_param_map, &key))
   {
-    privkey_str = GNUNET_IDENTITY_private_key_to_string (
+    privkey_str = GNUNET_CRYPTO_private_key_to_string (
       GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego));
     json_object_set_new (json_ego,
                          GNUNET_REST_IDENTITY_PARAM_PRIVKEY,
@@ -576,7 +576,7 @@ do_finished (void *cls, enum GNUNET_ErrorCode ec)
  */
 static void
 do_finished_create (void *cls,
-                    const struct GNUNET_IDENTITY_PrivateKey *pk,
+                    const struct GNUNET_CRYPTO_PrivateKey *pk,
                     enum GNUNET_ErrorCode ec)
 {
   struct RequestHandle *handle = cls;
@@ -762,8 +762,8 @@ ego_create (struct GNUNET_REST_RequestHandle *con_handle,
   json_error_t err;
   char *egoname;
   char *privkey;
-  struct GNUNET_IDENTITY_PrivateKey pk;
-  struct GNUNET_IDENTITY_PrivateKey *pk_ptr;
+  struct GNUNET_CRYPTO_PrivateKey pk;
+  struct GNUNET_CRYPTO_PrivateKey *pk_ptr;
   int json_unpack_state;
   char term_data[handle->data_size + 1];
 
@@ -825,7 +825,7 @@ ego_create (struct GNUNET_REST_RequestHandle *con_handle,
                                    strlen (privkey),
                                    &pk,
                                    sizeof(struct
-                                          GNUNET_IDENTITY_PrivateKey));
+                                          GNUNET_CRYPTO_PrivateKey));
     pk_ptr = &pk;
   }
   else
@@ -834,7 +834,7 @@ ego_create (struct GNUNET_REST_RequestHandle *con_handle,
   handle->op = GNUNET_IDENTITY_create (identity_handle,
                                        handle->name,
                                        pk_ptr,
-                                       GNUNET_IDENTITY_TYPE_ECDSA,
+                                       GNUNET_PUBLIC_KEY_TYPE_ECDSA,
                                        &do_finished_create,
                                        handle);
 }
@@ -945,7 +945,7 @@ ego_sign_data_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
     return;
   }
 
-  if (ntohl (ego->pk.type) != GNUNET_IDENTITY_TYPE_EDDSA)
+  if (ntohl (ego->pk.type) != GNUNET_PUBLIC_KEY_TYPE_EDDSA)
   {
     handle->ec = GNUNET_EC_IDENTITY_NOT_FOUND;
     GNUNET_SCHEDULER_add_now (&do_error, handle);
@@ -1069,7 +1069,7 @@ list_ego (void *cls,
           const char *identifier)
 {
   struct EgoEntry *ego_entry;
-  struct GNUNET_IDENTITY_PublicKey pk;
+  struct GNUNET_CRYPTO_PublicKey pk;
 
   if ((NULL == ego) && (ID_REST_STATE_INIT == state))
   {
@@ -1086,7 +1086,7 @@ list_ego (void *cls,
   {
     ego_entry = GNUNET_new (struct EgoEntry);
     GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
-    ego_entry->keystring = GNUNET_IDENTITY_public_key_to_string (&pk);
+    ego_entry->keystring = GNUNET_CRYPTO_public_key_to_string (&pk);
     ego_entry->ego = ego;
     ego_entry->identifier = GNUNET_strdup (identifier);
     GNUNET_CONTAINER_DLL_insert_tail (ego_head,
@@ -1112,7 +1112,7 @@ list_ego (void *cls,
       /* Add */
       ego_entry = GNUNET_new (struct EgoEntry);
       GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
-      ego_entry->keystring = GNUNET_IDENTITY_public_key_to_string (&pk);
+      ego_entry->keystring = GNUNET_CRYPTO_public_key_to_string (&pk);
       ego_entry->ego = ego;
       ego_entry->identifier = GNUNET_strdup (identifier);
       GNUNET_CONTAINER_DLL_insert_tail (ego_head,