2 files changed, 30 insertions, 31 deletions

diff --git a/src/block/plugin_block_fs.c b/src/block/plugin_block_fs.c
index f9bf4e36e..28a56526b 100644
--- a/src/block/plugin_block_fs.c
+++ b/src/block/plugin_block_fs.c
@@ -90,18 +90,21 @@ block_plugin_fs_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
     }
     if (reply_block == NULL)
       return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
-    GNUNET_CRYPTO_hash (reply_block, reply_block_size, &chash);
-    GNUNET_BLOCK_mingle_hash (&chash, bf_mutator, &mhash);
-    if (NULL != *bf)
-    {
-      if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test (*bf, &mhash))
-        return GNUNET_BLOCK_EVALUATION_OK_DUPLICATE;
-    }
-    else
-    {
-      *bf = GNUNET_CONTAINER_bloomfilter_init (NULL, 8, BLOOMFILTER_K);
-    }
-    GNUNET_CONTAINER_bloomfilter_add (*bf, &mhash);
+    if (NULL != bf)
+      {
+        GNUNET_CRYPTO_hash (reply_block, reply_block_size, &chash);
+        GNUNET_BLOCK_mingle_hash (&chash, bf_mutator, &mhash);
+        if (NULL != *bf)
+          {
+            if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test (*bf, &mhash))
+              return GNUNET_BLOCK_EVALUATION_OK_DUPLICATE;
+          }
+        else
+          {
+            *bf = GNUNET_CONTAINER_bloomfilter_init (NULL, 8, BLOOMFILTER_K);
+          }
+        GNUNET_CONTAINER_bloomfilter_add (*bf, &mhash);
+      }
     return GNUNET_BLOCK_EVALUATION_OK_MORE;
   case GNUNET_BLOCK_TYPE_FS_SBLOCK:
     if (xquery_size != sizeof (GNUNET_HashCode))
@@ -128,18 +131,21 @@ block_plugin_fs_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
                        ("Reply mismatched in terms of namespace.  Discarded.\n"));
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
     }
-    GNUNET_CRYPTO_hash (reply_block, reply_block_size, &chash);
-    GNUNET_BLOCK_mingle_hash (&chash, bf_mutator, &mhash);
-    if (NULL != *bf)
-    {
-      if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test (*bf, &mhash))
-        return GNUNET_BLOCK_EVALUATION_OK_DUPLICATE;
-    }
-    else
-    {
-      *bf = GNUNET_CONTAINER_bloomfilter_init (NULL, 8, BLOOMFILTER_K);
-    }
-    GNUNET_CONTAINER_bloomfilter_add (*bf, &mhash);
+    if (NULL != bf)
+      {
+        GNUNET_CRYPTO_hash (reply_block, reply_block_size, &chash);
+        GNUNET_BLOCK_mingle_hash (&chash, bf_mutator, &mhash);
+        if (NULL != *bf)
+          {
+            if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test (*bf, &mhash))
+              return GNUNET_BLOCK_EVALUATION_OK_DUPLICATE;
+          }
+        else
+          {
+            *bf = GNUNET_CONTAINER_bloomfilter_init (NULL, 8, BLOOMFILTER_K);
+          }
+        GNUNET_CONTAINER_bloomfilter_add (*bf, &mhash);
+      }
     return GNUNET_BLOCK_EVALUATION_OK_MORE;
   default:
     return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index a362e5b77..8e7a59c8b 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -90,13 +90,6 @@ enum GNUNET_BLOCK_Type
      */
   GNUNET_BLOCK_TYPE_TEST = 8,
 
-#if HAVE_MALICIOUS
-    /**
-     * Block for simulating malicious peers.
-     */
-  GNUNET_BLOCK_DHT_MALICIOUS_MESSAGE_TYPE = 9,
-#endif
-
     /**
      * Block for storing .gnunet-domains
      */