WIP commit of scalar product 2.0. It is unfinished and does not yet pass tests. This commit happens because of the move from mesh->cadet.

- reverted SP API back to the original design from 2012 (using key-value pairs)
- SP now uses set intersection to determine common elements from the set provided by the user
- values are sorted based on their keys after intersection
- removed state tracking, as simple tracking is now insufficient. Just checking for conditions directly is easier readable and less buggy
- modified/renamed SP message types to reflect the changed behavior of SP

1 files changed, 48 insertions, 19 deletions

diff --git a/src/scalarproduct/scalarproduct.h b/src/scalarproduct/scalarproduct.h
index 5682362fd..9f6036358 100644
--- a/src/scalarproduct/scalarproduct.h
+++ b/src/scalarproduct/scalarproduct.h
@@ -57,7 +57,7 @@ extern "C"
  * Message type passed from client to service
  * to initiate a request or responder role
  */
-struct GNUNET_SCALARPRODUCT_client_request
+struct GNUNET_SCALARPRODUCT_computation_message
 {
   /**
    * GNUNET message header
@@ -67,17 +67,17 @@ struct GNUNET_SCALARPRODUCT_client_request
   /**
    * how many elements the vector in payload contains
    */
-  uint32_t element_count GNUNET_PACKED;
-
+  uint32_t element_count_total GNUNET_PACKED;
+  
   /**
-   * how many bytes the mask has
+   * contained elements the vector in payload contains
    */
-  uint32_t mask_length GNUNET_PACKED;
+  uint32_t element_count_contained GNUNET_PACKED;
 
   /**
    * the transaction/session key used to identify a session
    */
-  struct GNUNET_HashCode key;
+  struct GNUNET_HashCode session_key;
 
   /**
    * the identity of a remote peer we want to communicate with
@@ -85,11 +85,32 @@ struct GNUNET_SCALARPRODUCT_client_request
   struct GNUNET_PeerIdentity peer;
 
   /**
-   * followed by long vector[element_count] | [unsigned char mask[mask_bytes]]
+   * followed by struct GNUNET_SCALARPRODUCT_Element[]
    */
 };
 
 /**
+ * multipart messages following GNUNET_SCALARPRODUCT_client_request
+ */
+struct GNUNET_SCALARPRODUCT_computation_message_multipart
+{
+  /**
+   * GNUNET message header
+   */
+  struct GNUNET_MessageHeader header;
+  
+  /**
+   * contained elements the vector in payload contains
+   */
+  uint32_t element_count_contained GNUNET_PACKED;
+
+  /**
+   * followed by struct GNUNET_SCALARPRODUCT_Element[]
+   */
+};
+
+
+/**
  * Message type passed from requesting service Alice to responding service Bob
  * to initiate a request and make bob participate in our protocol
  */
@@ -104,28 +125,36 @@ struct GNUNET_SCALARPRODUCT_service_request {
    */
   uint32_t total_element_count GNUNET_PACKED;
 
-    /**
-   * how many elements are actually included after the mask was applied.
+  /**
+   * the transaction/session key used to identify a session
    */
-  uint32_t contained_element_count GNUNET_PACKED;
+  struct GNUNET_HashCode session_id;
 
   /**
-   * how many bytes the mask has
+   * Alice's public key
    */
-  uint32_t mask_length GNUNET_PACKED;
+  struct GNUNET_CRYPTO_PaillierPublicKey public_key;
+
+};
 
+
+/**
+ * Message type passed from requesting service Alice to responding service Bob
+ * to initiate a request and make bob participate in our protocol
+ */
+struct GNUNET_SCALARPRODUCT_alices_cryptodata_message {
   /**
-   * the transaction/session key used to identify a session
+   * GNUNET message header
    */
-  struct GNUNET_HashCode key;
+  struct GNUNET_MessageHeader header;
 
   /**
-   * how many elements the vector in payload contains
+   * how many elements we appended to this message
    */
-  uint32_t element_count GNUNET_PACKED;
+  uint32_t contained_element_count GNUNET_PACKED;
 
   /**
-   * followed by mask | public_key | vector[used_element_count]
+   * struct GNUNET_CRYPTO_PaillierCiphertext[contained_element_count]
    */
 };
 
@@ -141,9 +170,9 @@ struct GNUNET_SCALARPRODUCT_multipart_message {
   /**
    * how many elements we supply within this message
    */
-  uint32_t multipart_element_count GNUNET_PACKED;
+  uint32_t contained_element_count GNUNET_PACKED;
 
-  // followed by vector[multipart_element_count] or k[i][perm]
+  // struct GNUNET_CRYPTO_PaillierCiphertext[multipart_element_count]
 };
 
 /**