Merge branch 'master' of ssh://git.gnunet.org/gnunet

18 files changed, 83 insertions, 56 deletions

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index f56ae1753..0059861c2 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -1515,6 +1515,7 @@ test_transport_simple_send.sh \
 test_transport_simple_send_broadcast.sh \
 test_transport_udp_backchannel.sh \
 test_transport_simple_send_dv_circle.sh \
+test_transport_simple_send_dv_inverse.sh \
 gnunet-transport-certificate-creation.in \
 communicator-unix.conf \
 test_plugin_hostkey \
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
index a8dbed604..84aa45b9a 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -1448,7 +1448,7 @@ handshake_ack_monotime_cb (void *cls,
  * @param queue The queue context.
  */
 static void
-send_challenge (struct GNUNET_CRYPTO_ChallengeNonceP challenge, 
+send_challenge (struct GNUNET_CRYPTO_ChallengeNonceP challenge,
                 struct Queue *queue)
 {
   struct TCPConfirmationAck tca;
@@ -1914,10 +1914,10 @@ queue_read (void *cls)
                                      &queue->cread_buf[queue->cread_off],
                                      BUF_SIZE - queue->cread_off);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received %lu bytes from TCP queue\n", rcvd);
+              "Received %zd bytes from TCP queue\n", rcvd);
   GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG,
                            "transport",
-                           "Received %lu bytes from TCP queue\n", rcvd);
+                           "Received %zd bytes from TCP queue\n", rcvd);
   if (-1 == rcvd)
   {
     if ((EAGAIN != errno) && (EINTR != errno))
diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c
index 019f3914f..64f3b6160 100644
--- a/src/transport/gnunet-helper-transport-bluetooth.c
+++ b/src/transport/gnunet-helper-transport-bluetooth.c
@@ -19,7 +19,8 @@
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
-#include "gnunet_config.h"
+#include "platform.h"
+#include "gnunet_private_config.h"
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
diff --git a/src/transport/gnunet-helper-transport-wlan.c b/src/transport/gnunet-helper-transport-wlan.c
index 72dd8b594..c1a230bef 100644
--- a/src/transport/gnunet-helper-transport-wlan.c
+++ b/src/transport/gnunet-helper-transport-wlan.c
@@ -109,30 +109,11 @@
 /*
  * parts taken from aircrack-ng, parts changend.
  */
-#include "gnunet_config.h"
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/stat.h>
+#include "platform.h"
+#include "gnunet_private_config.h"
 #include <netpacket/packet.h>
 #include <linux/if_ether.h>
-#include <linux/if.h>
 #include <linux/wireless.h>
-#include <netinet/in.h>
-#include <linux/if_tun.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <dirent.h>
-#include <sys/param.h>
-#include <unistd.h>
-#include <stdint.h>
 
 #include "gnunet_protocols.h"
 #include "plugin_transport_wlan.h"
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c
index 512b77a9d..5a28efb66 100644
--- a/src/transport/gnunet-service-tng.c
+++ b/src/transport/gnunet-service-tng.c
@@ -4685,8 +4685,9 @@ dv_setup_key_state_from_km (const struct GNUNET_HashCode *km,
  * @param target the target peer to encrypt to
  * @param iv unique IV to use
  * @param[out] key set to the key material
+ * @return GNUNET_OK on success
  */
-static void
+static enum GNUNET_GenericReturnValue
 dh_key_derive_eph_pid (
   const struct GNUNET_CRYPTO_EcdhePrivateKey *priv_ephemeral,
   const struct GNUNET_PeerIdentity *target,
@@ -4695,10 +4696,14 @@ dh_key_derive_eph_pid (
 {
   struct GNUNET_HashCode km;
 
-  GNUNET_assert (GNUNET_YES == GNUNET_CRYPTO_ecdh_eddsa (priv_ephemeral,
-                                                         &target->public_key,
-                                                         &km));
+  if (GNUNET_YES != GNUNET_CRYPTO_ecdh_eddsa (priv_ephemeral,
+                                              &target->public_key,
+                                              &km))
+    return GNUNET_SYSERR;
+  // FIXME: Possibly also add return values here. We are processing
+  // Input from other peers...
   dv_setup_key_state_from_km (&km, iv, key);
+  return GNUNET_OK;
 }
 
 
@@ -4710,18 +4715,21 @@ dh_key_derive_eph_pid (
  * @param target the target peer to encrypt to
  * @param iv unique IV to use
  * @param[out] key set to the key material
+ * @return GNUNET_OK on success
  */
-static void
+static enum GNUNET_GenericReturnValue
 dh_key_derive_eph_pub (const struct GNUNET_CRYPTO_EcdhePublicKey *pub_ephemeral,
                        const struct GNUNET_ShortHashCode *iv,
                        struct DVKeyState *key)
 {
   struct GNUNET_HashCode km;
 
-  GNUNET_assert (GNUNET_YES == GNUNET_CRYPTO_eddsa_ecdh (GST_my_private_key,
-                                                         pub_ephemeral,
-                                                         &km));
+  if (GNUNET_YES != GNUNET_CRYPTO_eddsa_ecdh (GST_my_private_key,
+                                              pub_ephemeral,
+                                              &km))
+    return GNUNET_SYSERR;
   dv_setup_key_state_from_km (&km, iv, key);
+  return GNUNET_OK;
 }
 
 
@@ -4769,15 +4777,18 @@ dv_encrypt (struct DVKeyState *key, const void *in, void *dst, size_t in_size)
  * @param ciph cipher text to decrypt
  * @param[out] out output data to generate (plaintext)
  * @param out_size number of bytes of input in @a ciph and available in @a out
+ * @return GNUNET_OK on success
  */
-static void
+static enum GNUNET_GenericReturnValue
 dv_decrypt (struct DVKeyState *key,
             void *out,
             const void *ciph,
             size_t out_size)
 {
-  GNUNET_assert (
-    0 == gcry_cipher_decrypt (key->cipher, out, out_size, ciph, out_size));
+  return (0 ==
+          gcry_cipher_decrypt (key->cipher,
+                               out, out_size,
+                               ciph, out_size)) ? GNUNET_OK : GNUNET_SYSERR;
 }
 
 
@@ -4837,8 +4848,6 @@ encapsulate_for_dv (struct DistanceVector *dv,
   struct TransportDVBoxPayloadP payload_hdr;
   uint16_t enc_body_size = ntohs (hdr->size);
   char enc[sizeof(struct TransportDVBoxPayloadP) + enc_body_size] GNUNET_ALIGN;
-  struct TransportDVBoxPayloadP *enc_payload_hdr =
-    (struct TransportDVBoxPayloadP *) enc;
   struct DVKeyState *key;
   struct GNUNET_TIME_Relative rtt;
 
@@ -4854,10 +4863,14 @@ encapsulate_for_dv (struct DistanceVector *dv,
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
                               &box_hdr.iv,
                               sizeof(box_hdr.iv));
-  dh_key_derive_eph_pid (&dv->private_key, &dv->target, &box_hdr.iv, key);
+  // We are creating this key, so this must work.
+  GNUNET_assert (GNUNET_OK ==
+                 dh_key_derive_eph_pid (&dv->private_key,
+                                        &dv->target,
+                                        &box_hdr.iv, key));
   payload_hdr.sender = GST_my_identity;
   payload_hdr.monotonic_time = GNUNET_TIME_absolute_hton (dv->monotime);
-  dv_encrypt (key, &payload_hdr, enc_payload_hdr, sizeof(payload_hdr));
+  dv_encrypt (key, &payload_hdr, enc, sizeof(payload_hdr));
   dv_encrypt (key,
               hdr,
               &enc[sizeof(struct TransportDVBoxPayloadP)],
@@ -8153,13 +8166,11 @@ handle_dv_box (void *cls, const struct TransportDVBoxMessage *dvb)
   const char *enc_payload = (const char *) &hops[num_hops];
   uint16_t enc_payload_size =
     size - (num_hops * sizeof(struct GNUNET_PeerIdentity));
-  struct DVKeyState *key;
+  struct DVKeyState key;
   struct GNUNET_HashCode hmac;
   const char *hdr;
   size_t hdr_len;
 
-  key = GNUNET_new (struct DVKeyState);
-
   if (GNUNET_EXTRA_LOGGING > 0)
   {
     char *path;
@@ -8234,13 +8245,20 @@ handle_dv_box (void *cls, const struct TransportDVBoxMessage *dvb)
                             GNUNET_NO);
   cmc->total_hops = ntohs (dvb->total_hops);
 
-  dh_key_derive_eph_pub (&dvb->ephemeral_key, &dvb->iv, key);
+  // DH key derivation with received DV, could be garbage.
+  if (GNUNET_OK !=
+      dh_key_derive_eph_pub (&dvb->ephemeral_key, &dvb->iv, &key))
+  {
+    GNUNET_break_op (0);
+    finish_cmc_handling (cmc);
+    return;
+  }
   hdr = (const char *) &dvb[1];
   hdr_len = ntohs (dvb->orig_size) - sizeof(*dvb) - sizeof(struct
                                                            GNUNET_PeerIdentity)
             * ntohs (dvb->total_hops);
 
-  dv_hmac (key, &hmac, hdr, hdr_len);
+  dv_hmac (&key, &hmac, hdr, hdr_len);
   if (0 != GNUNET_memcmp (&hmac, &dvb->hmac))
   {
     /* HMAC mismatch, discard! */
@@ -8254,14 +8272,29 @@ handle_dv_box (void *cls, const struct TransportDVBoxMessage *dvb)
     struct GNUNET_TIME_Absolute monotime;
     struct TransportDVBoxPayloadP ppay;
     char body[hdr_len - sizeof(ppay)] GNUNET_ALIGN;
-    const struct GNUNET_MessageHeader *mh =
-      (const struct GNUNET_MessageHeader *) body;
+    const struct GNUNET_MessageHeader *mh;
 
     GNUNET_assert (hdr_len >=
                    sizeof(ppay) + sizeof(struct GNUNET_MessageHeader));
-    dv_decrypt (key, &ppay, hdr, sizeof(ppay));
-    dv_decrypt (key, &body, &hdr[sizeof(ppay)], hdr_len - sizeof(ppay));
-    dv_key_clean (key);
+    if (GNUNET_OK != dv_decrypt (&key, &ppay, hdr, sizeof(ppay)))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Error decrypting DV payload header\n");
+      GNUNET_break_op (0);
+      finish_cmc_handling (cmc);
+      return;
+    }
+    if (GNUNET_OK != dv_decrypt (&key, body,
+                                 &hdr[sizeof(ppay)], hdr_len - sizeof(ppay)))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Error decrypting DV payload\n");
+      GNUNET_break_op (0);
+      finish_cmc_handling (cmc);
+      return;
+    }
+    mh = (const struct GNUNET_MessageHeader *) body;
+    dv_key_clean (&key);
     if (ntohs (mh->size) != sizeof(body))
     {
       GNUNET_break_op (0);
diff --git a/src/transport/plugin_transport_wlan.h b/src/transport/plugin_transport_wlan.h
index d175f9377..6cb11f648 100644
--- a/src/transport/plugin_transport_wlan.h
+++ b/src/transport/plugin_transport_wlan.h
@@ -26,7 +26,7 @@
 #ifndef PLUGIN_TRANSPORT_WLAN
 #define PLUGIN_TRANSPORT_WLAN
 
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_common.h"
 
 /**
diff --git a/src/transport/test_transport_simple_send_dv_inverse.sh b/src/transport/test_transport_simple_send_dv_inverse.sh
index eac437cba..6a89f7397 100755
--- a/src/transport/test_transport_simple_send_dv_inverse.sh
+++ b/src/transport/test_transport_simple_send_dv_inverse.sh
@@ -2,10 +2,11 @@
 if ! [ -d "/run/netns" ]; then
     echo You have to create the directory /run/netns.
 fi
-if  [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" == 1 ]; then
-    # exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; valgrind --leak-check=full --track-origins=yes --trace-children=yes --trace-children-skip=/usr/bin/awk,/usr/bin/cut,/usr/bin/seq,/sbin/ip/sed/bash  ./test_transport_start_with_config test_transport_distance_vector_inverse_topo.conf"
-    exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config test_transport_distance_vector_inverse_topo.conf"
-else
+if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then
+  if  [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" == 1 ]; then
     echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
     exit 78
+  fi
 fi
+# exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; valgrind --leak-check=full --track-origins=yes --trace-children=yes --trace-children-skip=/usr/bin/awk,/usr/bin/cut,/usr/bin/seq,/sbin/ip/sed/bash  ./test_transport_start_with_config test_transport_distance_vector_inverse_topo.conf"
+exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config test_transport_distance_vector_inverse_topo.conf"
diff --git a/src/transport/transport-testing-filenames.c b/src/transport/transport-testing-filenames.c
index 70c1ee55a..ee7b0aacf 100644
--- a/src/transport/transport-testing-filenames.c
+++ b/src/transport/transport-testing-filenames.c
@@ -23,6 +23,7 @@
  * @author Matthias Wachs
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing.h"
 
 
diff --git a/src/transport/transport-testing-filenames2.c b/src/transport/transport-testing-filenames2.c
index 7d6fd529d..59fa1ebd5 100644
--- a/src/transport/transport-testing-filenames2.c
+++ b/src/transport/transport-testing-filenames2.c
@@ -23,6 +23,7 @@
  * @author Matthias Wachs
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing2.h"
 
 
diff --git a/src/transport/transport-testing-loggers.c b/src/transport/transport-testing-loggers.c
index 330a392c6..21ed0592a 100644
--- a/src/transport/transport-testing-loggers.c
+++ b/src/transport/transport-testing-loggers.c
@@ -22,6 +22,7 @@
  * @brief convenience functions for logging common events in tests
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing.h"
 
 
diff --git a/src/transport/transport-testing-loggers2.c b/src/transport/transport-testing-loggers2.c
index ead4fa365..e6c79b78a 100644
--- a/src/transport/transport-testing-loggers2.c
+++ b/src/transport/transport-testing-loggers2.c
@@ -22,6 +22,7 @@
  * @brief convenience functions for logging common events in tests
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing2.h"
 
 
diff --git a/src/transport/transport-testing-main.c b/src/transport/transport-testing-main.c
index 8d1727d77..63b91713c 100644
--- a/src/transport/transport-testing-main.c
+++ b/src/transport/transport-testing-main.c
@@ -22,6 +22,7 @@
  * @brief convenience main function for tests
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing.h"
 
 
diff --git a/src/transport/transport-testing-main2.c b/src/transport/transport-testing-main2.c
index de0b7f4cd..0a1710922 100644
--- a/src/transport/transport-testing-main2.c
+++ b/src/transport/transport-testing-main2.c
@@ -22,6 +22,7 @@
  * @brief convenience main function for tests
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing2.h"
 
 
diff --git a/src/transport/transport-testing-send.c b/src/transport/transport-testing-send.c
index 38018c172..9b017c563 100644
--- a/src/transport/transport-testing-send.c
+++ b/src/transport/transport-testing-send.c
@@ -22,6 +22,7 @@
  * @brief convenience transmission function for tests
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing.h"
 
 /**
diff --git a/src/transport/transport-testing-send2.c b/src/transport/transport-testing-send2.c
index bd2afb9b0..c48dc3a4a 100644
--- a/src/transport/transport-testing-send2.c
+++ b/src/transport/transport-testing-send2.c
@@ -22,6 +22,7 @@
  * @brief convenience transmission function for tests
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing2.h"
 
 /**
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 00c4a08dd..baced62e3 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -23,6 +23,7 @@
  * @author Matthias Wachs
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing.h"
 
 
diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c
index f0dee7388..566e0db71 100644
--- a/src/transport/transport-testing2.c
+++ b/src/transport/transport-testing2.c
@@ -23,6 +23,7 @@
  * @author Matthias Wachs
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing2.h"
 
 
diff --git a/src/transport/transport.h b/src/transport/transport.h
index c06c2abb3..e060f81ba 100644
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -26,7 +26,7 @@
 #ifndef TRANSPORT_H
 #define TRANSPORT_H
 
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_constants.h"