4 files changed, 17 insertions, 7 deletions

diff --git a/src/gns/gnunet-gns-benchmark.c b/src/gns/gnunet-gns-benchmark.c
index 414c84495..dd393972a 100644
--- a/src/gns/gnunet-gns-benchmark.c
+++ b/src/gns/gnunet-gns-benchmark.c
@@ -181,6 +181,10 @@ static struct GNUNET_TIME_Relative timeout;
  */
 static unsigned int active_cnt;
 
+/**
+ * Look for GNS2DNS records specifically?
+ */
+static int g2d;
 
 /**
  * Free @a req and data structures reachable from it.
@@ -294,7 +298,9 @@ process_queue (void *cls)
               active_cnt);
   req->lr = GNUNET_GNS_lookup_with_tld (gns,
                                         req->hostname,
-                                        GNUNET_GNSRECORD_TYPE_GNS2DNS,
+                                        g2d
+                                        ? GNUNET_GNSRECORD_TYPE_GNS2DNS
+                                        : GNUNET_GNSRECORD_TYPE_ANY,
                                         GNUNET_GNS_LO_DEFAULT,
                                         &process_result,
                                         req);
@@ -580,6 +586,10 @@ main (int argc,
                                         "RELATIVETIME",
                                         gettext_noop ("how long to wait for an answer"),
                                         &timeout),
+    GNUNET_GETOPT_option_flag ('2',
+                               "g2d",
+                               gettext_noop ("look for GNS2DNS records instead of ANY"),
+                               &g2d),
     GNUNET_GETOPT_OPTION_END
   };
 
diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index 1abf0fddc..200371cd7 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -1275,6 +1275,7 @@ eddsa_d_to_a (gcry_mpi_t d)
 
   /* Note that we clear DIGEST so we can use it as input to left pad
      the key with zeroes for hashing.  */
+  memset (digest, 0, sizeof digest);
   memset (hvec, 0, sizeof hvec);
   rawmpilen = sizeof (rawmpi);
   GNUNET_assert (0 ==
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index a985d8e59..bbd6c95ea 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -94,7 +94,6 @@ key_from_sexp (gcry_mpi_t *array,
   gcry_sexp_t list;
   gcry_sexp_t l2;
   const char *s;
-  unsigned int i;
   unsigned int idx;
 
   if (! (list = gcry_sexp_find_token (sexp, topname, 0)))
@@ -109,7 +108,7 @@ key_from_sexp (gcry_mpi_t *array,
   {
     if (! (l2 = gcry_sexp_find_token (list, s, 1)))
     {
-      for (i = 0; i < idx; i++)
+      for (unsigned int i = 0; i < idx; i++)
       {
         gcry_free (array[i]);
         array[i] = NULL;
@@ -121,7 +120,7 @@ key_from_sexp (gcry_mpi_t *array,
     gcry_sexp_release (l2);
     if (! array[idx])
     {
-      for (i = 0; i < idx; i++)
+      for (unsigned int i = 0; i < idx; i++)
       {
         gcry_free (array[i]);
         array[i] = NULL;
@@ -720,7 +719,7 @@ rsa_full_domain_hash (const struct GNUNET_CRYPTO_RsaPublicKey *pkey,
  * @param pkey the public key of the signer
  * @param[out] buf set to a buffer with the blinded message to be signed
  * @param[out] buf_size number of bytes stored in @a buf
- * @return GNUNET_YES if successful, GNUNET_NO if RSA key is malicious
+ * @return #GNUNET_YES if successful, #GNUNET_NO if RSA key is malicious
  */
 int
 GNUNET_CRYPTO_rsa_blind (const struct GNUNET_HashCode *hash,
diff --git a/src/util/test_crypto_ecdh_eddsa.c b/src/util/test_crypto_ecdh_eddsa.c
index 356c64bf1..dba28e90a 100644
--- a/src/util/test_crypto_ecdh_eddsa.c
+++ b/src/util/test_crypto_ecdh_eddsa.c
@@ -42,7 +42,7 @@ test_ecdh()
   priv_dsa = GNUNET_CRYPTO_eddsa_key_create ();
   GNUNET_CRYPTO_eddsa_key_get_public (priv_dsa,
                                       &id1);
-  for (unsigned int j=0;j<10;j++)
+  for (unsigned int j=0;j<4;j++)
   {
     fprintf (stderr, ",");
     priv_ecdh = GNUNET_CRYPTO_ecdhe_key_create ();
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
   if (getenv ("GNUNET_GCRYPT_DEBUG"))
     gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1u, 0);
   GNUNET_log_setup ("test-crypto-ecdh-eddsa", "WARNING", NULL);
-  for (unsigned int i=0;i<100;i++)
+  for (unsigned int i=0;i<4;i++)
   {
     fprintf (stderr,
              ".");