3 files changed, 15 insertions, 13 deletions

diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index e0cc72b01..73ba2de93 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -53,10 +53,10 @@ libgnunetscalarproduct_la_LIBADD = \
 libgnunetscalarproduct_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
-check_PROGRAMS = \
-        test_scalarproduct_api_regression \
-        test_scalarproduct_api \
-        test_scalarproduct_api_4peers
+#check_PROGRAMS = \
+#       test_scalarproduct_api_regression \
+#       test_scalarproduct_api \
+#       test_scalarproduct_api_4peers
 #FIXME unfinished
 #test_scalarproduct_api_regression2 
 
diff --git a/src/scalarproduct/gnunet-service-scalarproduct.c b/src/scalarproduct/gnunet-service-scalarproduct.c
index 3c4746d2b..349470333 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct.c
@@ -1483,7 +1483,7 @@ tunnel_destruction_handler (void *cls,
   if (ALICE == session->role) {
     // as we have only one peer connected in each session, just remove the session
 
-    if ((FINALIZED != session->state) && (!do_shutdown))
+    if ((SERVICE_RESPONSE_RECEIVED > session->state) && (!do_shutdown))
     {
       session->tunnel = NULL;
       // if this happened before we received the answer, we must terminate the session
@@ -1657,7 +1657,7 @@ prepare_client_response (void *cls,
       
       // get representation as string
       if (range
-          && (0 != (rc =  gcry_mpi_aprint (GCRYMPI_FMT_STD,
+          && (0 != (rc =  gcry_mpi_aprint (GCRYMPI_FMT_USG,
                                              &product_exported,
                                              &product_length,
                                              value)))){
@@ -1670,13 +1670,15 @@ prepare_client_response (void *cls,
 
   msg_length = sizeof (struct GNUNET_SCALARPRODUCT_client_response) + product_length;
   msg = GNUNET_malloc (msg_length);
-  memcpy (&msg[1], product_exported, product_length);
-  GNUNET_free_non_null (product_exported);
+  memcpy (&msg->key, &session->key, sizeof (struct GNUNET_HashCode));
+  memcpy (&msg->peer, &session->peer, sizeof ( struct GNUNET_PeerIdentity));
+  if (product_exported != NULL){
+    memcpy (&msg[1], product_exported, product_length);
+    GNUNET_free(product_exported);
+  }
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_SCALARPRODUCT_SERVICE_TO_CLIENT);
   msg->header.size = htons (msg_length);
   msg->range = range;
-  memcpy (&msg->key, &session->key, sizeof (struct GNUNET_HashCode));
-  memcpy (&msg->peer, &session->peer, sizeof ( struct GNUNET_PeerIdentity));
   msg->product_length = htonl (product_length);
   
   session->msg = (struct GNUNET_MessageHeader *) msg;
diff --git a/src/scalarproduct/scalarproduct_api.c b/src/scalarproduct/scalarproduct_api.c
index 09c726c88..eed7c315b 100644
--- a/src/scalarproduct/scalarproduct_api.c
+++ b/src/scalarproduct/scalarproduct_api.c
@@ -190,7 +190,7 @@ process_result_message (void *cls,
           gcry_mpi_t num;
           size_t read = 0;
 
-          if (0 != (rc = gcry_mpi_scan (&num, GCRYMPI_FMT_STD, &msg[1], product_len, &read)))
+          if (0 != (rc = gcry_mpi_scan (&num, GCRYMPI_FMT_USG, &msg[1], product_len, &read)))
             {
               LOG_GCRY(GNUNET_ERROR_TYPE_ERROR, "gcry_mpi_scan", rc);
               gcry_mpi_release (result);
@@ -199,9 +199,9 @@ process_result_message (void *cls,
             }
           else
             {
-              if (message->range > 0)
+              if (0 < message->range)
                 gcry_mpi_add (result, result, num);
-              else
+              else if (0 > message->range)
                 gcry_mpi_sub (result, result, num);
               gcry_mpi_release (num);
             }