[gnunet] branch master updated (cd83104d6 -> 88905793d)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from cd83104d6 Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
     new 8fbb8babf meson: more contrib
     new a80ca417f TRANSPORT: Fix nullptr deref, removed newly introduced 
unused variable
     new 88905793d UTIL: Fix tests ftbfs for new blinding API

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/contrib/service/consensus/meson.build        | 2 +-
 src/contrib/service/conversation/meson.build     | 6 +++---
 src/contrib/service/template/meson.build         | 2 +-
 src/lib/json/test_json.c                         | 2 +-
 src/lib/sq/test_sq.c                             | 3 ++-
 src/service/transport/gnunet-service-transport.c | 8 +-------
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/contrib/service/consensus/meson.build 
b/src/contrib/service/consensus/meson.build
index 50483e81f..86cc0663b 100644
--- a/src/contrib/service/consensus/meson.build
+++ b/src/contrib/service/consensus/meson.build
@@ -63,4 +63,4 @@ configure_file(input : 'test_consensus.conf',
 
 test('test_consensus_api', testconsensusapi,
   workdir: meson.current_build_dir(),
-  suite: 'consensus')
+  suite: ['consensus', 'contrib'])
diff --git a/src/contrib/service/conversation/meson.build 
b/src/contrib/service/conversation/meson.build
index a7f1ee896..052fa1a6e 100644
--- a/src/contrib/service/conversation/meson.build
+++ b/src/contrib/service/conversation/meson.build
@@ -182,11 +182,11 @@ configure_file(input : 'test_conversation.conf',
                install: false)
 
 test('test_conversation_api', testconvapi, workdir: meson.current_build_dir(),
-     suite: 'conversation')
+     suite: ['conversation', 'contrib'])
 
 test('test_conversation_api_twocalls', testconvapitwo, workdir: 
meson.current_build_dir(),
-     suite: 'conversation')
+     suite: ['conversation', 'contrib'])
 
 test('test_conversation_api_reject', testconvapireject, workdir: 
meson.current_build_dir(),
-     suite: 'conversation')
+     suite: ['conversation', 'contrib'])
 
diff --git a/src/contrib/service/template/meson.build 
b/src/contrib/service/template/meson.build
index b17b86709..7a30a7575 100644
--- a/src/contrib/service/template/meson.build
+++ b/src/contrib/service/template/meson.build
@@ -18,4 +18,4 @@ testtemplateapi = executable ('test_template_api',
             include_directories: [incdir, configuration_inc],
             install: false)
 test('test_template_api', testtemplateapi, workdir: meson.current_source_dir(),
-     suite: 'template')
+     suite: ['template', 'contrib'])
diff --git a/src/lib/json/test_json.c b/src/lib/json/test_json.c
index db376d213..1d27518b2 100644
--- a/src/lib/json/test_json.c
+++ b/src/lib/json/test_json.c
@@ -171,7 +171,7 @@ test_rsa ()
   priv = GNUNET_CRYPTO_rsa_private_key_create (1024);
   pub = GNUNET_CRYPTO_rsa_private_key_get_public (priv);
   memset (&msg, 42, sizeof(msg));
-  sig = GNUNET_CRYPTO_rsa_sign_fdh (priv, &msg);
+  sig = GNUNET_CRYPTO_rsa_sign_fdh (priv, &msg, sizeof (msg));
   GNUNET_assert (NULL != (jp = GNUNET_JSON_from_rsa_public_key (pub)));
   GNUNET_assert (NULL != (js = GNUNET_JSON_from_rsa_signature (sig)));
   GNUNET_assert (GNUNET_OK == GNUNET_JSON_parse (jp, pspec, NULL, NULL));
diff --git a/src/lib/sq/test_sq.c b/src/lib/sq/test_sq.c
index ecd9918d7..292de5f34 100644
--- a/src/lib/sq/test_sq.c
+++ b/src/lib/sq/test_sq.c
@@ -92,7 +92,8 @@ run_queries (sqlite3 *dbh)
   pub = GNUNET_CRYPTO_rsa_private_key_get_public (priv);
   memset (&hmsg, 42, sizeof(hmsg));
   sig = GNUNET_CRYPTO_rsa_sign_fdh (priv,
-                                    &hmsg);
+                                    &hmsg,
+                                    sizeof (hmsg));
   u16 = 16;
   u32 = 32;
   u64 = 64;
diff --git a/src/service/transport/gnunet-service-transport.c 
b/src/service/transport/gnunet-service-transport.c
index 54d42fd51..0eded2d39 100644
--- a/src/service/transport/gnunet-service-transport.c
+++ b/src/service/transport/gnunet-service-transport.c
@@ -8655,7 +8655,6 @@ handle_hello_for_incoming (void *cls,
                            const char *emsg)
 {
   struct GNUNET_HELLO_Builder *builder;
-  struct GNUNET_PeerIdentity *pid;
 
   if (NULL != emsg)
   {
@@ -8667,12 +8666,10 @@ handle_hello_for_incoming (void *cls,
   if (0 == GNUNET_memcmp (peer, &GST_my_identity))
     return;
   builder = GNUNET_HELLO_builder_from_msg (hello);
-  pid = GNUNET_new (struct GNUNET_PeerIdentity);
   GNUNET_HELLO_builder_iterate (builder,
                                 (struct GNUNET_PeerIdentity *) peer,
                                 hello_for_incoming_cb,
                                 (struct GNUNET_PeerIdentity *) peer);
-  GNUNET_free (pid);
   GNUNET_HELLO_builder_free (builder);
 }
 
@@ -11293,7 +11290,6 @@ handle_hello_for_client (void *cls,
 {
   (void) cls;
   struct GNUNET_HELLO_Builder *builder;
-  struct GNUNET_PeerIdentity *pid;
 
   if (NULL != emsg)
   {
@@ -11305,12 +11301,10 @@ handle_hello_for_client (void *cls,
   if (0 == GNUNET_memcmp (peer, &GST_my_identity))
     return;
   builder = GNUNET_HELLO_builder_from_msg (hello);
-  pid = GNUNET_new (struct GNUNET_PeerIdentity);
   GNUNET_HELLO_builder_iterate (builder,
                                 (struct GNUNET_PeerIdentity *) peer,
                                 hello_for_client_cb,
-                                NULL);
-  GNUNET_free (pid);
+                                (struct GNUNET_PeerIdentity *) peer);
   GNUNET_HELLO_builder_free (builder);
 }
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.