11 files changed, 116 insertions, 64 deletions

diff --git a/src/include/gnunet_messenger_service.h b/src/include/gnunet_messenger_service.h
index 81bc3aa12..ecd856eb9 100644
--- a/src/include/gnunet_messenger_service.h
+++ b/src/include/gnunet_messenger_service.h
@@ -476,8 +476,8 @@ struct GNUNET_MESSENGER_MessageBody
     struct GNUNET_MESSENGER_MessageInvite invite;
     struct GNUNET_MESSENGER_MessageText text;
     struct GNUNET_MESSENGER_MessageFile file;
-    struct GNUNET_MESSENGER_MessagePrivate private;
-    struct GNUNET_MESSENGER_MessageDelete delete;
+    struct GNUNET_MESSENGER_MessagePrivate privacy;
+    struct GNUNET_MESSENGER_MessageDelete deletion;
   };
 };
 
diff --git a/src/json/json.c b/src/json/json.c
index 503702962..d55189804 100644
--- a/src/json/json.c
+++ b/src/json/json.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet
-   Copyright (C) 2014-2017 GNUnet e.V.
+   Copyright (C) 2014-2017, 2021 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -70,6 +70,11 @@ GNUNET_JSON_parse (const json_t *root,
     {
       if (NULL != error_json_name)
         *error_json_name = spec[i].field;
+      else
+        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                    "Parsing failed for field `%s:%u`\n",
+                    spec[i].field,
+                    i);
       if (NULL != error_line)
         *error_line = i;
       GNUNET_JSON_parse_free (spec);
diff --git a/src/json/json_generator.c b/src/json/json_generator.c
index 5806eb174..0c513ca9d 100644
--- a/src/json/json_generator.c
+++ b/src/json/json_generator.c
@@ -42,7 +42,14 @@ GNUNET_JSON_from_data (const void *data,
   char *buf;
   json_t *json;
 
-  buf = GNUNET_STRINGS_data_to_string_alloc (data, size);
+  if ((size * 8 + 4) / 5 + 1 >=
+      GNUNET_MAX_MALLOC_CHECKED)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  buf = GNUNET_STRINGS_data_to_string_alloc (data,
+                                             size);
   json = json_string (buf);
   GNUNET_free (buf);
   GNUNET_break (NULL != json);
@@ -201,5 +208,4 @@ GNUNET_JSON_from_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *sig)
 }
 
 
-
 /* End of json/json_generator.c */
diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index 6189b7596..03db9ec80 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -125,7 +125,7 @@ parse_variable_data (void *cls,
     return GNUNET_SYSERR;
   }
   size = (strlen (str) * 5) / 8;
-  if (size >= 1024)
+  if (size >= GNUNET_MAX_MALLOC_CHECKED)
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
@@ -135,6 +135,15 @@ parse_variable_data (void *cls,
                                        strlen (str),
                                        data,
                                        size);
+  if ( (0 < size) &&
+       (GNUNET_OK != res) )
+  {
+    size--;
+    res = GNUNET_STRINGS_string_to_data (str,
+                                         strlen (str),
+                                         data,
+                                         size);
+  }
   if (GNUNET_OK != res)
   {
     GNUNET_break_op (0);
diff --git a/src/messenger/gnunet-service-messenger_message_handle.c b/src/messenger/gnunet-service-messenger_message_handle.c
index 1d489310c..86f2b901a 100644
--- a/src/messenger/gnunet-service-messenger_message_handle.c
+++ b/src/messenger/gnunet-service-messenger_message_handle.c
@@ -126,11 +126,11 @@ void
 handle_message_delete (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
                        const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_TIME_Relative delay = GNUNET_TIME_relative_ntoh (message->body.delete.delay);
+  struct GNUNET_TIME_Relative delay = GNUNET_TIME_relative_ntoh (message->body.deletion.delay);
   struct GNUNET_TIME_Absolute action = GNUNET_TIME_absolute_ntoh (message->header.timestamp);
 
   action = GNUNET_TIME_absolute_add (action, delay);
   delay = GNUNET_TIME_absolute_get_difference (GNUNET_TIME_absolute_get (), action);
 
-  delete_room_message (room, session, &(message->body.delete.hash), delay);
+  delete_room_message (room, session, &(message->body.deletion.hash), delay);
 }
diff --git a/src/messenger/gnunet-service-messenger_message_kind.c b/src/messenger/gnunet-service-messenger_message_kind.c
index ef9bbfd2e..3edcade91 100644
--- a/src/messenger/gnunet-service-messenger_message_kind.c
+++ b/src/messenger/gnunet-service-messenger_message_kind.c
@@ -232,8 +232,8 @@ create_message_delete (const struct GNUNET_HashCode *hash, const struct GNUNET_T
   if (!message)
     return NULL;
 
-  GNUNET_memcpy(&(message->body.delete.hash), hash, sizeof(struct GNUNET_HashCode));
-  message->body.delete.delay = GNUNET_TIME_relative_hton (delay);
+  GNUNET_memcpy(&(message->body.deletion.hash), hash, sizeof(struct GNUNET_HashCode));
+  message->body.deletion.delay = GNUNET_TIME_relative_hton (delay);
 
   return message;
 }
diff --git a/src/messenger/messenger_api_message.c b/src/messenger/messenger_api_message.c
index facd7b093..c7364d51c 100644
--- a/src/messenger/messenger_api_message.c
+++ b/src/messenger/messenger_api_message.c
@@ -56,8 +56,8 @@ create_message (enum GNUNET_MESSENGER_MessageKind kind)
     message->body.file.uri = NULL;
     break;
   case GNUNET_MESSENGER_KIND_PRIVATE:
-    message->body.private.length = 0;
-    message->body.private.data = NULL;
+    message->body.privacy.length = 0;
+    message->body.privacy.data = NULL;
     break;
   default:
     break;
@@ -87,11 +87,11 @@ copy_message (const struct GNUNET_MESSENGER_Message *message)
     copy->body.file.uri = GNUNET_strdup(message->body.file.uri);
     break;
   case GNUNET_MESSENGER_KIND_PRIVATE:
-    copy->body.private.data = copy->body.private.length ? GNUNET_malloc(copy->body.private.length) : NULL;
+    copy->body.privacy.data = copy->body.privacy.length ? GNUNET_malloc(copy->body.privacy.length) : NULL;
 
-    if (copy->body.private.data)
+    if (copy->body.privacy.data)
     {
-      GNUNET_memcpy(copy->body.private.data, message->body.private.data, copy->body.private.length);
+      GNUNET_memcpy(copy->body.privacy.data, message->body.privacy.data, copy->body.privacy.length);
     }
 
     break;
@@ -117,7 +117,7 @@ destroy_message_body (enum GNUNET_MESSENGER_MessageKind kind, struct GNUNET_MESS
     GNUNET_free(body->file.uri);
     break;
   case GNUNET_MESSENGER_KIND_PRIVATE:
-    GNUNET_free(body->private.data);
+    GNUNET_free(body->privacy.data);
     break;
   default:
     break;
@@ -206,7 +206,7 @@ get_message_body_kind_size (enum GNUNET_MESSENGER_MessageKind kind)
     length += member_size(struct GNUNET_MESSENGER_Message, body.file.name);
     break;
   case GNUNET_MESSENGER_KIND_PRIVATE:
-    length += member_size(struct GNUNET_MESSENGER_Message, body.private.key);
+    length += member_size(struct GNUNET_MESSENGER_Message, body.privacy.key);
     break;
   default:
     break;
@@ -256,7 +256,7 @@ get_message_body_size (enum GNUNET_MESSENGER_MessageKind kind, const struct GNUN
     length += strlen (body->file.uri);
     break;
   case GNUNET_MESSENGER_KIND_PRIVATE:
-    length += body->private.length;
+    length += body->privacy.length;
     break;
   default:
     break;
@@ -421,8 +421,8 @@ encode_message_body (enum GNUNET_MESSENGER_MessageKind kind, const struct GNUNET
     encode_step_ext(buffer, offset, body->file.uri, min(length - offset, strlen(body->file.uri)));
     break;
   case GNUNET_MESSENGER_KIND_PRIVATE:
-    encode_step(buffer, offset, &(body->private.key));
-    encode_step_ext(buffer, offset, body->private.data, min(length - offset, body->private.length));
+    encode_step(buffer, offset, &(body->privacy.key));
+    encode_step_ext(buffer, offset, body->privacy.data, min(length - offset, body->privacy.length));
     break;
   default:
     break;
@@ -579,10 +579,10 @@ decode_message_body (enum GNUNET_MESSENGER_MessageKind *kind, struct GNUNET_MESS
     decode_step_malloc(buffer, offset, body->file.uri, length - offset, 1);
     break;
   case GNUNET_MESSENGER_KIND_PRIVATE:
-    decode_step(buffer, offset, &(body->private.key));
+    decode_step(buffer, offset, &(body->privacy.key));
 
-    body->private.length = (length - offset);
-    decode_step_malloc(buffer, offset, body->private.data, length - offset, 0);
+    body->privacy.length = (length - offset);
+    decode_step_malloc(buffer, offset, body->privacy.data, length - offset, 0);
     break;
   default:
     *kind = GNUNET_MESSENGER_KIND_UNKNOWN;
@@ -738,14 +738,14 @@ encrypt_message (struct GNUNET_MESSENGER_Message *message, const struct GNUNET_I
   const uint16_t padded_length = calc_padded_length(length);
 
   message->header.kind = GNUNET_MESSENGER_KIND_PRIVATE;
-  message->body.private.data = GNUNET_malloc(padded_length);
-  message->body.private.length = padded_length;
+  message->body.privacy.data = GNUNET_malloc(padded_length);
+  message->body.privacy.length = padded_length;
 
-  encode_short_message (&shortened, padded_length, message->body.private.data);
+  encode_short_message (&shortened, padded_length, message->body.privacy.data);
 
-  if (padded_length == GNUNET_IDENTITY_encrypt (message->body.private.data, padded_length, key,
-                                                &(message->body.private.key),
-                                                message->body.private.data))
+  if (padded_length == GNUNET_IDENTITY_encrypt (message->body.privacy.data, padded_length, key,
+                                                &(message->body.privacy.key),
+                                                message->body.privacy.data))
   {
     destroy_message_body (shortened.kind, &(shortened.body));
     return GNUNET_YES;
@@ -764,9 +764,9 @@ decrypt_message (struct GNUNET_MESSENGER_Message *message, const struct GNUNET_I
 {
   GNUNET_assert((message) && (key));
 
-  if (message->body.private.length != GNUNET_IDENTITY_decrypt (message->body.private.data, message->body.private.length,
-                                                               key, &(message->body.private.key),
-                                                               message->body.private.data))
+  if (message->body.privacy.length != GNUNET_IDENTITY_decrypt (message->body.privacy.data, message->body.privacy.length,
+                                                               key, &(message->body.privacy.key),
+                                                               message->body.privacy.data))
   {
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Decrypting message failed!\n");
 
@@ -775,7 +775,7 @@ decrypt_message (struct GNUNET_MESSENGER_Message *message, const struct GNUNET_I
 
   struct GNUNET_MESSENGER_ShortMessage shortened;
 
-  if (GNUNET_YES != decode_short_message (&shortened, message->body.private.length, message->body.private.data))
+  if (GNUNET_YES != decode_short_message (&shortened, message->body.privacy.length, message->body.privacy.data))
   {
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Decoding decrypted message failed!\n");
 
diff --git a/src/messenger/messenger_api_room.c b/src/messenger/messenger_api_room.c
index 67a6015ab..0d9237a2e 100644
--- a/src/messenger/messenger_api_room.c
+++ b/src/messenger/messenger_api_room.c
@@ -205,11 +205,11 @@ handle_delete_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENG
                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
   struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_CONTAINER_multihashmap_get (
-      room->messages, &(message->body.delete.hash)
+      room->messages, &(message->body.deletion.hash)
   );
 
   if ((entry) && ((entry->sender == sender) || (get_handle_contact (room->handle, &(room->key)) == sender)) &&
-      (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (room->messages, &(message->body.delete.hash), entry)))
+      (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (room->messages, &(message->body.deletion.hash), entry)))
   {
     destroy_message (entry->message);
     GNUNET_free(entry);
diff --git a/src/testbed/gnunet-cmds-helper.c b/src/testbed/gnunet-cmds-helper.c
index 6498d1279..41d6c06b8 100644
--- a/src/testbed/gnunet-cmds-helper.c
+++ b/src/testbed/gnunet-cmds-helper.c
@@ -283,8 +283,6 @@ shutdown_task (void *cls)
 }
 
 
-
-
 /**
  * Task to write to the standard out
  *
@@ -551,10 +549,10 @@ tokenizer_cb (void *cls, const struct GNUNET_MessageHeader *message)
   }
 
 
-  error:
+error:
   status = GNUNET_SYSERR;
   LOG (GNUNET_ERROR_TYPE_ERROR,
-       "tokenizer shuting down!\n");
+       "tokenizer shutting down!\n");
   GNUNET_SCHEDULER_shutdown ();
   return GNUNET_SYSERR;
 }
@@ -577,7 +575,7 @@ read_task (void *cls)
   {
     LOG_DEBUG ("STDIN closed\n");
     LOG (GNUNET_ERROR_TYPE_ERROR,
-         "tokenizer shuting down during reading!\n");
+         "tokenizer shutting down during reading!\n");
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
@@ -586,7 +584,7 @@ read_task (void *cls)
     /* didn't expect any more data! */
     GNUNET_break_op (0);
     LOG (GNUNET_ERROR_TYPE_ERROR,
-         "tokenizer shuting down during reading, didn't expect any more data!\n");
+         "tokenizer shutting down during reading, didn't expect any more data!\n");
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
@@ -600,7 +598,7 @@ read_task (void *cls)
   {
     GNUNET_break (0);
     LOG (GNUNET_ERROR_TYPE_ERROR,
-         "tokenizer shuting down during reading, writing to buffer failed!\n");
+         "tokenizer shutting down during reading, writing to buffer failed!\n");
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 3294d11f4..d0090ae53 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2006, 2007, 2008, 2009, 2013, 2020 GNUnet e.V.
+     Copyright (C) 2006, 2007, 2008, 2009, 2013, 2020, 2021 GNUnet e.V.
 
      GNUnet is free software: you can redistribute it and/or modify it
      under the terms of the GNU Affero General Public License as published
@@ -260,13 +260,14 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
     pos = memchr (&mem[r_bytes], '\n', to_read);
     if (NULL == pos)
     {
-      line_orig = GNUNET_strndup (&mem[r_bytes], line_size = to_read);
+      line_orig = GNUNET_strndup (&mem[r_bytes],
+                                  line_size = to_read);
       r_bytes += line_size;
     }
     else
     {
-      line_orig =
-        GNUNET_strndup (&mem[r_bytes], line_size = (pos - &mem[r_bytes]));
+      line_orig = GNUNET_strndup (&mem[r_bytes],
+                                  line_size = (pos - &mem[r_bytes]));
       r_bytes += line_size + 1;
     }
     line = line_orig;
@@ -288,7 +289,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
       continue;
 
     /* remove tailing whitespace */
-    for (i = line_size - 1; (i >= 1) && (isspace ((unsigned char) line[i]));
+    for (i = line_size - 1;
+         (i >= 1) && (isspace ((unsigned char) line[i]));
          i--)
       line[i] = '\0';
 
@@ -297,26 +299,46 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
       ;
 
     /* ignore comments */
-    if (('#' == line[0]) || ('%' == line[0]))
+    if ( ('#' == line[0]) ||
+         ('%' == line[0]) )
       continue;
 
     /* handle special "@INLINE@" directive */
-    if (0 == strncasecmp (line, "@INLINE@ ", strlen ("@INLINE@ ")))
+    if (0 == strncasecmp (line,
+                          "@INLINE@ ",
+                          strlen ("@INLINE@ ")))
     {
       /* @INLINE@ value */
       value = &line[strlen ("@INLINE@ ")];
       if (NULL != basedir)
       {
-        char *fn;
-
-        GNUNET_asprintf (&fn, "%s/%s", basedir, value);
-        if (GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, fn))
+        if ('/' == *value)
+        {
+          if (GNUNET_OK !=
+              GNUNET_CONFIGURATION_parse (cfg,
+                                          value))
+          {
+            ret = GNUNET_SYSERR;       /* failed to parse included config */
+            break;
+          }
+        }
+        else
         {
+          char *fn;
+
+          GNUNET_asprintf (&fn, "%s/%s",
+                           basedir,
+                           value);
+          if (GNUNET_OK !=
+              GNUNET_CONFIGURATION_parse (cfg,
+                                          fn))
+          {
+            GNUNET_free (fn);
+            ret = GNUNET_SYSERR;       /* failed to parse included config */
+            break;
+          }
           GNUNET_free (fn);
-          ret = GNUNET_SYSERR;         /* failed to parse included config */
-          break;
         }
-        GNUNET_free (fn);
       }
       else
       {
@@ -374,7 +396,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
   }
   GNUNET_free (line_orig);
   GNUNET_free (section);
-  GNUNET_assert ((GNUNET_OK != ret) || (r_bytes == size));
+  GNUNET_assert ( (GNUNET_OK != ret) ||
+                  (r_bytes == size) );
   return ret;
 }
 
@@ -426,7 +449,16 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg,
   endsep = strrchr (fn, (int) '/');
   if (NULL != endsep)
     *endsep = '\0';
-  ret = GNUNET_CONFIGURATION_deserialize (cfg, mem, fs, fn);
+  ret = GNUNET_CONFIGURATION_deserialize (cfg,
+                                          mem,
+                                          fs,
+                                          fn);
+  if (GNUNET_OK != ret)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Failed to parse configuration file `%s'\n"),
+                fn);
+  }
   GNUNET_free (fn);
   GNUNET_free (mem);
   /* restore dirty flag - anything we set in the meantime
diff --git a/src/util/gnunet-base32.c b/src/util/gnunet-base32.c
index 2c797f56e..217185ed0 100644
--- a/src/util/gnunet-base32.c
+++ b/src/util/gnunet-base32.c
@@ -42,7 +42,8 @@ main (int argc,
   const struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_option_flag ('d',
                                "decode",
-                               gettext_noop ("run decoder modus, otherwise runs as encoder"),
+                               gettext_noop (
+                                 "run decoder modus, otherwise runs as encoder"),
                                &decode),
     GNUNET_GETOPT_option_help ("Crockford base32 encoder/decoder"),
     GNUNET_GETOPT_option_version (PACKAGE_VERSION),
@@ -105,11 +106,12 @@ main (int argc,
        out_size and out_size-1 below */
     out_size = in_size * 5 / 8;
     out = GNUNET_malloc (out_size);
-    if (GNUNET_OK !=
-        GNUNET_STRINGS_string_to_data (in,
-                                       in_size,
-                                       out,
-                                       out_size))
+    if ( (GNUNET_OK !=
+          GNUNET_STRINGS_string_to_data (in,
+                                         in_size,
+                                         out,
+                                         out_size)) &&
+         (out_size > 0) )
     {
       out_size--;
       if (GNUNET_OK !=