3 files changed, 19 insertions, 10 deletions

diff --git a/src/identity/gnunet-service-identity.c b/src/identity/gnunet-service-identity.c
index f1156e0b6..07296a882 100644
--- a/src/identity/gnunet-service-identity.c
+++ b/src/identity/gnunet-service-identity.c
@@ -244,6 +244,7 @@ create_update_message (struct Ego *ego)
                              GNUNET_MESSAGE_TYPE_IDENTITY_UPDATE);
   um->name_len = htons (name_len);
   um->end_of_list = htons (GNUNET_NO);
+  um->key_len = htons (key_len);
   GNUNET_memcpy (&um[1], ego->identifier, name_len);
   GNUNET_IDENTITY_write_private_key_to_buffer (&ego->pk,
                                                ((char*) &um[1]) + name_len,
@@ -287,6 +288,7 @@ handle_start_message (void *cls,
                                GNUNET_MESSAGE_TYPE_IDENTITY_UPDATE);
     ume->end_of_list = htons (GNUNET_YES);
     ume->name_len = htons (0);
+    ume->key_len = htons (0);
     GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
                     env);
   }
@@ -426,6 +428,7 @@ notify_listeners (struct Ego *ego)
   um->header.size = htons (sizeof(struct UpdateMessage) + name_len + key_len);
   um->name_len = htons (name_len);
   um->end_of_list = htons (GNUNET_NO);
+  um->key_len = htons (key_len);
   GNUNET_memcpy (&um[1], ego->identifier, name_len);
   GNUNET_IDENTITY_write_private_key_to_buffer (&ego->pk,
                                                ((char*) &um[1]) + name_len,
@@ -458,8 +461,7 @@ check_create_message (void *cls,
     return GNUNET_SYSERR;
   }
   name_len = ntohs (msg->name_len);
-  key_len = ntohl (msg->key_len);
-  GNUNET_break (0 == ntohs (msg->reserved));
+  key_len = ntohs (msg->key_len);
   if (name_len + key_len + sizeof(struct CreateRequestMessage) != size)
   {
     GNUNET_break (0);
@@ -494,7 +496,7 @@ handle_create_message (void *cls,
   size_t kb_read;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received CREATE message from client\n");
-  key_len = ntohl (crm->key_len);
+  key_len = ntohs (crm->key_len);
   if ((GNUNET_SYSERR ==
       GNUNET_IDENTITY_read_private_key_from_buffer (&crm[1],
                                                     key_len,
diff --git a/src/identity/identity.h b/src/identity/identity.h
index dc57ee11e..a3193ca2a 100644
--- a/src/identity/identity.h
+++ b/src/identity/identity.h
@@ -128,6 +128,16 @@ struct UpdateMessage
    */
   uint16_t end_of_list GNUNET_PACKED;
 
+  /**
+   * Key length
+   */
+  uint16_t key_len GNUNET_PACKED;
+
+  /**
+   * Reserved (alignment)
+   */
+  uint16_t reserved GNUNET_PACKED;
+
   /* followed by 0-terminated ego name */
   /* followed by the private key */
 };
@@ -150,11 +160,9 @@ struct CreateRequestMessage
   uint16_t name_len GNUNET_PACKED;
 
   /**
-   * Always zero.
+   * Key length
    */
-  uint16_t reserved GNUNET_PACKED;
-
-  uint32_t key_len GNUNET_PACKED;
+  uint16_t key_len GNUNET_PACKED;
 
   /*
    * Followed by the private key
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c
index ef2aacb78..47a78e2bb 100644
--- a/src/identity/identity_api.c
+++ b/src/identity/identity_api.c
@@ -412,7 +412,7 @@ handle_identity_update (void *cls,
   tmp = (const char*) &um[1];
   str = (0 == name_len) ? NULL : tmp;
   memset (&private_key, 0, sizeof (private_key));
-  key_len = ntohs (um->header.size) - name_len;
+  key_len = ntohs (um->key_len);
   GNUNET_assert (GNUNET_SYSERR !=
                  GNUNET_IDENTITY_read_private_key_from_buffer (tmp + name_len,
                                                                key_len,
@@ -621,11 +621,10 @@ GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *h,
   env = GNUNET_MQ_msg_extra (crm, slen + key_len,
                              GNUNET_MESSAGE_TYPE_IDENTITY_CREATE);
   crm->name_len = htons (slen);
-  crm->reserved = htons (0);
   GNUNET_IDENTITY_write_private_key_to_buffer (&private_key,
                                                &crm[1],
                                                key_len);
-  crm->key_len = htonl (key_len);
+  crm->key_len = htons (key_len);
   op->pk = private_key;
   GNUNET_memcpy ((char*) &crm[1] + key_len, name, slen);
   GNUNET_MQ_send (h->mq, env);