1 files changed, 8 insertions, 9 deletions

diff --git a/src/include/gnunet_messenger_service.h b/src/include/gnunet_messenger_service.h
index 5b03ddecf..0388b7fb2 100644
--- a/src/include/gnunet_messenger_service.h
+++ b/src/include/gnunet_messenger_service.h
@@ -223,7 +223,7 @@ struct GNUNET_MESSENGER_MessageHeader
   /**
    * The signature of the senders private key.
    */
-  struct GNUNET_IDENTITY_Signature signature;
+  struct GNUNET_CRYPTO_Signature signature;
 
   /**
    * The timestamp of the message.
@@ -275,7 +275,7 @@ struct GNUNET_MESSENGER_MessageJoin
   /**
    * The senders public key to verify its signatures.
    */
-  struct GNUNET_IDENTITY_PublicKey key;
+  struct GNUNET_CRYPTO_PublicKey key;
 };
 
 /**
@@ -313,7 +313,7 @@ struct GNUNET_MESSENGER_MessageKey
   /**
    * The new public key which replaces the current senders public key.
    */
-  struct GNUNET_IDENTITY_PublicKey key;
+  struct GNUNET_CRYPTO_PublicKey key;
 };
 
 /**
@@ -610,7 +610,7 @@ typedef int
 struct GNUNET_MESSENGER_Handle*
 GNUNET_MESSENGER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
                           const char *name,
-                          const struct GNUNET_IDENTITY_PrivateKey *key,
+                          const struct GNUNET_CRYPTO_PrivateKey *key,
                           GNUNET_MESSENGER_MessageCallback msg_callback,
                           void *msg_cls);
 
@@ -649,7 +649,7 @@ GNUNET_MESSENGER_set_name (struct GNUNET_MESSENGER_Handle *handle,
  * @param[in] handle Messenger handle to use
  * @return Used public key or NULL
  */
-const struct GNUNET_IDENTITY_PublicKey*
+const struct GNUNET_CRYPTO_PublicKey*
 GNUNET_MESSENGER_get_key (const struct GNUNET_MESSENGER_Handle *handle);
 
 /**
@@ -663,7 +663,7 @@ GNUNET_MESSENGER_get_key (const struct GNUNET_MESSENGER_Handle *handle);
  */
 int
 GNUNET_MESSENGER_set_key (struct GNUNET_MESSENGER_Handle *handle,
-                          const struct GNUNET_IDENTITY_PrivateKey *key);
+                          const struct GNUNET_CRYPTO_PrivateKey *key);
 
 /**
  * Open a room to send and receive messages. The room will use the specified <i>key</i> as port for the underlying cadet
@@ -775,9 +775,8 @@ GNUNET_MESSENGER_contact_get_name (const struct
  * @param[in] contact Contact handle
  * @return Public key used by <i>contact</i> or NULL
  */
-const struct GNUNET_IDENTITY_PublicKey*
-GNUNET_MESSENGER_contact_get_key (const struct
-                                  GNUNET_MESSENGER_Contact *contact);
+const struct GNUNET_CRYPTO_PublicKey*
+GNUNET_MESSENGER_contact_get_key (const struct GNUNET_MESSENGER_Contact *contact);
 
 /**
  * Send a <i>message</i> into a <i>room</i>. If you opened the <i>room</i> all entered members will receive the