removing 'publicKey' argument from CORE init callback

9 files changed, 10 insertions, 18 deletions

diff --git a/src/core/core.h b/src/core/core.h
index 17a4c8fd4..8c208a2ed 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -95,7 +95,7 @@ struct InitReplyMessage
   /**
    * Public key of the local peer.
    */
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded publicKey;
+  struct GNUNET_PeerIdentity my_identity;
 
 };
 
diff --git a/src/core/core_api.c b/src/core/core_api.c
index 3624a6e7f..24013b7cf 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -870,9 +870,7 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
       trigger_next_request (h, GNUNET_NO);
     }
     h->retry_backoff = GNUNET_TIME_UNIT_MILLISECONDS;
-    GNUNET_CRYPTO_hash (&m->publicKey,
-                        sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
-                        &h->me.hashPubKey);
+    h->me = m->my_identity;
     if (NULL != (init = h->init))
     {
       /* mark so we don't call init on reconnect */
@@ -882,7 +880,7 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
                   "Connected to core service of peer `%s'.\n",
                   GNUNET_i2s (&h->me));
 #endif
-      init (h->cls, h, &h->me, &m->publicKey);
+      init (h->cls, h, &h->me);
     }
     else
     {
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 76ed02d2f..34b35f92a 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -1393,8 +1393,7 @@ handle_client_init (void *cls, struct GNUNET_SERVER_Client *client,
   irm.header.size = htons (sizeof (struct InitReplyMessage));
   irm.header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY);
   irm.reserved = htonl (0);
-  memcpy (&irm.publicKey, &my_public_key,
-          sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+  irm.my_identity = my_identity;
 #if DEBUG_CORE_CLIENT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message to client.\n",
               "INIT_REPLY");
diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c
index 7b884f44f..94fecb4ca 100644
--- a/src/core/gnunet-service-core_clients.c
+++ b/src/core/gnunet-service-core_clients.c
@@ -289,7 +289,7 @@ handle_client_init (void *cls, struct GNUNET_SERVER_Client *client,
   irm.header.size = htons (sizeof (struct InitReplyMessage));
   irm.header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY);
   irm.reserved = htonl (0);
-  irm.publicKey = GSC_my_public_key;
+  irm.my_identity = GSC_my_identity;
   send_to_client (c, &irm.header, GNUNET_NO);
   if (0 != (c->options & GNUNET_CORE_OPTION_SEND_CONNECT))
     GSC_SESSIONS_notify_client_about_sessions (c);
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index 3028f32b0..7695f9e86 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -283,8 +283,7 @@ connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 init_notify (void *cls, struct GNUNET_CORE_Handle *server,
-             const struct GNUNET_PeerIdentity *my_identity,
-             const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+             const struct GNUNET_PeerIdentity *my_identity)
 {
   struct PeerContext *p = cls;
 
diff --git a/src/core/test_core_api_preferences.c b/src/core/test_core_api_preferences.c
index 3aeb92572..19d51ef60 100644
--- a/src/core/test_core_api_preferences.c
+++ b/src/core/test_core_api_preferences.c
@@ -346,8 +346,7 @@ ask_connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 init_notify (void *cls, struct GNUNET_CORE_Handle *server,
-             const struct GNUNET_PeerIdentity *my_identity,
-             const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+             const struct GNUNET_PeerIdentity *my_identity)
 {
   struct PeerContext *p = cls;
 
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c
index 7627a32c0..a696c7cbd 100644
--- a/src/core/test_core_api_reliability.c
+++ b/src/core/test_core_api_reliability.c
@@ -365,8 +365,7 @@ static struct GNUNET_CORE_MessageHandler handlers[] = {
 
 static void
 init_notify (void *cls, struct GNUNET_CORE_Handle *server,
-             const struct GNUNET_PeerIdentity *my_identity,
-             const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+             const struct GNUNET_PeerIdentity *my_identity)
 {
   struct PeerContext *p = cls;
 
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c
index ff4b564bf..6b1f3da1c 100644
--- a/src/core/test_core_api_start_only.c
+++ b/src/core/test_core_api_start_only.c
@@ -116,8 +116,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 init_notify (void *cls, struct GNUNET_CORE_Handle *server,
-             const struct GNUNET_PeerIdentity *my_identity,
-             const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+             const struct GNUNET_PeerIdentity *my_identity)
 {
   struct PeerContext *p = cls;
 
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c
index 6f10635fe..5fce06b31 100644
--- a/src/core/test_core_quota_compliance.c
+++ b/src/core/test_core_quota_compliance.c
@@ -504,8 +504,7 @@ static struct GNUNET_CORE_MessageHandler handlers[] = {
 
 static void
 init_notify (void *cls, struct GNUNET_CORE_Handle *server,
-             const struct GNUNET_PeerIdentity *my_identity,
-             const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+             const struct GNUNET_PeerIdentity *my_identity)
 {
   struct PeerContext *p = cls;