From c94699a87444a84734b5b13c2231bc9775a6399a Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 6 Mar 2021 12:25:58 +0100
Subject: Tobias Platen wrote:

I took the gnunet-secushare repository which currently does not build.
So I wrote a patch.
---
 src/multicast/gnunet-multicast.c         |  2 +-
 src/multicast/gnunet-service-multicast.c | 12 ++++++------
 src/social/gnunet-service-social.c       |  7 ++++++-
 src/social/gnunet-social.c               |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/multicast/gnunet-multicast.c b/src/multicast/gnunet-multicast.c
index ffac36d..6859402 100644
--- a/src/multicast/gnunet-multicast.c
+++ b/src/multicast/gnunet-multicast.c
@@ -72,7 +72,7 @@ main (int argc, char *const *argv)
 			     gettext_noop ("This command doesn't do anything yet."),
 			     options, &run,
 			     NULL)) ? ret : 1;
-  GNUNET_free ((void*) argv);
+  //XXX GNUNET_free ((void*) argv);
   return ret;
 }
 
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c
index a787307..6296974 100644
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -969,7 +969,7 @@ check_cadet_join_request (void *cls,
     return GNUNET_SYSERR;
   }
   if (GNUNET_OK !=
-      GNUNET_CRYPTO_ecdsa_verify (GNUNET_SIGNATURE_PURPOSE_MULTICAST_REQUEST,
+      GNUNET_CRYPTO_ecdsa_verify_ (GNUNET_SIGNATURE_PURPOSE_MULTICAST_REQUEST,
                                   &req->purpose, &req->signature,
                                   &req->member_pub_key))
   {
@@ -1098,7 +1098,7 @@ check_cadet_message (void *cls,
     return GNUNET_SYSERR;
   }
   if (GNUNET_OK !=
-      GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_MULTICAST_MESSAGE,
+      GNUNET_CRYPTO_eddsa_verify_ (GNUNET_SIGNATURE_PURPOSE_MULTICAST_MESSAGE,
                                   &msg->purpose, &msg->signature,
                                   &chn->group_pub_key))
   {
@@ -1150,7 +1150,7 @@ check_cadet_request (void *cls,
     return GNUNET_SYSERR;
   }
   if (GNUNET_OK !=
-      GNUNET_CRYPTO_ecdsa_verify (GNUNET_SIGNATURE_PURPOSE_MULTICAST_REQUEST,
+      GNUNET_CRYPTO_ecdsa_verify_ (GNUNET_SIGNATURE_PURPOSE_MULTICAST_REQUEST,
                                   &req->purpose, &req->signature,
                                   &req->member_pub_key))
   {
@@ -1605,7 +1605,7 @@ handle_client_member_join (void *cls,
                                - sizeof (req->signature));
     req->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_MULTICAST_REQUEST);
 
-    if (GNUNET_OK != GNUNET_CRYPTO_ecdsa_sign (&mem->priv_key, &req->purpose,
+    if (GNUNET_OK != GNUNET_CRYPTO_ecdsa_sign_ (&mem->priv_key, &req->purpose,
                                                &req->signature))
     {
       /* FIXME: handle error */
@@ -1770,7 +1770,7 @@ handle_client_multicast_message (void *cls,
                              - sizeof (out->signature));
   out->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_MULTICAST_MESSAGE);
 
-  if (GNUNET_OK != GNUNET_CRYPTO_eddsa_sign (&orig->priv_key, &out->purpose,
+  if (GNUNET_OK != GNUNET_CRYPTO_eddsa_sign_ (&orig->priv_key, &out->purpose,
                                              &out->signature))
   {
     GNUNET_assert (0);
@@ -1825,7 +1825,7 @@ handle_client_multicast_request (void *cls,
                              - sizeof (out->signature));
   out->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_MULTICAST_REQUEST);
 
-  if (GNUNET_OK != GNUNET_CRYPTO_ecdsa_sign (&mem->priv_key, &out->purpose,
+  if (GNUNET_OK != GNUNET_CRYPTO_ecdsa_sign_ (&mem->priv_key, &out->purpose,
                                              &out->signature))
   {
     GNUNET_assert (0);
diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c
index 6fd2383..c7a40e6 100644
--- a/src/social/gnunet-service-social.c
+++ b/src/social/gnunet-service-social.c
@@ -1252,6 +1252,7 @@ static int
 app_place_save (const char *app_id,
                 const struct PlaceEnterRequest *ereq)
 {
+  int ret=0;
   if (GNUNET_SYSERR == app_place_add (app_id, ereq))
   {
     GNUNET_assert (0);
@@ -1696,6 +1697,7 @@ handle_client_host_enter (void *cls,
   if (0 == memcmp (&hreq->place_pub_key, &empty_pub_key,
                    sizeof (empty_pub_key)))
   { // no public key set: create new private key & save the place
+	#if 0  
     struct GNUNET_CRYPTO_EddsaPrivateKey *
       place_key = GNUNET_CRYPTO_eddsa_key_create ();
     hreq->place_key = *place_key;
@@ -1704,6 +1706,8 @@ handle_client_host_enter (void *cls,
     GNUNET_free (place_key);
 
     app_place_save (app_id, (const struct PlaceEnterRequest *) hreq);
+    #endif
+    abort(); //FIXME
   }
 
   switch (host_enter (hreq, &hst))
@@ -3670,7 +3674,8 @@ identity_recv_ego (void *cls, struct GNUNET_IDENTITY_Ego *id_ego,
   {
     ego = GNUNET_malloc (sizeof (*ego));
   }
-  ego->key = *(GNUNET_IDENTITY_ego_get_private_key (id_ego));
+  //XXX ego->key = *(GNUNET_IDENTITY_ego_get_private_key (id_ego));
+  abort();
   size_t name_size = strlen (name) + 1;
   ego->name = GNUNET_malloc (name_size);
   GNUNET_memcpy (ego->name, name, name_size);
diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c
index f934894..8feb8c9 100644
--- a/src/social/gnunet-social.c
+++ b/src/social/gnunet-social.c
@@ -1402,7 +1402,7 @@ main (int argc, char *const *argv)
 
   res = GNUNET_PROGRAM_run (argc, argv, help, usage, options, &run, NULL);
 
-  GNUNET_free ((void *) argv);
+  //GNUNET_free ((void *) argv);
 
   if (GNUNET_OK == res)
     return ret;
-- 
cgit v1.2.3