- fix use of uninitialized memory

[oweals/gnunet.git] / src / dns / plugin_block_dns.c

diff --git a/src/dns/plugin_block_dns.c b/src/dns/plugin_block_dns.c
index de9185a5ab8ade4ed0bf7eac0ffab8e0a7da4a2c..3a38335f0aba785c1642abe8d5d77363e12a1b11 100644 (file)
--- a/src/dns/plugin_block_dns.c
+++ b/src/dns/plugin_block_dns.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet
-     (C) 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -39,6 +39,7 @@
  *
  * @param cls closure
  * @param type block type
+ * @param eo control flags
  * @param query original query (hash)
  * @param bf pointer to bloom filter associated with query; possibly updated (!)
  * @param bf_mutator mutation value for bf
@@ -49,11 +50,15 @@
  * @return characterization of result
  */
 static enum GNUNET_BLOCK_EvaluationResult
-block_plugin_dns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
+block_plugin_dns_evaluate (void *cls,
+                           enum GNUNET_BLOCK_Type type,
+                           enum GNUNET_BLOCK_EvaluationOptions eo,
                            const struct GNUNET_HashCode * query,
                            struct GNUNET_CONTAINER_BloomFilter **bf,
-                           int32_t bf_mutator, const void *xquery,
-                           size_t xquery_size, const void *reply_block,
+                           int32_t bf_mutator,
+                           const void *xquery,
+                           size_t xquery_size,
+                           const void *reply_block,
                            size_t reply_block_size)
 {
   const struct GNUNET_DNS_Advertisement *ad;
@@ -76,7 +81,7 @@ block_plugin_dns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
 
     if (ntohl (ad->purpose.size) !=
         sizeof (struct GNUNET_DNS_Advertisement) -
-        sizeof (struct GNUNET_CRYPTO_EccSignature))
+        sizeof (struct GNUNET_CRYPTO_EddsaSignature))
     {
       GNUNET_break_op (0);
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
@@ -85,14 +90,14 @@ block_plugin_dns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
         GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_ntoh
                                             (ad->expiration_time)).rel_value_us)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "DNS advertisement has expired\n");
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
     }
     if (GNUNET_OK !=
-        GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_DNS_RECORD,
-                                 &ad->purpose, 
-                                 &ad->signature, 
+        GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_DNS_RECORD,
+                                 &ad->purpose,
+                                 &ad->signature,
                                  &ad->peer.public_key))
     {
       GNUNET_break_op (0);
@@ -117,9 +122,9 @@ block_plugin_dns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
  *         (or if extracting a key from a block of this type does not work)
  */
 static int
-block_plugin_dns_get_key (void *cls, 
+block_plugin_dns_get_key (void *cls,
                          enum GNUNET_BLOCK_Type type,
-                          const void *block, 
+                          const void *block,
                          size_t block_size,
                           struct GNUNET_HashCode *key)
 {