gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnunet] branch master updated: -more coverity fixes


From: gnunet
Subject: [gnunet] branch master updated: -more coverity fixes
Date: Fri, 26 Mar 2021 22:33:59 +0100

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

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

The following commit(s) were added to refs/heads/master by this push:
     new 33054bb2a -more coverity fixes
33054bb2a is described below

commit 33054bb2a8d6272e2f137e8be1833ff9e469c177
Author: Martin Schanzenbach <mschanzenbach@posteo.de>
AuthorDate: Fri Mar 26 22:32:12 2021 +0100

    -more coverity fixes
---
 src/peerinfo-tool/plugin_rest_peerinfo.c       |   4 +-
 src/rest/plugin_rest_copying.c                 |   6 +-
 src/revocation/gnunet-revocation.c             |  14 +--
 src/revocation/gnunet-service-revocation.c     |   9 +-
 src/revocation/plugin_block_revocation.c       |   9 +-
 src/revocation/revocation_api.c                |   9 +-
 src/transport/gnunet-communicator-tcp.c        |  48 +++++-----
 src/transport/gnunet-communicator-udp.c        |  13 +--
 src/transport/gnunet-service-tng.c             |   6 +-
 src/transport/transport-testing-communicator.c |   5 +
 src/util/gnunet-crypto-tvg.c                   | 124 ++++++++++++++++++-------
 11 files changed, 162 insertions(+), 85 deletions(-)

diff --git a/src/peerinfo-tool/plugin_rest_peerinfo.c 
b/src/peerinfo-tool/plugin_rest_peerinfo.c
index 4bbc7442e..f969a175b 100644
--- a/src/peerinfo-tool/plugin_rest_peerinfo.c
+++ b/src/peerinfo-tool/plugin_rest_peerinfo.c
@@ -379,7 +379,9 @@ peerinfo_list_finished (void *cls)
   result_str = json_dumps (handle->response, 0);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Result %s\n", result_str);
   resp = GNUNET_REST_create_response (result_str);
-  MHD_add_response_header (resp, "Content-Type", "application/json");
+  GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
+                                                    "Content-Type",
+                                                    "application/json"));
   handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
   GNUNET_free (result_str);
   GNUNET_SCHEDULER_add_now (&cleanup_handle, handle);
diff --git a/src/rest/plugin_rest_copying.c b/src/rest/plugin_rest_copying.c
index 6d074d3d1..52783a81a 100644
--- a/src/rest/plugin_rest_copying.c
+++ b/src/rest/plugin_rest_copying.c
@@ -138,9 +138,9 @@ options_cont (struct GNUNET_REST_RequestHandle *con_handle,
   struct RequestHandle *handle = cls;
 
   resp = GNUNET_REST_create_response (NULL);
-  MHD_add_response_header (resp,
-                           "Access-Control-Allow-Methods",
-                           MHD_HTTP_METHOD_GET);
+  GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
+                                                    
"Access-Control-Allow-Methods",
+                                                    MHD_HTTP_METHOD_GET));
   handle->proc (handle->proc_cls,
                 resp,
                 MHD_HTTP_OK);
diff --git a/src/revocation/gnunet-revocation.c 
b/src/revocation/gnunet-revocation.c
index b5737158b..99fecdd35 100644
--- a/src/revocation/gnunet-revocation.c
+++ b/src/revocation/gnunet-revocation.c
@@ -307,17 +307,9 @@ calculate_pow (void *cls)
     return;
   }
   pow_passes++;
-  /**
-   * Otherwise CTRL-C does not work
-   */
-  if (0 == pow_passes % 128)
-    pow_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
-                                             &calculate_pow,
-                                             ph);
-  else
-    pow_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
-                                             &calculate_pow,
-                                             ph);
+  pow_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
+                                           &calculate_pow,
+                                           ph);
 
 }
 
diff --git a/src/revocation/gnunet-service-revocation.c 
b/src/revocation/gnunet-service-revocation.c
index 7032921c6..6f70720ba 100644
--- a/src/revocation/gnunet-service-revocation.c
+++ b/src/revocation/gnunet-service-revocation.c
@@ -306,12 +306,19 @@ publicize_rm (const struct RevokeMessage *rm)
   struct RevokeMessage *cp;
   struct GNUNET_HashCode hc;
   struct GNUNET_SETU_Element e;
+  ssize_t pklen;
   const struct GNUNET_IDENTITY_PublicKey *pk;
 
   struct GNUNET_REVOCATION_PowP *pow = (struct GNUNET_REVOCATION_PowP *) 
&rm[1];
   pk = (const struct GNUNET_IDENTITY_PublicKey *) &pow[1];
+  pklen = GNUNET_IDENTITY_key_get_length (pk);
+  if (0 > pklen)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
   GNUNET_CRYPTO_hash (pk,
-                      GNUNET_IDENTITY_key_get_length (pk),
+                      pklen,
                       &hc);
   if (GNUNET_YES ==
       GNUNET_CONTAINER_multihashmap_contains (revocation_map,
diff --git a/src/revocation/plugin_block_revocation.c 
b/src/revocation/plugin_block_revocation.c
index 3c9344a49..1928d09cd 100644
--- a/src/revocation/plugin_block_revocation.c
+++ b/src/revocation/plugin_block_revocation.c
@@ -134,6 +134,7 @@ block_plugin_revocation_evaluate (void *cls,
 {
   struct InternalContext *ic = cls;
   struct GNUNET_HashCode chash;
+  ssize_t pklen;
   const struct RevokeMessage *rm = reply_block;
 
   if (NULL == reply_block)
@@ -153,8 +154,14 @@ block_plugin_revocation_evaluate (void *cls,
     GNUNET_break_op (0);
     return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
   }
+  pklen = GNUNET_IDENTITY_key_get_length (pk);
+  if (0 > pklen)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+  }
   GNUNET_CRYPTO_hash (pk,
-                      GNUNET_IDENTITY_key_get_length (pk),
+                      pklen,
                       &chash);
   if (GNUNET_YES ==
       GNUNET_BLOCK_GROUP_bf_test_and_set (group,
diff --git a/src/revocation/revocation_api.c b/src/revocation/revocation_api.c
index 5cf191847..e2f871c23 100644
--- a/src/revocation/revocation_api.c
+++ b/src/revocation/revocation_api.c
@@ -492,6 +492,7 @@ GNUNET_REVOCATION_check_pow (const struct 
GNUNET_REVOCATION_PowP *pow,
   unsigned int tmp_score = 0;
   unsigned int epochs;
   uint64_t pow_val;
+  ssize_t pklen;
   const struct GNUNET_IDENTITY_PublicKey *pk;
 
   pk = (const struct GNUNET_IDENTITY_PublicKey *) &pow[1];
@@ -517,9 +518,15 @@ GNUNET_REVOCATION_check_pow (const struct 
GNUNET_REVOCATION_PowP *pow,
   GNUNET_memcpy (&buf[sizeof(uint64_t)],
                  &pow->timestamp,
                  sizeof (uint64_t));
+  pklen = GNUNET_IDENTITY_key_get_length (pk);
+  if (0 > pklen)
+  {
+    GNUNET_break (0);
+    return GNUNET_NO;
+  }
   GNUNET_memcpy (&buf[sizeof(uint64_t) * 2],
                  pk,
-                 GNUNET_IDENTITY_key_get_length (pk));
+                 pklen);
   for (unsigned int i = 0; i < POW_COUNT; i++)
   {
     pow_val = GNUNET_ntohll (pow->pow[i]);
diff --git a/src/transport/gnunet-communicator-tcp.c 
b/src/transport/gnunet-communicator-tcp.c
index c8a4c0375..9dd2797df 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -877,12 +877,14 @@ queue_destroy (struct Queue *queue)
 {
   struct ListenTask *lt = NULL;
   struct GNUNET_HashCode h_sock;
+  int sockfd;
 
-  GNUNET_CRYPTO_hash (queue->listen_sock,
-                      sizeof(queue->listen_sock),
+  sockfd = GNUNET_NETWORK_get_fd (queue->listen_sock);
+  GNUNET_CRYPTO_hash (&sockfd,
+                      sizeof(int),
                       &h_sock);
 
-  lt =   GNUNET_CONTAINER_multihashmap_get (lt_map, &h_sock);
+  lt = GNUNET_CONTAINER_multihashmap_get (lt_map, &h_sock);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Disconnecting queue for peer `%s'\n",
@@ -1263,7 +1265,8 @@ rekey_monotime_cb (void *cls,
                                                      pid,
                                                      
GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_REKEY,
                                                      rekey_monotonic_time,
-                                                     
sizeof(rekey_monotonic_time),
+                                                     sizeof(*
+                                                            
rekey_monotonic_time),
                                                      
GNUNET_TIME_UNIT_FOREVER_ABS,
                                                      
GNUNET_PEERSTORE_STOREOPTION_REPLACE,
                                                      &rekey_monotime_store_cb,
@@ -1413,18 +1416,18 @@ handshake_ack_monotime_cb (void *cls,
     queue_finish (queue);
     return;
   }
-  queue->handshake_ack_monotime_sc = GNUNET_PEERSTORE_store (peerstore,
-                                                             
"transport_tcp_communicator",
-                                                             pid,
-                                                             
GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_HANDSHAKE_ACK,
-                                                             
handshake_ack_monotonic_time,
-                                                             sizeof(
-                                                               
handshake_ack_monotonic_time),
-                                                             
GNUNET_TIME_UNIT_FOREVER_ABS,
-                                                             
GNUNET_PEERSTORE_STOREOPTION_REPLACE,
-                                                             &
-                                                             
handshake_ack_monotime_store_cb,
-                                                             queue);
+  queue->handshake_ack_monotime_sc =
+    GNUNET_PEERSTORE_store (peerstore,
+                            "transport_tcp_communicator",
+                            pid,
+                            
GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_HANDSHAKE_ACK,
+                            handshake_ack_monotonic_time,
+                            sizeof(*handshake_ack_monotonic_time),
+                            GNUNET_TIME_UNIT_FOREVER_ABS,
+                            GNUNET_PEERSTORE_STOREOPTION_REPLACE,
+                            &
+                            handshake_ack_monotime_store_cb,
+                            queue);
 }
 
 
@@ -3255,6 +3258,7 @@ init_socket (struct sockaddr *addr,
   socklen_t sto_len;
   struct GNUNET_NETWORK_Handle *listen_sock;
   struct ListenTask *lt;
+  int sockfd;
   struct GNUNET_HashCode h_sock;
 
   if (NULL == addr)
@@ -3343,8 +3347,9 @@ init_socket (struct sockaddr *addr,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "creating hash\n");
-  GNUNET_CRYPTO_hash (lt->listen_sock,
-                      sizeof(lt->listen_sock),
+  sockfd = GNUNET_NETWORK_get_fd (lt->listen_sock);
+  GNUNET_CRYPTO_hash (&sockfd,
+                      sizeof(int),
                       &h_sock);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -3564,6 +3569,7 @@ run (void *cls,
   peerstore = GNUNET_PEERSTORE_connect (cfg);
   if (NULL == peerstore)
   {
+    GNUNET_free (bindto);
     GNUNET_break (0);
     GNUNET_SCHEDULER_shutdown ();
     return;
@@ -3596,7 +3602,6 @@ run (void *cls,
     GNUNET_free (po);
     nat_register ();
     GNUNET_free (bindto);
-
     return;
   }
 
@@ -3609,8 +3614,8 @@ run (void *cls,
     in = tcp_address_to_sockaddr_numeric_v4 (&in_len, v4, bind_port);
     init_socket (in, in_len);
     nat_register ();
+    GNUNET_free (start);
     GNUNET_free (bindto);
-
     return;
   }
 
@@ -3620,8 +3625,8 @@ run (void *cls,
     in = tcp_address_to_sockaddr_numeric_v6 (&in_len, v6, bind_port);
     init_socket (in, in_len);
     nat_register ();
+    GNUNET_free (start);
     GNUNET_free (bindto);
-
     return;
   }
 
@@ -3635,6 +3640,7 @@ run (void *cls,
                                                    &init_socket_resolv,
                                                    &port);
   GNUNET_free (bindto);
+  GNUNET_free (start);
 }
 
 
diff --git a/src/transport/gnunet-communicator-udp.c 
b/src/transport/gnunet-communicator-udp.c
index 415dc4b48..d75f4ae00 100644
--- a/src/transport/gnunet-communicator-udp.c
+++ b/src/transport/gnunet-communicator-udp.c
@@ -1492,16 +1492,9 @@ add_acks (struct SharedSecret *ss, int acks_to_add)
 
   struct ReceiverAddress *receiver = ss->receiver;
 
-  if (NULL == ss)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "secret NULL!\n");
-
-  if (NULL == receiver)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Receiver NULL!\n");
-  if (NULL == receiver->d_qh)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Queue NULL!\n");
+  GNUNET_assert (NULL != ss);
+  GNUNET_assert (NULL != receiver);
+  GNUNET_assert (NULL != receiver->d_qh);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Tell transport we have %u more acks!\n",
diff --git a/src/transport/gnunet-service-tng.c 
b/src/transport/gnunet-service-tng.c
index 468048bec..cbf795eea 100644
--- a/src/transport/gnunet-service-tng.c
+++ b/src/transport/gnunet-service-tng.c
@@ -9639,11 +9639,13 @@ handle_add_queue_message (void *cls,
   {
     if (queue->qid != aqm->qid)
       continue;
-    neighbour = queue->neighbour;
     break;
   }
-  if (NULL == queue)
+
+  if (NULL != queue)
   {
+    neighbour = queue->neighbour;
+  } else {
     neighbour = lookup_neighbour (&aqm->receiver);
     if (NULL == neighbour)
     {
diff --git a/src/transport/transport-testing-communicator.c 
b/src/transport/transport-testing-communicator.c
index de356fb9c..040f16d5d 100644
--- a/src/transport/transport-testing-communicator.c
+++ b/src/transport/transport-testing-communicator.c
@@ -548,6 +548,11 @@ handle_update_queue_message (void *cls,
       tc_queue = tc_queue->next;
     }
   }
+  if (NULL == tc_queue)
+  {
+    GNUNET_SERVICE_client_continue (client->client);
+    return;
+  }
   GNUNET_assert (tc_queue->qid == msg->qid);
   GNUNET_assert (0 == GNUNET_memcmp (&tc_queue->peer_id, &msg->receiver));
   tc_queue->nt = msg->nt;
diff --git a/src/util/gnunet-crypto-tvg.c b/src/util/gnunet-crypto-tvg.c
index 8949f427c..28e44e28b 100644
--- a/src/util/gnunet-crypto-tvg.c
+++ b/src/util/gnunet-crypto-tvg.c
@@ -128,6 +128,7 @@ d2j (json_t *vec,
   json_object_set_new (vec, label, json);
 }
 
+
 /**
  * Add a number to a test vector.
  *
@@ -138,8 +139,8 @@ d2j (json_t *vec,
  */
 static void
 uint2j (json_t *vec,
-     const char *label,
-     unsigned int num)
+        const char *label,
+        unsigned int num)
 {
   json_t *json = json_integer (num);
 
@@ -154,7 +155,7 @@ expect_data_fixed (json_t *vec,
                    size_t expect_len)
 {
   const char *s = json_string_value (json_object_get (vec, name));
-  
+
   if (NULL == s)
     return GNUNET_NO;
 
@@ -166,6 +167,7 @@ expect_data_fixed (json_t *vec,
   return GNUNET_OK;
 }
 
+
 static int
 expect_data_dynamic (json_t *vec,
                      const char *name,
@@ -173,6 +175,7 @@ expect_data_dynamic (json_t *vec,
                      size_t *ret_len)
 {
   const char *s = json_string_value (json_object_get (vec, name));
+  char *tmp;
   size_t len;
 
   if (NULL == s)
@@ -181,10 +184,14 @@ expect_data_dynamic (json_t *vec,
   len = (strlen (s) * 5) / 8;
   if (NULL != ret_len)
     *ret_len = len;
-  *data = GNUNET_malloc (len);
+  tmp = GNUNET_malloc (len);
 
-  if (GNUNET_OK != GNUNET_STRINGS_string_to_data (s, strlen (s), *data, len))
+  if (GNUNET_OK != GNUNET_STRINGS_string_to_data (s, strlen (s), tmp, len))
+  {
+    GNUNET_free (tmp);
     return GNUNET_NO;
+  }
+  *data = tmp;
   return GNUNET_OK;
 }
 
@@ -197,7 +204,7 @@ expect_data_dynamic (json_t *vec,
  *
  * @returns GNUNET_OK if the vector is okay
  */
-static int 
+static int
 checkvec (const char *operation,
           json_t *vec)
 {
@@ -220,10 +227,11 @@ checkvec (const char *operation,
       return GNUNET_SYSERR;
     }
     if (GNUNET_OK != expect_data_fixed (vec,
-                                 "output",
-                                 &hash_out,
-                                 sizeof (hash_out)))
+                                        "output",
+                                        &hash_out,
+                                        sizeof (hash_out)))
     {
+      GNUNET_free (data);
       GNUNET_break (0);
       return GNUNET_NO;
     }
@@ -232,9 +240,11 @@ checkvec (const char *operation,
 
     if (0 != GNUNET_memcmp (&hc, &hash_out))
     {
+      GNUNET_free (data);
       GNUNET_break (0);
       return GNUNET_NO;
     }
+    GNUNET_free (data);
   }
   else if (0 == strcmp (operation, "ecc_ecdh"))
   {
@@ -245,33 +255,33 @@ checkvec (const char *operation,
     struct GNUNET_HashCode skm_comp;
 
     if (GNUNET_OK != expect_data_fixed (vec,
-                                 "priv1",
-                                 &priv1,
-                                 sizeof (priv1)))
+                                        "priv1",
+                                        &priv1,
+                                        sizeof (priv1)))
     {
       GNUNET_break (0);
       return GNUNET_NO;
     }
     if (GNUNET_OK != expect_data_fixed (vec,
-                                 "priv2",
-                                 &priv2,
-                                 sizeof (priv2)))
+                                        "priv2",
+                                        &priv2,
+                                        sizeof (priv2)))
     {
       GNUNET_break (0);
       return GNUNET_NO;
     }
     if (GNUNET_OK != expect_data_fixed (vec,
-                                 "pub1",
-                                 &pub1,
-                                 sizeof (pub1)))
+                                        "pub1",
+                                        &pub1,
+                                        sizeof (pub1)))
     {
       GNUNET_break (0);
       return GNUNET_NO;
     }
     if (GNUNET_OK != expect_data_fixed (vec,
-                                 "skm",
-                                 &skm,
-                                 sizeof (skm)))
+                                        "skm",
+                                        &skm,
+                                        sizeof (skm)))
     {
       GNUNET_break (0);
       return GNUNET_NO;
@@ -407,6 +417,8 @@ checkvec (const char *operation,
                                           &ikm,
                                           &ikm_len))
     {
+      GNUNET_free (out);
+      GNUNET_free (out_comp);
       GNUNET_break (0);
       return GNUNET_SYSERR;
     }
@@ -416,6 +428,9 @@ checkvec (const char *operation,
                                           &salt,
                                           &salt_len))
     {
+      GNUNET_free (out);
+      GNUNET_free (out_comp);
+      GNUNET_free (ikm);
       GNUNET_break (0);
       return GNUNET_SYSERR;
     }
@@ -425,6 +440,10 @@ checkvec (const char *operation,
                                           &ctx,
                                           &ctx_len))
     {
+      GNUNET_free (out);
+      GNUNET_free (out_comp);
+      GNUNET_free (ikm);
+      GNUNET_free (salt);
       GNUNET_break (0);
       return GNUNET_SYSERR;
     }
@@ -442,10 +461,19 @@ checkvec (const char *operation,
 
     if (0 != memcmp (out, out_comp, out_len))
     {
+      GNUNET_free (out);
+      GNUNET_free (out_comp);
+      GNUNET_free (ikm);
+      GNUNET_free (salt);
+      GNUNET_free (ctx);
       GNUNET_break (0);
       return GNUNET_NO;
     }
-
+    GNUNET_free (out);
+    GNUNET_free (out_comp);
+    GNUNET_free (ikm);
+    GNUNET_free (salt);
+    GNUNET_free (ctx);
   }
   else if (0 == strcmp (operation, "eddsa_ecdh"))
   {
@@ -562,6 +590,7 @@ checkvec (const char *operation,
                                           &public_enc_data,
                                           &public_enc_len))
     {
+      GNUNET_free (blinded_data);
       GNUNET_break (0);
       return GNUNET_SYSERR;
     }
@@ -571,6 +600,8 @@ checkvec (const char *operation,
                                           &secret_enc_data,
                                           &secret_enc_len))
     {
+      GNUNET_free (blinded_data);
+      GNUNET_free (public_enc_data);
       GNUNET_break (0);
       return GNUNET_SYSERR;
     }
@@ -580,6 +611,9 @@ checkvec (const char *operation,
                                           &sig_enc_data,
                                           &sig_enc_length))
     {
+      GNUNET_free (blinded_data);
+      GNUNET_free (public_enc_data);
+      GNUNET_free (secret_enc_data);
       GNUNET_break (0);
       return GNUNET_SYSERR;
     }
@@ -601,6 +635,11 @@ checkvec (const char *operation,
                                                             blinded_data_comp,
                                                             blinded_len)) )
     {
+      GNUNET_free (blinded_data);
+      GNUNET_free (public_enc_data);
+      GNUNET_free (secret_enc_data);
+      GNUNET_free (sig_enc_data);
+      GNUNET_free (skey);
       GNUNET_break (0);
       return GNUNET_NO;
     }
@@ -611,14 +650,27 @@ checkvec (const char *operation,
                                                            pkey));
     public_enc_len = GNUNET_CRYPTO_rsa_public_key_encode (pkey,
                                                           &public_enc_data);
-    sig_enc_length_comp = GNUNET_CRYPTO_rsa_signature_encode (sig, 
&sig_enc_data_comp);
+    sig_enc_length_comp = GNUNET_CRYPTO_rsa_signature_encode (sig,
+                                                              
&sig_enc_data_comp);
 
     if ( (sig_enc_length != sig_enc_length_comp) ||
          (0 != memcmp (sig_enc_data, sig_enc_data_comp, sig_enc_length) ))
     {
+      GNUNET_free (blinded_sig);
+      GNUNET_free (blinded_data);
+      GNUNET_free (public_enc_data);
+      GNUNET_free (secret_enc_data);
+      GNUNET_free (sig_enc_data);
+      GNUNET_free (skey);
       GNUNET_break (0);
       return GNUNET_NO;
     }
+    GNUNET_free (blinded_sig);
+    GNUNET_free (blinded_data);
+    GNUNET_free (public_enc_data);
+    GNUNET_free (secret_enc_data);
+    GNUNET_free (sig_enc_data);
+    GNUNET_free (skey);
   }
   else
   {
@@ -629,6 +681,7 @@ checkvec (const char *operation,
   return GNUNET_OK;
 }
 
+
 /**
  * Check test vectors from stdin.
  *
@@ -656,7 +709,7 @@ check_vectors ()
     return 1;
   }
   vectors = json_object_get (vecfile, "vectors");
-  if (!json_is_array (vectors))
+  if (! json_is_array (vectors))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bad vectors\n");
     json_decref (vecfile);
@@ -692,6 +745,7 @@ check_vectors ()
   }
 }
 
+
 /**
  * Output test vectors.
  *
@@ -868,20 +922,20 @@ output_vectors ()
     GNUNET_CRYPTO_ecdh_eddsa (&priv_ecdhe, &pub_eddsa, &key_material);
 
     d2j (vec, "priv_ecdhe",
-                  &priv_ecdhe,
-                  sizeof (struct GNUNET_CRYPTO_EcdhePrivateKey));
+         &priv_ecdhe,
+         sizeof (struct GNUNET_CRYPTO_EcdhePrivateKey));
     d2j (vec, "pub_ecdhe",
-                  &pub_ecdhe,
-                  sizeof (struct GNUNET_CRYPTO_EcdhePublicKey));
+         &pub_ecdhe,
+         sizeof (struct GNUNET_CRYPTO_EcdhePublicKey));
     d2j (vec, "priv_eddsa",
-                  &priv_eddsa,
-                  sizeof (struct GNUNET_CRYPTO_EddsaPrivateKey));
+         &priv_eddsa,
+         sizeof (struct GNUNET_CRYPTO_EddsaPrivateKey));
     d2j (vec, "pub_eddsa",
-                  &pub_eddsa,
-                  sizeof (struct GNUNET_CRYPTO_EddsaPublicKey));
+         &pub_eddsa,
+         sizeof (struct GNUNET_CRYPTO_EddsaPublicKey));
     d2j (vec, "key_material",
-                  &key_material,
-                  sizeof (struct GNUNET_HashCode));
+         &key_material,
+         sizeof (struct GNUNET_HashCode));
   }
 
   {
@@ -968,6 +1022,7 @@ output_vectors ()
     GNUNET_free (blinded_data);
     GNUNET_free (sig_enc_data);
     GNUNET_free (blinded_sig_enc_data);
+    GNUNET_free (secret_enc_data);
   }
 
   json_dumpf (vecfile, stdout, JSON_INDENT (2));
@@ -977,6 +1032,7 @@ output_vectors ()
   return 0;
 }
 
+
 /**
  * Main function that will be run.
  *

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]