1 files changed, 10 insertions, 9 deletions

diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c
index 3fd052277..47a78e2bb 100644
--- a/src/identity/identity_api.c
+++ b/src/identity/identity_api.c
@@ -26,6 +26,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
+#include "gnunet_error_codes.h"
 #include "gnunet_protocols.h"
 #include "gnunet_identity_service.h"
 #include "identity.h"
@@ -197,6 +198,7 @@ GNUNET_IDENTITY_key_get_public (const struct
   return GNUNET_OK;
 }
 
+
 static enum GNUNET_GenericReturnValue
 private_key_create (enum GNUNET_IDENTITY_KeyType ktype,
                     struct GNUNET_IDENTITY_PrivateKey *key)
@@ -410,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,
@@ -616,13 +618,13 @@ GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *h,
   else
     private_key = *privkey;
   key_len = GNUNET_IDENTITY_private_key_get_length (&private_key);
-  env = GNUNET_MQ_msg_extra (crm, slen + key_len, GNUNET_MESSAGE_TYPE_IDENTITY_CREATE);
+  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);
@@ -840,6 +842,7 @@ GNUNET_IDENTITY_public_key_get_length (const struct
   return -1;
 }
 
+
 ssize_t
 GNUNET_IDENTITY_private_key_length_by_type (enum GNUNET_IDENTITY_KeyType kt)
 {
@@ -858,7 +861,6 @@ GNUNET_IDENTITY_private_key_length_by_type (enum GNUNET_IDENTITY_KeyType kt)
 }
 
 
-
 enum GNUNET_GenericReturnValue
 GNUNET_IDENTITY_read_public_key_from_buffer (const void *buffer,
                                              size_t len,
@@ -901,6 +903,7 @@ GNUNET_IDENTITY_write_public_key_to_buffer (const struct
   return length;
 }
 
+
 enum GNUNET_GenericReturnValue
 GNUNET_IDENTITY_read_private_key_from_buffer (const void *buffer,
                                               size_t len,
@@ -981,7 +984,6 @@ GNUNET_IDENTITY_signature_get_raw_length_by_type (uint32_t type)
 }
 
 
-
 ssize_t
 GNUNET_IDENTITY_read_signature_from_buffer (struct
                                             GNUNET_IDENTITY_Signature *sig,
@@ -1019,6 +1021,7 @@ GNUNET_IDENTITY_write_signature_to_buffer (const struct
   return length;
 }
 
+
 enum GNUNET_GenericReturnValue
 GNUNET_IDENTITY_sign_raw_ (const struct
                            GNUNET_IDENTITY_PrivateKey *priv,
@@ -1046,7 +1049,6 @@ GNUNET_IDENTITY_sign_raw_ (const struct
 }
 
 
-
 enum GNUNET_GenericReturnValue
 GNUNET_IDENTITY_sign_ (const struct
                        GNUNET_IDENTITY_PrivateKey *priv,
@@ -1133,8 +1135,6 @@ GNUNET_IDENTITY_signature_verify_raw_ (uint32_t purpose,
 }
 
 
-
-
 ssize_t
 GNUNET_IDENTITY_encrypt (const void *block,
                          size_t size,
@@ -1228,6 +1228,7 @@ GNUNET_IDENTITY_private_key_to_string (const struct
                                               size);
 }
 
+
 enum GNUNET_GenericReturnValue
 GNUNET_IDENTITY_public_key_from_string (const char *str,
                                         struct GNUNET_IDENTITY_PublicKey *key)