IDENTITY

This commit is a major rework of the unclean GNUNET_IDENTITY_*Key
structures and its use in serialized objects (e.g. RPC messages).
The structures are now no longer to be used directly but instead through
their serialization helper functions whenever needed.

7 files changed, 171 insertions, 56 deletions

diff --git a/src/conversation/conversation.h b/src/conversation/conversation.h
index d244f5163..ee4ca372c 100644
--- a/src/conversation/conversation.h
+++ b/src/conversation/conversation.h
@@ -105,9 +105,13 @@ struct ClientPhoneRingMessage
   uint32_t cid GNUNET_PACKED;
 
   /**
-   * Who is calling us?
+   * The identity key length
+   */
+  uint32_t key_len;
+
+  /**
+   * followed by who is calling us?, a public key
    */
-  struct GNUNET_IDENTITY_PublicKey caller_id;
 };
 
 
@@ -230,9 +234,13 @@ struct ClientCallMessage
   struct GNUNET_HashCode line_port;
 
   /**
-   * Identity of the caller.
+   * The identity key length
+   */
+  uint32_t key_len;
+
+  /**
+   * followed by the identity of the caller.
    */
-  struct GNUNET_IDENTITY_PrivateKey caller_id;
 };
 
 
@@ -301,19 +309,24 @@ struct CadetPhoneRingMessage
   uint32_t reserved GNUNET_PACKED;
 
   /**
-   * Who is calling us? (also who is signing).
+   * When does the signature expire?
    */
-  struct GNUNET_IDENTITY_PublicKey caller_id;
+  struct GNUNET_TIME_AbsoluteNBO expiration_time;
 
   /**
-   * When does the signature expire?
+   * The length of the key
    */
-  struct GNUNET_TIME_AbsoluteNBO expiration_time;
+  uint32_t key_len;
+
+  /**
+   * The length of the signature
+   */
+  uint32_t sig_len;
 
   /**
-   * Signature over a `struct CadetPhoneRingInfoPS`
+   * Followed by the public key of who is calling us? (also who is signing).
+   * followed by the signature over a `struct CadetPhoneRingInfoPS`
    */
-  struct GNUNET_IDENTITY_Signature signature;
 };
 
 
diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c
index 2ede33586..9c4c520be 100644
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -238,7 +238,19 @@ transmit_phone_audio (void *cls,
                   e);
 }
 
-
+/**
+ * We received a `struct ClientPhoneRingMessage`
+ *
+ * @param cls the `struct GNUNET_CONVERSATION_Phone`
+ * @param ring the message
+ */
+static enum GNUNET_GenericReturnValue
+check_phone_ring (void *cls,
+                   const struct ClientPhoneRingMessage *ring)
+{
+  //FIXME
+  return GNUNET_OK;
+}
 /**
  * We received a `struct ClientPhoneRingMessage`
  *
@@ -251,7 +263,11 @@ handle_phone_ring (void *cls,
 {
   struct GNUNET_CONVERSATION_Phone *phone = cls;
   struct GNUNET_CONVERSATION_Caller *caller;
+  struct GNUNET_IDENTITY_PublicKey caller_id;
+  size_t key_len;
+  size_t read;
 
+  key_len = ntohl (ring->key_len);
   switch (phone->state)
   {
   case PS_REGISTER:
@@ -259,12 +275,22 @@ handle_phone_ring (void *cls,
     break;
 
   case PS_READY:
+    if ((GNUNET_SYSERR ==
+         GNUNET_IDENTITY_read_public_key_from_buffer (&ring[1],
+                                                      key_len,
+                                                      &caller_id,
+                                                      &read)) ||
+        (read != key_len))
+    {
+      GNUNET_break (0);
+      break;
+    }
     caller = GNUNET_new (struct GNUNET_CONVERSATION_Caller);
     caller->phone = phone;
     GNUNET_CONTAINER_DLL_insert (phone->caller_head,
                                  phone->caller_tail,
                                  caller);
-    caller->caller_id = ring->caller_id;
+    caller->caller_id = caller_id;
     caller->cid = ring->cid;
     caller->state = CS_RINGING;
     phone->event_handler (phone->event_handler_cls,
@@ -562,10 +588,10 @@ static void
 reconnect_phone (struct GNUNET_CONVERSATION_Phone *phone)
 {
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_hd_fixed_size (phone_ring,
-                             GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING,
-                             struct ClientPhoneRingMessage,
-                             phone),
+    GNUNET_MQ_hd_var_size (phone_ring,
+                           GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING,
+                           struct ClientPhoneRingMessage,
+                           phone),
     GNUNET_MQ_hd_fixed_size (phone_hangup,
                              GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP,
                              struct ClientPhoneHangupMessage,
diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c
index 909b603ac..129192bf0 100644
--- a/src/conversation/conversation_api_call.c
+++ b/src/conversation/conversation_api_call.c
@@ -455,6 +455,8 @@ handle_gns_response (void *cls,
   struct GNUNET_CONVERSATION_Call *call = cls;
   struct GNUNET_MQ_Envelope *e;
   struct ClientCallMessage *ccm;
+  const struct GNUNET_IDENTITY_PrivateKey *caller_id;
+  size_t key_len;
 
   (void) was_gns;
   GNUNET_break (NULL != call->gns_lookup);
@@ -472,11 +474,15 @@ handle_gns_response (void *cls,
       GNUNET_memcpy (&call->phone_record,
                      rd[i].data,
                      rd[i].data_size);
-      e = GNUNET_MQ_msg (ccm,
-                         GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_CALL);
+      caller_id = GNUNET_IDENTITY_ego_get_private_key (call->caller_id);
+      key_len = GNUNET_IDENTITY_private_key_get_length (caller_id);
+      e = GNUNET_MQ_msg_extra (ccm, key_len,
+                               GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_CALL);
       ccm->line_port = call->phone_record.line_port;
       ccm->target = call->phone_record.peer;
-      ccm->caller_id = *GNUNET_IDENTITY_ego_get_private_key (call->caller_id);
+      GNUNET_IDENTITY_write_private_key_to_buffer (caller_id,
+                                                   &ccm[1], key_len);
+      ccm->key_len = htonl (key_len);
       GNUNET_MQ_send (call->mq,
                       e);
       call->state = CS_RINGING;
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index a69c95a80..a551bed1a 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -729,6 +729,18 @@ handle_client_audio_message (void *cls, const struct ClientAudioMessage *msg)
   GNUNET_SERVICE_client_continue (line->client);
 }
 
+/**
+ * Function to handle a ring message incoming over cadet
+ *
+ * @param cls closure, NULL
+ * @param msg the incoming message
+ */
+static enum GNUNET_GenericReturnValue
+check_cadet_ring_message (void *cls, const struct CadetPhoneRingMessage *msg)
+{
+  //FIXME
+  return GNUNET_OK;
+}
 
 /**
  * Function to handle a ring message incoming over cadet
@@ -744,19 +756,40 @@ handle_cadet_ring_message (void *cls, const struct CadetPhoneRingMessage *msg)
   struct GNUNET_MQ_Envelope *env;
   struct ClientPhoneRingMessage *cring;
   struct CadetPhoneRingInfoPS rs;
+  struct GNUNET_IDENTITY_PublicKey identity;
+  struct GNUNET_IDENTITY_Signature sig;
+  size_t key_len;
+  size_t sig_len;
+  size_t read;
 
   rs.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CONVERSATION_RING);
   rs.purpose.size = htonl (sizeof(struct CadetPhoneRingInfoPS));
   rs.line_port = line->line_port;
   rs.target_peer = my_identity;
   rs.expiration_time = msg->expiration_time;
-
+  key_len = ntohl (msg->key_len);
+  sig_len = ntohl (msg->sig_len);
+
+  if ((GNUNET_SYSERR ==
+       GNUNET_IDENTITY_read_public_key_from_buffer (&msg[1],
+                                                    key_len,
+                                                    &identity,
+                                                    &read)) ||
+      (read != key_len))
+  {
+    GNUNET_break_op (0);
+    destroy_line_cadet_channels (ch);
+    return;
+  }
+  GNUNET_IDENTITY_read_signature_from_buffer (&sig,
+                                              (char*) &msg[1] + read,
+                                              sig_len);
   if (GNUNET_OK !=
       GNUNET_IDENTITY_signature_verify (
         GNUNET_SIGNATURE_PURPOSE_CONVERSATION_RING,
         &rs,
-        &msg->signature,
-        &msg->caller_id))
+        &sig,
+        &identity))
   {
     GNUNET_break_op (0);
     destroy_line_cadet_channels (ch);
@@ -782,9 +815,12 @@ handle_cadet_ring_message (void *cls, const struct CadetPhoneRingMessage *msg)
   }
   GNUNET_CADET_receive_done (ch->channel);
   ch->status = CS_CALLEE_RINGING;
-  env = GNUNET_MQ_msg (cring, GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING);
+  env = GNUNET_MQ_msg_extra (cring,
+                             key_len,
+                             GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING);
   cring->cid = ch->cid;
-  cring->caller_id = msg->caller_id;
+  memcpy (&cring[1], &msg[1], key_len);
+  cring->key_len = msg->key_len;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Sending RING message to client. CID is %u\n",
               (unsigned int) ch->cid);
@@ -1080,6 +1116,18 @@ inbound_end (void *cls, const struct GNUNET_CADET_Channel *channel)
   clean_up_channel (ch);
 }
 
+/**
+ * Function to handle call request from the client
+ *
+ * @param cls the `struct Line` the message is about
+ * @param msg the message from the client
+ */
+static enum GNUNET_GenericReturnValue
+check_client_call_message (void *cls, const struct ClientCallMessage *msg)
+{
+  // FIXME
+  return GNUNET_OK;
+}
 
 /**
  * Function to handle call request from the client
@@ -1117,6 +1165,14 @@ handle_client_call_message (void *cls, const struct ClientCallMessage *msg)
   struct GNUNET_MQ_Envelope *e;
   struct CadetPhoneRingMessage *ring;
   struct CadetPhoneRingInfoPS rs;
+  struct GNUNET_IDENTITY_PrivateKey caller_id;
+  struct GNUNET_IDENTITY_PublicKey caller_id_pub;
+  struct GNUNET_IDENTITY_Signature sig;
+  ssize_t written;
+  size_t key_len;
+  size_t pkey_len;
+  size_t sig_len;
+  size_t read;
 
   line->line_port = msg->line_port;
   rs.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CONVERSATION_RING);
@@ -1136,10 +1192,27 @@ handle_client_call_message (void *cls, const struct ClientCallMessage *msg)
                                              &inbound_end,
                                              cadet_handlers);
   ch->mq = GNUNET_CADET_get_mq (ch->channel);
-  e = GNUNET_MQ_msg (ring, GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_RING);
-  GNUNET_IDENTITY_key_get_public (&msg->caller_id, &ring->caller_id);
+  key_len = ntohl (msg->key_len);
+  GNUNET_IDENTITY_read_private_key_from_buffer (&msg[1],
+                                                key_len,
+                                                &caller_id,
+                                                &read);
+  GNUNET_assert (read == key_len);
+  GNUNET_IDENTITY_sign (&caller_id, &rs, &sig);
+  sig_len = GNUNET_IDENTITY_signature_get_length (&sig);
+  GNUNET_IDENTITY_key_get_public (&caller_id, &caller_id_pub);
+  pkey_len = GNUNET_IDENTITY_public_key_get_length (&caller_id_pub);
+  e = GNUNET_MQ_msg_extra (ring, pkey_len + sig_len,
+                           GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_RING);
+  written = GNUNET_IDENTITY_write_public_key_to_buffer (&caller_id_pub,
+                                                        &ring[1],
+                                                        pkey_len);
   ring->expiration_time = rs.expiration_time;
-  GNUNET_IDENTITY_sign (&msg->caller_id, &rs, &ring->signature);
+  ring->key_len = htonl (pkey_len);
+  ring->sig_len = htonl (sig_len);
+  GNUNET_IDENTITY_write_signature_to_buffer (&sig,
+                                             (char *) &ring[1] + written,
+                                             sig_len);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending RING message via CADET\n");
   GNUNET_MQ_send (ch->mq, e);
   GNUNET_SERVICE_client_continue (line->client);
@@ -1246,10 +1319,10 @@ handle_client_register_message (void *cls,
 {
   struct Line *line = cls;
   struct GNUNET_MQ_MessageHandler cadet_handlers[] =
-  { GNUNET_MQ_hd_fixed_size (cadet_ring_message,
-                             GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_RING,
-                             struct CadetPhoneRingMessage,
-                             NULL),
+  { GNUNET_MQ_hd_var_size (cadet_ring_message,
+                           GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_RING,
+                           struct CadetPhoneRingMessage,
+                           NULL),
     GNUNET_MQ_hd_fixed_size (cadet_hangup_message,
                              GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_HANG_UP,
                              struct CadetPhoneHangupMessage,
@@ -1367,10 +1440,10 @@ GNUNET_SERVICE_MAIN (
                            GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP,
                            struct ClientPhoneHangupMessage,
                            NULL),
-  GNUNET_MQ_hd_fixed_size (client_call_message,
-                           GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_CALL,
-                           struct ClientCallMessage,
-                           NULL),
+  GNUNET_MQ_hd_var_size (client_call_message,
+                         GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_CALL,
+                         struct ClientCallMessage,
+                         NULL),
   GNUNET_MQ_hd_var_size (client_audio_message,
                          GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO,
                          struct ClientAudioMessage,
diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c
index 41ef75821..22e9b1dd9 100644
--- a/src/conversation/test_conversation_api.c
+++ b/src/conversation/test_conversation_api.c
@@ -386,21 +386,20 @@ call_event_handler (void *cls, enum GNUNET_CONVERSATION_CallEventCode code)
 static void
 caller_ego_create_cont (void *cls,
                         const struct GNUNET_IDENTITY_PrivateKey *pk,
-                        const char *emsg)
+                        enum GNUNET_ErrorCode ec)
 {
   (void) cls;
   op = NULL;
-  GNUNET_assert (NULL == emsg);
+  GNUNET_assert (GNUNET_EC_NONE == ec);
 }
 
 
 static void
-namestore_put_cont (void *cls, int32_t success, const char *emsg)
+namestore_put_cont (void *cls, enum GNUNET_ErrorCode ec)
 {
   (void) cls;
   qe = NULL;
-  GNUNET_assert (GNUNET_YES == success);
-  GNUNET_assert (NULL == emsg);
+  GNUNET_assert (GNUNET_EC_NONE == ec);
   GNUNET_assert (NULL == op);
   op = GNUNET_IDENTITY_create (id, "caller-ego", NULL,
                                GNUNET_IDENTITY_TYPE_ECDSA,
@@ -468,11 +467,11 @@ identity_cb (void *cls,
 static void
 phone_ego_create_cont (void *cls,
                        const struct GNUNET_IDENTITY_PrivateKey *pk,
-                       const char *emsg)
+                       enum GNUNET_ErrorCode ec)
 {
   (void) cls;
   op = NULL;
-  GNUNET_assert (NULL == emsg);
+  GNUNET_assert (GNUNET_EC_NONE == ec);
 }
 
 
diff --git a/src/conversation/test_conversation_api_reject.c b/src/conversation/test_conversation_api_reject.c
index 15728123b..a7aab069f 100644
--- a/src/conversation/test_conversation_api_reject.c
+++ b/src/conversation/test_conversation_api_reject.c
@@ -239,21 +239,20 @@ call_event_handler (void *cls, enum GNUNET_CONVERSATION_CallEventCode code)
 static void
 caller_ego_create_cont (void *cls,
                         const struct GNUNET_IDENTITY_PrivateKey *pk,
-                        const char *emsg)
+                        enum GNUNET_ErrorCode ec)
 {
   (void) cls;
   op = NULL;
-  GNUNET_assert (NULL == emsg);
+  GNUNET_assert (GNUNET_EC_NONE == ec);
 }
 
 
 static void
-namestore_put_cont (void *cls, int32_t success, const char *emsg)
+namestore_put_cont (void *cls, enum GNUNET_ErrorCode ec)
 {
   (void) cls;
   qe = NULL;
-  GNUNET_assert (GNUNET_YES == success);
-  GNUNET_assert (NULL == emsg);
+  GNUNET_assert (GNUNET_EC_NONE == ec);
   GNUNET_assert (NULL == op);
   op = GNUNET_IDENTITY_create (id, "caller-ego", NULL,
                                GNUNET_IDENTITY_TYPE_ECDSA,
@@ -321,11 +320,11 @@ identity_cb (void *cls,
 static void
 phone_ego_create_cont (void *cls,
                        const struct GNUNET_IDENTITY_PrivateKey *pk,
-                       const char *emsg)
+                       enum GNUNET_ErrorCode ec)
 {
   (void) cls;
   op = NULL;
-  GNUNET_assert (NULL == emsg);
+  GNUNET_assert (GNUNET_EC_NONE == ec);
 }
 
 
diff --git a/src/conversation/test_conversation_api_twocalls.c b/src/conversation/test_conversation_api_twocalls.c
index 9abf91d0b..1bd2b4e22 100644
--- a/src/conversation/test_conversation_api_twocalls.c
+++ b/src/conversation/test_conversation_api_twocalls.c
@@ -508,21 +508,20 @@ call_event_handler (void *cls, enum GNUNET_CONVERSATION_CallEventCode code)
 static void
 caller_ego_create_cont (void *cls,
                         const struct GNUNET_IDENTITY_PrivateKey *pk,
-                        const char *emsg)
+                        enum GNUNET_ErrorCode ec)
 {
   (void) cls;
   op = NULL;
-  GNUNET_assert (NULL == emsg);
+  GNUNET_assert (GNUNET_EC_NONE == ec);
 }
 
 
 static void
-namestore_put_cont (void *cls, int32_t success, const char *emsg)
+namestore_put_cont (void *cls, enum GNUNET_ErrorCode ec)
 {
   (void) cls;
   qe = NULL;
-  GNUNET_assert (GNUNET_YES == success);
-  GNUNET_assert (NULL == emsg);
+  GNUNET_assert (GNUNET_EC_NONE == ec);
   GNUNET_assert (NULL == op);
   op = GNUNET_IDENTITY_create (id, "caller-ego", NULL,
                                GNUNET_IDENTITY_TYPE_ECDSA,
@@ -597,11 +596,11 @@ identity_cb (void *cls,
 static void
 phone_ego_create_cont (void *cls,
                        const struct GNUNET_IDENTITY_PrivateKey *pk,
-                       const char *emsg)
+                       enum GNUNET_ErrorCode ec)
 {
   (void) cls;
   op = NULL;
-  GNUNET_assert (NULL == emsg);
+  GNUNET_assert (GNUNET_EC_NONE == ec);
 }