Merge branch 'master' into spaeth/escrow_plugins

16 files changed, 110 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ed6576e7..98b3b40b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,66 @@
+Wed, 12 Aug 2020 09:36:33 +0200 (99f820453)
+fix: GNUNET_is_zero(ptr) should return enum GNUNET_GenericReturnValue. Fixes #6475. - Martin Schanzenbach
+
+Tue, 11 Aug 2020 11:35:06 +0200 (286759692)
+fix: mysql version detection - Martin Schanzenbach
+
+Thu, 6 Aug 2020 08:45:40 +0200 (1d4f5263a)
+reclaim: Refactoring and more standards compliance with respect to scopes - Martin Schanzenbach
+
+Wed, 5 Aug 2020 11:35:05 +0200 (6e764f4ab)
+reclaim: Make SPAs work with public clients. No longer encrypt code. - Martin Schanzenbach
+
+Tue, 4 Aug 2020 21:08:22 +0200 (ade9b5e52)
+reclaim: fix #6463 - Martin Schanzenbach
+
+Tue, 4 Aug 2020 19:40:23 +0200 (815ded19f)
+rest: fix #6462 - Martin Schanzenbach
+
+Tue, 4 Aug 2020 10:09:45 +0200 (080519e98)
+reclaim: do not store access token instead piggyback ticket - Martin Schanzenbach
+
+Mon, 3 Aug 2020 19:37:23 +0200 (8c86c4472)
+reclaim: support client credentials in POST body for token request - Martin Schanzenbach
+
+Sat, 1 Aug 2020 16:22:38 +0200 (e44686f08)
+fix: reclaim urlenc / revert accidental change - Martin Schanzenbach
+
+Sat, 1 Aug 2020 16:07:08 +0200 (754d8c1b4)
+util: add percent/url encoding - Martin Schanzenbach
+
+Thu, 30 Jul 2020 16:12:22 +0530 (8d312646c)
+fix SIGSEGV in GNUNET_buffer_write_data_encoded - Florian Dold
+
+Thu, 30 Jul 2020 15:15:59 +0530 (d335baac8)
+implement GNUNET_buffer_write_data_encoded - Florian Dold
+
+Wed, 22 Jul 2020 21:47:42 +0200 (8703a0516)
+ensure psql fails hard if there is an error in the SQL (fixes #6437) - Christian Grothoff
+
+Sat, 18 Jul 2020 00:44:39 +0200 (7f4ddbcab)
+merge flags into enum for GNUNET_DISK_pipe() API, fixing #6188 - Christian Grothoff
+
+Fri, 17 Jul 2020 22:35:36 +0200 (28ab2c446)
+avoid boolean flag in GNUNET_OS_start_process() API (fixes #6188) - Christian Grothoff
+
+Fri, 17 Jul 2020 14:26:45 +0200 (0c9911d73)
+TNG: Implemented 5530: add replay protection to TCP communicator. Added monotime value checks - t3sserakt
+
+Thu, 16 Jul 2020 20:36:12 +0200 (bbe0a0501)
+avoid boolean argument in GNUNET_CURL_job_add(), see #6188 - Christian Grothoff
+
+Thu, 16 Jul 2020 17:40:14 +0200 (ee1fbffa1)
+support context-wide client authentication - Christian Grothoff
+
+Thu, 16 Jul 2020 17:24:30 +0200 (23820348b)
+docs: fixed example for pinning a friends public key - rexxnor
+
+Wed, 15 Jul 2020 17:21:39 +0200 (9bb2c1e31)
+Load GNSRECORD plugins within GNUnet's context - Christian Grothoff
+
+Fri, 3 Jul 2020 22:37:42 +0200 (0f2ac01f3)
+Add function to return GNUnet's default configuration - Christian Grothoff
+
 Thu, 9 Jul 2020 09:09:50 +0200 (5a0df5e18)
 fix: raise ATS quotas to 10 MiB #6426 - Martin Schanzenbach
 
diff --git a/configure.ac b/configure.ac
index 5c79ff2af..4dacfa8ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 #
 AC_PREREQ(2.61)
 # Checks for programs.
-AC_INIT([gnunet], [0.13.1], [bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.13.2], [bug-gnunet@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 
 # check for legacy option that is no longer supported (#5627) and fail hard
@@ -1432,12 +1432,11 @@ AS_IF([test "$mysql" = "true" -a "x$enable_mysql_version_check" = "xyes"],
   AC_MSG_CHECKING(mysql version)
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
     [[
-      #include <mysql/mysql.h>]],
+      #include <mysql/mysql_version.h>]],
     [[
       #if (MYSQL_VERSION_ID < 40100)
       #error needs at least version >= 4.1
       #endif
-      int main () { return 0; }
     ]])
     ],
     [mysql=true],
@@ -1451,6 +1450,21 @@ AS_IF([test "$mysql" = "true" -a "x$enable_mysql_version_check" = "xyes"],
     mysqlfail=false
     AC_MSG_RESULT(ok)
    ])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+    [[
+      #include <mysql/mysql_version.h>]],
+    [[
+      #if (MYSQL_VERSION_ID < 80000)
+      #error needs at least version >= 4.1
+      #endif
+    ]])
+    ],
+    [mysql8=true],
+    [mysql8=false])
+  AS_IF([test x$mysql8 = xtrue],
+   [
+    AC_DEFINE([HAVE_MYSQL8],[1],[Have mysql8])
+   ],[])
 ])
 
 AM_CONDITIONAL(HAVE_MYSQL, test x$mysql = xtrue)
diff --git a/contrib/Makefile.inc b/contrib/Makefile.inc
index 35c2d42a8..a563ef4a1 100644
--- a/contrib/Makefile.inc
+++ b/contrib/Makefile.inc
@@ -3,6 +3,12 @@
 # itself.
 
 BUILDCOMMON_SHLIB_FILES = \
+    build-common/sh/bin.sh/python.sh \
+    build-common/sh/lib.sh/existence.sh \
+    build-common/sh/lib.sh/existence_python.sh \
+    build-common/sh/lib.sh/msg.sh \
+    build-common/sh/lib.sh/progname.sh \
+    build-common/sh/lib.sh/version_gnunet.sh \
     build-common/LICENSE
 
 BUILDCOMMON_CONF_FILES = \
diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c
index acc9356ed..7349fb989 100644
--- a/src/ats/ats_api_performance.c
+++ b/src/ats/ats_api_performance.c
@@ -496,7 +496,7 @@ handle_address_list (void *cls,
     return; /* was canceled */
 
   memset (&allzeros, '\0', sizeof(allzeros));
-  if ((0 == GNUNET_is_zero (&pi->peer)) &&
+  if ((GNUNET_YES == GNUNET_is_zero (&pi->peer)) &&
       (0 == plugin_name_length) &&
       (0 == plugin_address_length))
   {
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index e8a95c65e..3cd831a39 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -685,7 +685,7 @@ GAS_handle_request_address_list (struct GNUNET_SERVICE_Client *client,
   memset (&allzeros,
           '\0',
           sizeof(struct GNUNET_PeerIdentity));
-  if (0 == GNUNET_is_zero (&alrm->peer))
+  if (GNUNET_YES == GNUNET_is_zero (&alrm->peer))
   {
     /* Return addresses for all peers */
     GAS_addresses_get_peer_info (NULL,
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index a2068b31b..221364c5d 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -245,7 +245,7 @@ GCP_2s (const struct CadetPeer *cp)
   char *ret;
 
   if ((NULL == cp) ||
-      (0 == GNUNET_is_zero (&cp->pid.public_key)))
+      (GNUNET_YES == GNUNET_is_zero (&cp->pid.public_key)))
     return "NULL";
 
   ret = GNUNET_CRYPTO_eddsa_public_key_to_string (&cp->pid.public_key);
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index b2f99cd55..fcaae1026 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -1173,9 +1173,9 @@ GNUNET_memcmp_ct_ (const void *b1,
  * @param a pointer to @a n bytes which should be tested for the
  *          entire memory being zero'ed out.
  * @param n number of bytes in @a to be tested
- * @return 0 if a is zero, non-zero otherwise
+ * @return GNUNET_YES if a is zero, GNUNET_NO otherwise
  */
-int
+enum GNUNET_GenericReturnValue
 GNUNET_is_zero_ (const void *a,
                  size_t n);
 
@@ -1185,7 +1185,7 @@ GNUNET_is_zero_ (const void *a,
  *
  * @param a pointer to a struct which should be tested for the
  *          entire memory being zero'ed out.
- * @return 0 if a is zero, non-zero otherwise
+ * @return GNUNET_YES if a is zero, GNUNET_NO otherwise
  */
 #define GNUNET_is_zero(a)           \
   GNUNET_is_zero_ (a, sizeof (*a))
diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h
index 74e7bf492..b8513ca84 100644
--- a/src/include/gnunet_my_lib.h
+++ b/src/include/gnunet_my_lib.h
@@ -245,7 +245,7 @@ struct GNUNET_MY_ResultSpec
   /**
    * Memory for MySQL to notify us about NULL values.
    */
-  my_bool is_null;
+  MYSQL_BOOL is_null;
 };
 
 
diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h
index 964483024..843d3ccb3 100644
--- a/src/include/gnunet_mysql_lib.h
+++ b/src/include/gnunet_mysql_lib.h
@@ -41,6 +41,12 @@ extern "C"
 #endif
 #endif
 
+#ifdef HAVE_MYSQL8
+  typedef bool MYSQL_BOOL;
+#else
+  typedef my_bool MYSQL_BOOL; //MySQL < 8 wants this
+#endif
+
 
 /**
  * Mysql context.
diff --git a/src/mysql/mysql.c b/src/mysql/mysql.c
index 713227068..e20debc82 100644
--- a/src/mysql/mysql.c
+++ b/src/mysql/mysql.c
@@ -220,7 +220,7 @@ iopen (struct GNUNET_MYSQL_Context *mc)
   char *mysql_user;
   char *mysql_password;
   unsigned long long mysql_port;
-  my_bool reconnect;
+  MYSQL_BOOL reconnect;
   unsigned int timeout;
 
   mc->dbf = mysql_init (NULL);
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index bb8138e23..b24bb2952 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -1809,7 +1809,7 @@ run_zone_iteration_round (struct ZoneIteration *zi, uint64_t limit)
   start = GNUNET_TIME_absolute_get ();
   GNUNET_break (GNUNET_SYSERR !=
                 GSN_database->iterate_records (GSN_database->cls,
-                                               (0 == GNUNET_is_zero (&zi->zone))
+                                               (GNUNET_YES == GNUNET_is_zero (&zi->zone))
                                                ? NULL
                                                : &zi->zone,
                                                zi->seq,
@@ -2083,7 +2083,7 @@ monitor_iteration_next (void *cls)
   else
     zm->iteration_cnt = zm->limit; /* use it all */
   ret = GSN_database->iterate_records (GSN_database->cls,
-                                       (0 == GNUNET_is_zero (&zm->zone))
+                                       (GNUNET_YES == GNUNET_is_zero (&zm->zone))
                                        ? NULL
                                        : &zm->zone,
                                        zm->seq,
diff --git a/src/namestore/namestore_api_monitor.c b/src/namestore/namestore_api_monitor.c
index ab6140328..9dc955544 100644
--- a/src/namestore/namestore_api_monitor.c
+++ b/src/namestore/namestore_api_monitor.c
@@ -139,7 +139,7 @@ check_result (void *cls, const struct RecordResultMessage *lrm)
 
   (void) cls;
   if ((0 != GNUNET_memcmp (&lrm->private_key, &zm->zone)) &&
-      (0 != GNUNET_is_zero (&zm->zone)))
+      (GNUNET_NO == GNUNET_is_zero (&zm->zone)))
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c
index baefdfa88..2f6e17f3b 100644
--- a/src/transport/gnunet-service-tng.c
+++ b/src/transport/gnunet-service-tng.c
@@ -3209,7 +3209,7 @@ notify_monitors (const struct GNUNET_PeerIdentity *peer,
       continue;
     if (tc->details.monitor.one_shot)
       continue;
-    if ((0 != GNUNET_is_zero (&tc->details.monitor.peer)) &&
+    if ((GNUNET_NO == GNUNET_is_zero (&tc->details.monitor.peer)) &&
         (0 != GNUNET_memcmp (&tc->details.monitor.peer, peer)))
       continue;
     notify_monitor (tc, peer, address, nt, me);
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index 4aad49777..a404a1627 100644
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -538,9 +538,9 @@ GNUNET_copy_message (const struct GNUNET_MessageHeader *msg)
  * @param a pointer to @a n bytes which should be tested for the
  *          entire memory being zero'ed out.
  * @param n number of bytes in @a to be tested
- * @return 0 if a is zero, non-zero otherwise
+ * @return GNUNET_YES if a is zero, GNUNET_NO otherwise
  */
-int
+enum GNUNET_GenericReturnValue
 GNUNET_is_zero_ (const void *a,
                  size_t n)
 {
@@ -548,8 +548,8 @@ GNUNET_is_zero_ (const void *a,
 
   for (size_t i = 0; i < n; i++)
     if (b[i])
-      return 1;
-  return 0;
+      return GNUNET_NO;
+  return GNUNET_YES;
 }
 
 
diff --git a/src/util/service.c b/src/util/service.c
index e6bbe855f..ddd31181d 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -473,7 +473,7 @@ check_ipv6_listed (const struct GNUNET_STRINGS_IPv6NetworkPolicy *list,
     return GNUNET_NO;
   i = 0;
 NEXT:
-  while (0 != GNUNET_is_zero (&list[i].network))
+  while (GNUNET_NO == GNUNET_is_zero (&list[i].network))
   {
     for (unsigned int j = 0; j < sizeof(struct in6_addr) / sizeof(int); j++)
       if (((((int *) ip)[j] & ((int *) &list[i].netmask)[j])) !=
diff --git a/src/util/test_peer.c b/src/util/test_peer.c
index 320746c76..bb0bc48dc 100644
--- a/src/util/test_peer.c
+++ b/src/util/test_peer.c
@@ -106,8 +106,7 @@ check ()
    * is expected to be set to zero
    */GNUNET_log_skip (1, GNUNET_YES);
   GNUNET_PEER_resolve (0, &res);
-  GNUNET_assert (0 ==
-                 GNUNET_is_zero (&res));
+  GNUNET_assert (GNUNET_YES == GNUNET_is_zero (&res));
 
   /* Removing peer entries 1 and 3 from table using the list decrement function */
   /* If count = 0, nothing should be done whatsoever */