1 files changed, 157 insertions, 85 deletions

diff --git a/src/revocation/plugin_block_revocation.c b/src/revocation/plugin_block_revocation.c
index da5882d59..3beae60bb 100644
--- a/src/revocation/plugin_block_revocation.c
+++ b/src/revocation/plugin_block_revocation.c
@@ -34,19 +34,6 @@
 #define DEBUG_REVOCATION GNUNET_EXTRA_LOGGING
 
 /**
- * Number of bits we set per entry in the bloomfilter.
- * Do not change!
- */
-#define BLOOMFILTER_K 16
-
-
-/**
- * How big is the BF we use for DHT blocks?
- */
-#define REVOCATION_BF_SIZE 8
-
-
-/**
  * Context used inside the plugin.
  */
 struct InternalContext
@@ -57,54 +44,6 @@ struct InternalContext
 
 
 /**
- * Create a new block group.
- *
- * @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
- * @return block group handle, NULL if block groups are not supported
- *         by this @a type of block (this is not an error)
- */
-static struct GNUNET_BLOCK_Group *
-block_plugin_revocation_create_group (void *cls,
-                                      enum GNUNET_BLOCK_Type type,
-                                      uint32_t nonce,
-                                      const void *raw_data,
-                                      size_t raw_data_size,
-                                      va_list va)
-{
-  unsigned int bf_size;
-  const char *guard;
-
-  guard = va_arg (va, const char *);
-  if (0 == strcmp (guard,
-                   "seen-set-size"))
-    bf_size = GNUNET_BLOCK_GROUP_compute_bloomfilter_size (va_arg (va, unsigned
-                                                                   int),
-                                                           BLOOMFILTER_K);
-  else if (0 == strcmp (guard,
-                        "filter-size"))
-    bf_size = va_arg (va, unsigned int);
-  else
-  {
-    GNUNET_break (0);
-    bf_size = REVOCATION_BF_SIZE;
-  }
-  GNUNET_break (NULL == va_arg (va, const char *));
-  return GNUNET_BLOCK_GROUP_bf_create (cls,
-                                       bf_size,
-                                       BLOOMFILTER_K,
-                                       type,
-                                       nonce,
-                                       raw_data,
-                                       raw_data_size);
-}
-
-
-/**
  * Function called to validate a reply or a request.  For
  * request evaluation, simply pass "NULL" for the reply_block.
  *
@@ -133,7 +72,6 @@ block_plugin_revocation_evaluate (void *cls,
                                   size_t reply_block_size)
 {
   struct InternalContext *ic = cls;
-  struct GNUNET_HashCode chash;
   ssize_t pklen;
   const struct RevokeMessage *rm = reply_block;
 
@@ -160,14 +98,134 @@ block_plugin_revocation_evaluate (void *cls,
     GNUNET_break_op (0);
     return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
   }
-  GNUNET_CRYPTO_hash (pk,
-                      pklen,
-                      &chash);
-  if (GNUNET_YES ==
-      GNUNET_BLOCK_GROUP_bf_test_and_set (group,
-                                          &chash))
-    return GNUNET_BLOCK_EVALUATION_OK_DUPLICATE;
-  return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
+  return GNUNET_BLOCK_EVALUATION_OK_LAST;
+}
+
+
+/**
+ * Function called to validate a query.
+ *
+ * @param cls closure
+ * @param ctx block context
+ * @param type block type
+ * @param query original query (hash)
+ * @param xquery extrended query data (can be NULL, depending on type)
+ * @param xquery_size number of bytes in @a xquery
+ * @return #GNUNET_OK if the query is fine, #GNUNET_NO if not
+ */
+static enum GNUNET_GenericReturnValue
+block_plugin_revocation_check_query (void *cls,
+                                    enum GNUNET_BLOCK_Type type,
+                                    const struct GNUNET_HashCode *query,
+                                    const void *xquery,
+                                    size_t xquery_size)
+{
+  (void) cls;
+  (void) query;
+  (void) xquery;
+  if (GNUNET_BLOCK_TYPE_REVOCATION != type)
+    return GNUNET_SYSERR;
+  if (0 != xquery_size)
+    return GNUNET_NO;
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called to validate a block for storage.
+ *
+ * @param cls closure
+ * @param type block type
+ * @param query key for the block (hash), must match exactly
+ * @param block block data to validate
+ * @param block_size number of bytes in @a block
+ * @return #GNUNET_OK if the block is fine, #GNUNET_NO if not
+ */
+static enum GNUNET_GenericReturnValue
+block_plugin_revocation_check_block (void *cls,
+                                    enum GNUNET_BLOCK_Type type,
+                                    const struct GNUNET_HashCode *query,
+                                    const void *block,
+                                    size_t block_size)
+{
+  struct InternalContext *ic = cls;
+  const struct RevokeMessage *rm = block;
+  const struct GNUNET_REVOCATION_PowP *pow
+    = (const struct GNUNET_REVOCATION_PowP *) &rm[1];
+  struct GNUNET_IDENTITY_PublicKey pk;
+  ssize_t pklen;
+  size_t left;
+
+  if (GNUNET_BLOCK_TYPE_REVOCATION != type)
+    return GNUNET_SYSERR;
+  if (block_size < sizeof(*rm) + sizeof(*pow))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_NO;
+  }
+  if (block_size != sizeof(*rm) + ntohl (rm->pow_size))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_NO;
+  }
+  left = block_size - sizeof (*rm) - sizeof (*pow);
+  pklen = GNUNET_IDENTITY_read_key_from_buffer (&pk,
+                                                &pow[1],
+                                                left);
+  if (0 > pklen)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_NO;
+  }
+  if (GNUNET_YES !=
+      GNUNET_REVOCATION_check_pow (pow,
+                                   ic->matching_bits,
+                                   ic->epoch_duration))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_NO;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called to validate a reply to a request.  Note that it is assumed
+ * that the reply has already been matched to the key (and signatures checked)
+ * as it would be done with the GetKeyFunction and the
+ * BlockEvaluationFunction.
+ *
+ * @param cls closure
+ * @param type block type
+ * @param group which block group to use for evaluation
+ * @param query original query (hash)
+ * @param xquery extrended query data (can be NULL, depending on type)
+ * @param xquery_size number of bytes in @a xquery
+ * @param reply_block response to validate
+ * @param reply_block_size number of bytes in @a reply_block
+ * @return characterization of result
+ */
+static enum GNUNET_BLOCK_ReplyEvaluationResult
+block_plugin_revocation_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;
+  (void) group;
+  (void) query;
+  (void) xquery;
+  (void) xquery_size;
+  (void) reply_block;
+  (void) reply_block_size;
+  if (GNUNET_BLOCK_TYPE_REVOCATION != type)
+    return GNUNET_BLOCK_REPLY_TYPE_NOT_SUPPORTED;
+  return GNUNET_BLOCK_REPLY_OK_LAST;
 }
 
 
@@ -182,7 +240,7 @@ block_plugin_revocation_evaluate (void *cls,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR if type not supported
  *         (or if extracting a key from a block of this type does not work)
  */
-static int
+static enum GNUNET_GenericReturnValue
 block_plugin_revocation_get_key (void *cls,
                                  enum GNUNET_BLOCK_Type type,
                                  const void *block,
@@ -190,24 +248,35 @@ block_plugin_revocation_get_key (void *cls,
                                  struct GNUNET_HashCode *key)
 {
   const struct RevokeMessage *rm = block;
-  ssize_t ksize;
+  const struct GNUNET_REVOCATION_PowP *pow
+    = (const struct GNUNET_REVOCATION_PowP *) &rm[1];
+  struct GNUNET_IDENTITY_PublicKey pk;
+  ssize_t pklen;
+  size_t left;
 
-  if (block_size <= sizeof(*rm))
+  if (GNUNET_BLOCK_TYPE_REVOCATION != type)
+    return GNUNET_SYSERR;
+  if (block_size < sizeof(*rm) + sizeof(*pow))
   {
     GNUNET_break_op (0);
-    return GNUNET_SYSERR;
+    return GNUNET_NO;
   }
-  struct GNUNET_REVOCATION_PowP *pow = (struct GNUNET_REVOCATION_PowP *) &rm[1];
-  const struct GNUNET_IDENTITY_PublicKey *pk;
-  pk = (const struct GNUNET_IDENTITY_PublicKey *) &pow[1];
-  ksize = GNUNET_IDENTITY_key_get_length (pk);
-  if (0 > ksize)
+  if (block_size != sizeof(*rm) + ntohl (rm->pow_size))
   {
     GNUNET_break_op (0);
-    return GNUNET_SYSERR;
+    return GNUNET_NO;
   }
-  GNUNET_CRYPTO_hash (pk,
-                      ksize,
+  left = block_size - sizeof (*rm) - sizeof (*pow);
+  pklen = GNUNET_IDENTITY_read_key_from_buffer (&pk,
+                                                &pow[1],
+                                                left);
+  if (0 > pklen)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_NO;
+  }
+  GNUNET_CRYPTO_hash (&pow[1],
+                      pklen,
                       key);
   return GNUNET_OK;
 }
@@ -221,8 +290,8 @@ block_plugin_revocation_get_key (void *cls,
 void *
 libgnunet_plugin_block_revocation_init (void *cls)
 {
-  static enum GNUNET_BLOCK_Type types[] = {
-    GNUNET_BLOCK_TYPE_REVOCATION,
+  static const enum GNUNET_BLOCK_Type types[] = {
+                                                 GNUNET_BLOCK_TYPE_REVOCATION,
     GNUNET_BLOCK_TYPE_ANY       /* end of list */
   };
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
@@ -247,7 +316,10 @@ libgnunet_plugin_block_revocation_init (void *cls)
   api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions);
   api->evaluate = &block_plugin_revocation_evaluate;
   api->get_key = &block_plugin_revocation_get_key;
-  api->create_group = &block_plugin_revocation_create_group;
+  api->check_query = &block_plugin_revocation_check_query;
+  api->check_block = &block_plugin_revocation_check_block;
+  api->check_reply = &block_plugin_revocation_check_reply;
+  api->create_group = NULL;
   api->types = types;
   ic = GNUNET_new (struct InternalContext);
   ic->matching_bits = (unsigned int) matching_bits;