1 files changed, 59 insertions, 62 deletions

diff --git a/src/regex/plugin_block_regex.c b/src/regex/plugin_block_regex.c
index 61442ac10..5f23a32df 100644
--- a/src/regex/plugin_block_regex.c
+++ b/src/regex/plugin_block_regex.c
@@ -49,7 +49,6 @@
  *
  * @param ctx block context in which the block group is created
  * @param type type of the block for which we are creating the group
- * @param nonce random value used to seed the group creation
  * @param raw_data optional serialized prior state of the group, NULL if unavailable/fresh
  * @param raw_data_size number of bytes in @a raw_data, 0 if unavailable/fresh
  * @param va variable arguments specific to @a type
@@ -59,7 +58,6 @@
 static struct GNUNET_BLOCK_Group *
 block_plugin_regex_create_group (void *cls,
                                  enum GNUNET_BLOCK_Type type,
-                                 uint32_t nonce,
                                  const void *raw_data,
                                  size_t raw_data_size,
                                  va_list va)
@@ -86,7 +84,6 @@ block_plugin_regex_create_group (void *cls,
                                        bf_size,
                                        BLOOMFILTER_K,
                                        type,
-                                       nonce,
                                        raw_data,
                                        raw_data_size);
 }
@@ -150,9 +147,9 @@ block_plugin_regex_check_query (void *cls,
  */
 static enum GNUNET_GenericReturnValue
 block_plugin_regex_check_block (void *cls,
-                                    enum GNUNET_BLOCK_Type type,
-                                    const void *block,
-                                    size_t block_size)
+                                enum GNUNET_BLOCK_Type type,
+                                const void *block,
+                                size_t block_size)
 {
   switch (type)
   {
@@ -166,37 +163,37 @@ block_plugin_regex_check_block (void *cls,
     return GNUNET_OK;
   case GNUNET_BLOCK_TYPE_REGEX_ACCEPT:
     {
-    const struct RegexAcceptBlock *rba;
-    
-    if (sizeof(struct RegexAcceptBlock) != block_size)
-    {
-      GNUNET_break_op (0);
-      return GNUNET_NO;
-    }
-    rba = block;
-    if (ntohl (rba->purpose.size) !=
-        sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose)
-        + sizeof(struct GNUNET_TIME_AbsoluteNBO)
-        + sizeof(struct GNUNET_HashCode))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_NO;
-    }
-    if (GNUNET_TIME_absolute_is_past (GNUNET_TIME_absolute_ntoh (
-                                                                 rba->expiration_time)))
-    {
-      return GNUNET_NO;
-    }
-    if (GNUNET_OK !=
-        GNUNET_CRYPTO_eddsa_verify_ (GNUNET_SIGNATURE_PURPOSE_REGEX_ACCEPT,
-                                     &rba->purpose,
-                                     &rba->signature,
-                                     &rba->peer.public_key))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_NO;
-    }
-    return GNUNET_OK;
+      const struct RegexAcceptBlock *rba;
+
+      if (sizeof(struct RegexAcceptBlock) != block_size)
+      {
+        GNUNET_break_op (0);
+        return GNUNET_NO;
+      }
+      rba = block;
+      if (ntohl (rba->purpose.size) !=
+          sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose)
+          + sizeof(struct GNUNET_TIME_AbsoluteNBO)
+          + sizeof(struct GNUNET_HashCode))
+      {
+        GNUNET_break_op (0);
+        return GNUNET_NO;
+      }
+      if (GNUNET_TIME_absolute_is_past (GNUNET_TIME_absolute_ntoh (
+                                          rba->expiration_time)))
+      {
+        return GNUNET_NO;
+      }
+      if (GNUNET_OK !=
+          GNUNET_CRYPTO_eddsa_verify_ (GNUNET_SIGNATURE_PURPOSE_REGEX_ACCEPT,
+                                       &rba->purpose,
+                                       &rba->signature,
+                                       &rba->peer.public_key))
+      {
+        GNUNET_break_op (0);
+        return GNUNET_NO;
+      }
+      return GNUNET_OK;
     }
   default:
     GNUNET_break (0);
@@ -223,14 +220,14 @@ block_plugin_regex_check_block (void *cls,
  */
 static enum GNUNET_BLOCK_ReplyEvaluationResult
 block_plugin_regex_check_reply (
-                                void *cls,
-                                enum GNUNET_BLOCK_Type type,
-                                struct GNUNET_BLOCK_Group *group,
-                                const struct GNUNET_HashCode *query,
-                                const void *xquery,
-                                size_t xquery_size,
-                                const void *reply_block,
-                                size_t reply_block_size)
+  void *cls,
+  enum GNUNET_BLOCK_Type type,
+  struct GNUNET_BLOCK_Group *group,
+  const struct GNUNET_HashCode *query,
+  const void *xquery,
+  size_t xquery_size,
+  const void *reply_block,
+  size_t reply_block_size)
 {
   struct GNUNET_HashCode chash;
 
@@ -240,7 +237,7 @@ block_plugin_regex_check_reply (
     if (0 != xquery_size)
     {
       const char *s;
-      
+
       s = (const char *) xquery;
       GNUNET_assert ('\0' == s[xquery_size - 1]);
     }
@@ -267,22 +264,22 @@ block_plugin_regex_check_reply (
     return GNUNET_BLOCK_REPLY_OK_MORE;
   case GNUNET_BLOCK_TYPE_REGEX_ACCEPT:
     {
-    const struct RegexAcceptBlock *rba;
-
-    GNUNET_assert (sizeof(struct RegexAcceptBlock) == reply_block_size);
-    rba = reply_block;
-    GNUNET_assert (ntohl (rba->purpose.size) ==
-        sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose)
-        + sizeof(struct GNUNET_TIME_AbsoluteNBO)
-                   + sizeof(struct GNUNET_HashCode));
-    GNUNET_CRYPTO_hash (reply_block,
-                        reply_block_size,
-                        &chash);
-    if (GNUNET_YES ==
-        GNUNET_BLOCK_GROUP_bf_test_and_set (group,
-                                            &chash))
-      return GNUNET_BLOCK_REPLY_OK_DUPLICATE;
-    return GNUNET_BLOCK_REPLY_OK_MORE;
+      const struct RegexAcceptBlock *rba;
+
+      GNUNET_assert (sizeof(struct RegexAcceptBlock) == reply_block_size);
+      rba = reply_block;
+      GNUNET_assert (ntohl (rba->purpose.size) ==
+                     sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose)
+                     + sizeof(struct GNUNET_TIME_AbsoluteNBO)
+                     + sizeof(struct GNUNET_HashCode));
+      GNUNET_CRYPTO_hash (reply_block,
+                          reply_block_size,
+                          &chash);
+      if (GNUNET_YES ==
+          GNUNET_BLOCK_GROUP_bf_test_and_set (group,
+                                              &chash))
+        return GNUNET_BLOCK_REPLY_OK_DUPLICATE;
+      return GNUNET_BLOCK_REPLY_OK_MORE;
     }
   default:
     GNUNET_break (0);