minor fixes, test structure

8 files changed, 146 insertions, 75 deletions

diff --git a/src/escrow/escrow_api.c b/src/escrow/escrow_api.c
index 5be53e713..5b57f9244 100644
--- a/src/escrow/escrow_api.c
+++ b/src/escrow/escrow_api.c
@@ -178,7 +178,7 @@ GNUNET_ESCROW_fini (struct GNUNET_ESCROW_Handle *h)
 void
 handle_start_escrow_result (void *cls)
 {
-  struct GNUNET_ESCROW_Plugin_AnchorContinuationWrapper *w = cls;
+  struct ESCROW_Plugin_AnchorContinuationWrapper *w = cls;
   struct GNUNET_ESCROW_Operation *op;
 
   for (op = w->h->op_head; NULL != op; op = op->next)
@@ -206,7 +206,6 @@ handle_start_escrow_result (void *cls)
  * @param ego the identity ego to put in escrow
  * @param method the escrow method to use
  * @param cb function to call with the escrow anchor on completion
- * @param cb_cls closure for @a cb
  * 
  * @return handle to abort the operation
  */
@@ -214,8 +213,7 @@ struct GNUNET_ESCROW_Operation *
 GNUNET_ESCROW_put (struct GNUNET_ESCROW_Handle *h,
                    const struct GNUNET_IDENTITY_Ego *ego,
                    enum GNUNET_ESCROW_Key_Escrow_Method method,
-                   GNUNET_ESCROW_AnchorContinuation cb,
-                   void *cb_cls)
+                   GNUNET_ESCROW_AnchorContinuation cb)
 {
   struct GNUNET_ESCROW_Operation *op;
   const struct GNUNET_ESCROW_KeyPluginFunctions *api;
@@ -224,7 +222,6 @@ GNUNET_ESCROW_put (struct GNUNET_ESCROW_Handle *h,
   op->h = h;
   op->method = method;
   op->cb_put = cb;
-  op->cb_cls = cb_cls;
   GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
 
   api = init_plugin (h, method);
@@ -237,7 +234,7 @@ GNUNET_ESCROW_put (struct GNUNET_ESCROW_Handle *h,
 static void
 handle_restore_key_result (void *cls)
 {
-  struct GNUNET_ESCROW_Plugin_EgoContinuationWrapper *w = cls;
+  struct ESCROW_Plugin_EgoContinuationWrapper *w = cls;
   struct GNUNET_ESCROW_Operation *op;
 
   for (op = w->h->op_head; NULL != op; op = op->next)
@@ -266,7 +263,6 @@ handle_restore_key_result (void *cls)
  * @param egoName the name of the ego to get back
  * @param method the escrow method to use
  * @param cb function to call with the restored ego on completion
- * @param cb_cls closure for @a cb
  * 
  * @return handle to abort the operation
  */
@@ -275,8 +271,7 @@ GNUNET_ESCROW_get (struct GNUNET_ESCROW_Handle *h,
                    struct GNUNET_ESCROW_Anchor *escrowAnchor,
                    char *egoName,
                    enum GNUNET_ESCROW_Key_Escrow_Method method,
-                   GNUNET_ESCROW_EgoContinuation cb,
-                   void *cb_cls)
+                   GNUNET_ESCROW_EgoContinuation cb)
 {
   struct GNUNET_ESCROW_Operation *op;
   const struct GNUNET_ESCROW_KeyPluginFunctions *api;
@@ -285,7 +280,6 @@ GNUNET_ESCROW_get (struct GNUNET_ESCROW_Handle *h,
   op->h = h;
   op->method = method;
   op->cb_get = cb;
-  op->cb_cls = cb_cls;
   GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
 
   api = init_plugin (h, method);
@@ -298,7 +292,7 @@ GNUNET_ESCROW_get (struct GNUNET_ESCROW_Handle *h,
 void
 handle_verify_escrow_result (void *cls)
 {
-  struct GNUNET_ESCROW_Plugin_VerifyContinuationWrapper *w = cls;
+  struct ESCROW_Plugin_VerifyContinuationWrapper *w = cls;
   struct GNUNET_ESCROW_Operation *op;
 
   for (op = w->h->op_head; NULL != op; op = op->next)
@@ -329,7 +323,6 @@ handle_verify_escrow_result (void *cls)
  * @param escrowAnchor the escrow anchor returned by the GNUNET_ESCROW_put method
  * @param method the escrow method to use
  * @param cb function to call with the verification result on completion
- * @param cb_cls closure for @a cb
  * 
  * @return handle to abort the operation
  */
@@ -338,8 +331,7 @@ GNUNET_ESCROW_verify (struct GNUNET_ESCROW_Handle *h,
                       const struct GNUNET_IDENTITY_Ego *ego,
                       struct GNUNET_ESCROW_Anchor *escrowAnchor,
                       enum GNUNET_ESCROW_Key_Escrow_Method method,
-                      GNUNET_ESCROW_VerifyContinuation cb,
-                      void *cb_cls)
+                      GNUNET_ESCROW_VerifyContinuation cb)
 {
   struct GNUNET_ESCROW_Operation *op;
   const struct GNUNET_ESCROW_KeyPluginFunctions *api;
@@ -348,7 +340,6 @@ GNUNET_ESCROW_verify (struct GNUNET_ESCROW_Handle *h,
   op->h = h;
   op->method = method;
   op->cb_verify = cb;
-  op->cb_cls = cb_cls;
   GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
 
   api = init_plugin (h, method);
diff --git a/src/escrow/gnunet-escrow.c b/src/escrow/gnunet-escrow.c
index ce693d47f..268815ce5 100644
--- a/src/escrow/gnunet-escrow.c
+++ b/src/escrow/gnunet-escrow.c
@@ -198,10 +198,10 @@ get_cb (const struct GNUNET_IDENTITY_Ego *ego)
   if (NULL == ego)
   {
     ret = 1;
-    fprintf (stderr, _ ("escrow failed!"));
-    return;
+    fprintf (stderr, _ ("escrow failed!\n"));
   }
-  fprintf (stdout, "Ego %s could successfully be restored!\n", ego->name);
+  else
+    fprintf (stdout, "Ego %s could successfully be restored!\n", ego->name);
   cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
 }
 
@@ -221,8 +221,7 @@ start_process ()
     escrow_op = GNUNET_ESCROW_put (escrow_handle,
                                    ego,
                                    method,
-                                   &put_cb,
-                                   NULL);
+                                   &put_cb);
     return;
   }
   /* verify */
@@ -238,8 +237,7 @@ start_process ()
                                       ego,
                                       anchor,
                                       method,
-                                      &verify_cb,
-                                      NULL);
+                                      &verify_cb);
     return;
   }
   /* get */
@@ -255,8 +253,7 @@ start_process ()
                                    anchor,
                                    get_ego,
                                    method,
-                                   &get_cb,
-                                   NULL);
+                                   &get_cb);
     return;
   }
 }
diff --git a/src/escrow/plugin_escrow_anastasis.c b/src/escrow/plugin_escrow_anastasis.c
index 44fc434ef..165fdda23 100644
--- a/src/escrow/plugin_escrow_anastasis.c
+++ b/src/escrow/plugin_escrow_anastasis.c
@@ -56,9 +56,9 @@ start_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
                             const struct GNUNET_IDENTITY_Ego *ego,
                             GNUNET_SCHEDULER_TaskCallback cb)
 {
-  struct GNUNET_ESCROW_Plugin_AnchorContinuationWrapper *w;
+  struct ESCROW_Plugin_AnchorContinuationWrapper *w;
 
-  w = GNUNET_new (struct GNUNET_ESCROW_Plugin_AnchorContinuationWrapper);
+  w = GNUNET_new (struct ESCROW_Plugin_AnchorContinuationWrapper);
   w->h = h;
 
   // TODO: implement
@@ -84,9 +84,9 @@ verify_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
                              struct GNUNET_ESCROW_Anchor *escrowAnchor,
                              GNUNET_SCHEDULER_TaskCallback cb)
 {
-  struct GNUNET_ESCROW_Plugin_VerifyContinuationWrapper *w;
+  struct ESCROW_Plugin_VerifyContinuationWrapper *w;
 
-  w = GNUNET_new (struct GNUNET_ESCROW_Plugin_VerifyContinuationWrapper);
+  w = GNUNET_new (struct ESCROW_Plugin_VerifyContinuationWrapper);
   w->h = h;
 
   // TODO: implement
@@ -112,9 +112,9 @@ restore_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
                               char *egoName,
                               GNUNET_SCHEDULER_TaskCallback cb)
 {
-  struct GNUNET_ESCROW_Plugin_EgoContinuationWrapper *w;
+  struct ESCROW_Plugin_EgoContinuationWrapper *w;
 
-  w = GNUNET_new (struct GNUNET_ESCROW_Plugin_EgoContinuationWrapper);
+  w = GNUNET_new (struct ESCROW_Plugin_EgoContinuationWrapper);
   w->h = h;
 
   // TODO: implement
diff --git a/src/escrow/plugin_escrow_gns.c b/src/escrow/plugin_escrow_gns.c
index 6e9ea5181..45c16366b 100644
--- a/src/escrow/plugin_escrow_gns.c
+++ b/src/escrow/plugin_escrow_gns.c
@@ -32,9 +32,19 @@
 #include <sss.h>
 #include <inttypes.h>
 
-#define GNUNET_ESCROW_GNS_NumberOfShares 6
-#define GNUNET_ESCROW_GNS_ShareThreshold 3
 
+struct ESCROW_GnsPluginOperation
+{
+  /**
+   * Handle for the escrow component
+   */
+  struct GNUNET_ESCROW_Handle *h;
+
+  /**
+   * Scheduler task the SCHEDULE operation returns (needed for cancellation)
+   */
+  struct GNUNET_SCHEDULER_Task *sched_task;
+};
 
 /**
  * Identity handle
@@ -65,24 +75,57 @@ start_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
   sss_Keyshare keyshares;
   struct GNUNET_ESCROW_Anchor *anchor;
   int anchorDataSize;
-  struct GNUNET_ESCROW_Plugin_AnchorContinuationWrapper *w;
-
-  w = GNUNET_new (struct GNUNET_ESCROW_Plugin_AnchorContinuationWrapper);
+  struct ESCROW_PluginOperationWrapper *plugin_op_wrap;
+  struct ESCROW_GnsPluginOperation *p_op;
+  struct ESCROW_Plugin_AnchorContinuationWrapper *w;
+  unsigned long long shares, share_threshold;
+
+  // create a new GNS plugin operation (in a wrapper) and insert it into the DLL
+  plugin_op_wrap = GNUNET_new (struct ESCROW_PluginOperationWrapper);
+  plugin_op_wrap->plugin_op = GNUNET_new (struct ESCROW_GnsPluginOperation);
+  GNUNET_CONTAINER_DLL_insert_tail (ph.plugin_op_head,
+                                    ph.plugin_op_tail,
+                                    plugin_op_wrap);
+
+  p_op = (struct ESCROW_GnsPluginOperation *)plugin_op_wrap->plugin_op;
+  p_op->h = h;
+
+  w = GNUNET_new (struct ESCROW_Plugin_AnchorContinuationWrapper);
   w->h = h;
 
   if (NULL == ego)
   {
     w->escrowAnchor = NULL;
-    GNUNET_SCHEDULER_add_now (cb, w);
-    return NULL; // TODO!
+    p_op->sched_task = GNUNET_SCHEDULER_add_now (cb, w);
+    return plugin_op_wrap;
   }
   pk = GNUNET_IDENTITY_ego_get_private_key (ego);
 
   // split the private key (SSS)
-  sss_create_keyshares(&keyshares,
-                       pk->d,
-                       GNUNET_ESCROW_GNS_NumberOfShares,
-                       GNUNET_ESCROW_GNS_ShareThreshold);
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (h->cfg,
+                                                          "escrow",
+                                                          "gns_shares",
+                                                          &shares))
+  {
+    fprintf (stderr, "Number of shares not specified in config!");
+    w->escrowAnchor = NULL;
+    p_op->sched_task = GNUNET_SCHEDULER_add_now (cb, w);
+    return plugin_op_wrap;
+  }
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (h->cfg,
+                                                          "escrow",
+                                                          "gns_share_threshold",
+                                                          &share_threshold))
+  {
+    fprintf (stderr, "Share threshold not specified in config");
+    w->escrowAnchor = NULL;
+    p_op->sched_task = GNUNET_SCHEDULER_add_now (cb, w);
+    return plugin_op_wrap;
+  }
+  sss_create_keyshares (&keyshares,
+                        pk->d,
+                        (uint8_t)shares,
+                        (uint8_t)share_threshold);
 
   // create the escrow identities
 
@@ -92,9 +135,11 @@ start_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
   // TODO: implement
   anchorDataSize = 0; // TODO!
   anchor = GNUNET_malloc (sizeof (struct GNUNET_ESCROW_Anchor) + anchorDataSize);
+  
   w->escrowAnchor = anchor;
-  GNUNET_SCHEDULER_add_now (cb, w);
-  return NULL; // TODO!
+
+  p_op->sched_task = GNUNET_SCHEDULER_add_now (cb, w);
+  return plugin_op_wrap;
 }
 
 
@@ -114,15 +159,27 @@ verify_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
                        struct GNUNET_ESCROW_Anchor *escrowAnchor,
                        GNUNET_SCHEDULER_TaskCallback cb)
 {
-  struct GNUNET_ESCROW_Plugin_VerifyContinuationWrapper *w;
+  struct ESCROW_PluginOperationWrapper *plugin_op_wrap;
+  struct ESCROW_GnsPluginOperation *p_op;
+  struct ESCROW_Plugin_VerifyContinuationWrapper *w;
+
+  // create a new GNS plugin operation (in a wrapper) and insert it into the DLL
+  plugin_op_wrap = GNUNET_new (struct ESCROW_PluginOperationWrapper);
+  plugin_op_wrap->plugin_op = GNUNET_new (struct ESCROW_GnsPluginOperation);
+  GNUNET_CONTAINER_DLL_insert_tail (ph.plugin_op_head,
+                                    ph.plugin_op_tail,
+                                    plugin_op_wrap);
+
+  p_op = (struct ESCROW_GnsPluginOperation *)plugin_op_wrap->plugin_op;
+  p_op->h = h;
 
-  w = GNUNET_new (struct GNUNET_ESCROW_Plugin_VerifyContinuationWrapper);
+  w = GNUNET_new (struct ESCROW_Plugin_VerifyContinuationWrapper);
   w->h = h;
 
   // TODO: implement
   w->verificationResult = GNUNET_ESCROW_INVALID;
-  GNUNET_SCHEDULER_add_now (cb, w);
-  return NULL;
+  p_op->sched_task = GNUNET_SCHEDULER_add_now (cb, w);
+  return plugin_op_wrap;
 }
 
 
@@ -142,15 +199,27 @@ restore_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
                         char *egoName,
                         GNUNET_SCHEDULER_TaskCallback cb)
 {
-  struct GNUNET_ESCROW_Plugin_EgoContinuationWrapper *w;
+  struct ESCROW_PluginOperationWrapper *plugin_op_wrap;
+  struct ESCROW_GnsPluginOperation *p_op;
+  struct ESCROW_Plugin_EgoContinuationWrapper *w;
+
+  // create a new GNS plugin operation (in a wrapper) and insert it into the DLL
+  plugin_op_wrap = GNUNET_new (struct ESCROW_PluginOperationWrapper);
+  plugin_op_wrap->plugin_op = GNUNET_new (struct ESCROW_GnsPluginOperation);
+  GNUNET_CONTAINER_DLL_insert_tail (ph.plugin_op_head,
+                                    ph.plugin_op_tail,
+                                    plugin_op_wrap);
 
-  w = GNUNET_new (struct GNUNET_ESCROW_Plugin_EgoContinuationWrapper);
+  p_op = (struct ESCROW_GnsPluginOperation *)plugin_op_wrap->plugin_op;
+  p_op->h = h;
+
+  w = GNUNET_new (struct ESCROW_Plugin_EgoContinuationWrapper);
   w->h = h;
 
   // TODO: implement
   w->ego = NULL;
-  GNUNET_SCHEDULER_add_now (cb, w);
-  return NULL;
+  p_op->sched_task = GNUNET_SCHEDULER_add_now (cb, w);
+  return plugin_op_wrap;
 }
 
 
diff --git a/src/escrow/plugin_escrow_plaintext.c b/src/escrow/plugin_escrow_plaintext.c
index 5267b0916..b6de718e4 100644
--- a/src/escrow/plugin_escrow_plaintext.c
+++ b/src/escrow/plugin_escrow_plaintext.c
@@ -65,7 +65,7 @@ struct ESCROW_PlaintextPluginOperation
   /**
    * Ego continuation wrapper
    */
-  struct GNUNET_ESCROW_Plugin_EgoContinuationWrapper *ego_cont_wrap;
+  struct ESCROW_Plugin_EgoContinuationWrapper *ego_cont_wrap;
 };
 
 /**
@@ -99,7 +99,7 @@ start_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
   uint32_t anchorDataSize;
   struct ESCROW_PluginOperationWrapper *plugin_op_wrap;
   struct ESCROW_PlaintextPluginOperation *p_op;
-  struct GNUNET_ESCROW_Plugin_AnchorContinuationWrapper *w;
+  struct ESCROW_Plugin_AnchorContinuationWrapper *w;
 
   // create a new plaintext plugin operation (in a wrapper) and insert it into the DLL
   plugin_op_wrap = GNUNET_new (struct ESCROW_PluginOperationWrapper);
@@ -111,7 +111,7 @@ start_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
   p_op = (struct ESCROW_PlaintextPluginOperation *)plugin_op_wrap->plugin_op;
   p_op->h = h;
 
-  w = GNUNET_new (struct GNUNET_ESCROW_Plugin_AnchorContinuationWrapper);
+  w = GNUNET_new (struct ESCROW_Plugin_AnchorContinuationWrapper);
   w->h = h;
 
   if (NULL == ego)
@@ -157,7 +157,7 @@ verify_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
   int verificationResult;
   struct ESCROW_PluginOperationWrapper *plugin_op_wrap;
   struct ESCROW_PlaintextPluginOperation *p_op;
-  struct GNUNET_ESCROW_Plugin_VerifyContinuationWrapper *w;
+  struct ESCROW_Plugin_VerifyContinuationWrapper *w;
   
   // create a new plaintext plugin operation (in a wrapper) and insert it into the DLL
   plugin_op_wrap = GNUNET_new (struct ESCROW_PluginOperationWrapper);
@@ -169,7 +169,7 @@ verify_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
   p_op = (struct ESCROW_PlaintextPluginOperation *)plugin_op_wrap->plugin_op;
   p_op->h = h;
 
-  w = GNUNET_new (struct GNUNET_ESCROW_Plugin_VerifyContinuationWrapper);
+  w = GNUNET_new (struct ESCROW_Plugin_VerifyContinuationWrapper);
   w->h = h;
 
   if (NULL == ego)
@@ -282,7 +282,7 @@ restore_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
   struct GNUNET_IDENTITY_Operation *id_op;
   struct ESCROW_PluginOperationWrapper *plugin_op_wrap;
   struct ESCROW_PlaintextPluginOperation *p_op;
-  struct GNUNET_ESCROW_Plugin_EgoContinuationWrapper *w;
+  struct ESCROW_Plugin_EgoContinuationWrapper *w;
 
   // create a new plaintext plugin operation (in a wrapper) and insert it into the DLL
   plugin_op_wrap = GNUNET_new (struct ESCROW_PluginOperationWrapper);
@@ -296,7 +296,7 @@ restore_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
   // set cont here (has to be scheduled from the IDENTITY service when it finished)
   p_op->cont = cb;
 
-  w = GNUNET_new (struct GNUNET_ESCROW_Plugin_EgoContinuationWrapper);
+  w = GNUNET_new (struct ESCROW_Plugin_EgoContinuationWrapper);
   w->h = h;
 
   p_op->ego_cont_wrap = w;
diff --git a/src/escrow/test_escrow.sh b/src/escrow/test_escrow.sh
index e69de29bb..92a1f1492 100644
--- a/src/escrow/test_escrow.sh
+++ b/src/escrow/test_escrow.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+LOCATION=$(which gnunet-config)
+if [ -z $LOCATION ]
+then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version 1> /dev/null
+if test $? != 0
+then
+        echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
+        exit 77
+fi
+
+rm -rf `gnunet-config -c test_escrow.conf -s PATHS -o GNUNET_HOME -f`
+
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
+
+gnunet-arm -s -c test_escrow.conf
+gnunet-identity -C testego -c test_escrow.conf
+ANCHOR=$(gnunet-escrow -m plaintext -P testego -c test_escrow.conf | tail -1)
+gnunet-escrow -m plaintext -V testego -a $ANCHOR -c test_escrow.conf
+gnunet-identity -D testego -c test_escrow.conf
+gnunet-escrow -m plaintext -G testego -a $ANCHOR -c test_escrow.conf
+gnunet-arm -e -c test_escrow.conf
diff --git a/src/include/gnunet_escrow_lib.h b/src/include/gnunet_escrow_lib.h
index 10b7df886..564c457b9 100644
--- a/src/include/gnunet_escrow_lib.h
+++ b/src/include/gnunet_escrow_lib.h
@@ -200,11 +200,6 @@ struct GNUNET_ESCROW_Operation
    * Continuation for a VERIFY operation.
    */
   GNUNET_ESCROW_VerifyContinuation cb_verify;
-
-  /**
-   * Closure for a callback.
-   */
-  void *cb_cls;
 };
 
 
@@ -237,7 +232,6 @@ GNUNET_ESCROW_fini (
  * @param ego the identity ego to put in escrow
  * @param method the escrow method to use
  * @param cb function to call with the escrow anchor on completion
- * @param cb_cls closure for @a cb
  * 
  * @return handle to abort the operation
  */
@@ -246,8 +240,7 @@ GNUNET_ESCROW_put (
   struct GNUNET_ESCROW_Handle *h,
   const struct GNUNET_IDENTITY_Ego *ego,
   enum GNUNET_ESCROW_Key_Escrow_Method method,
-  GNUNET_ESCROW_AnchorContinuation cb,
-  void *cb_cls);
+  GNUNET_ESCROW_AnchorContinuation cb);
 
 
 /**
@@ -258,7 +251,6 @@ GNUNET_ESCROW_put (
  * @param egoName the name of the ego to get back
  * @param method the escrow method to use
  * @param cb function to call with the restored ego on completion
- * @param cb_cls closure for @a cb
  * 
  * @return handle to abort the operation
  */
@@ -268,8 +260,7 @@ GNUNET_ESCROW_get (
   struct GNUNET_ESCROW_Anchor *escrowAnchor,
   char *egoName,
   enum GNUNET_ESCROW_Key_Escrow_Method method,
-  GNUNET_ESCROW_EgoContinuation cb,
-  void *cb_cls);
+  GNUNET_ESCROW_EgoContinuation cb);
 
 
 /**
@@ -280,7 +271,6 @@ GNUNET_ESCROW_get (
  * @param escrowAnchor the escrow anchor returned by the GNUNET_ESCROW_put method
  * @param method the escrow method to use
  * @param cb function to call with the verification result on completion
- * @param cb_cls closure for @a cb
  * 
  * @return handle to abort the operation
  */
@@ -290,8 +280,7 @@ GNUNET_ESCROW_verify (
   const struct GNUNET_IDENTITY_Ego *ego,
   struct GNUNET_ESCROW_Anchor *escrowAnchor,
   enum GNUNET_ESCROW_Key_Escrow_Method method,
-  GNUNET_ESCROW_VerifyContinuation cb,
-  void *cb_cls);
+  GNUNET_ESCROW_VerifyContinuation cb);
 
 
 /**
diff --git a/src/include/gnunet_escrow_plugin.h b/src/include/gnunet_escrow_plugin.h
index 5eba667b4..1e03d96a2 100644
--- a/src/include/gnunet_escrow_plugin.h
+++ b/src/include/gnunet_escrow_plugin.h
@@ -50,7 +50,7 @@ extern "C" {
  * As this type of function is called from the scheduler, which only takes
  * one argument as closure, this struct is used to pass more arguments.
  */
-struct GNUNET_ESCROW_Plugin_AnchorContinuationWrapper
+struct ESCROW_Plugin_AnchorContinuationWrapper
 {
   struct GNUNET_ESCROW_Handle *h;
   struct GNUNET_ESCROW_Anchor *escrowAnchor;
@@ -62,7 +62,7 @@ struct GNUNET_ESCROW_Plugin_AnchorContinuationWrapper
  * As this type of function is called from the scheduler, which only takes
  * one argument as closure, this struct is used to pass more arguments.
  */
-struct GNUNET_ESCROW_Plugin_EgoContinuationWrapper
+struct ESCROW_Plugin_EgoContinuationWrapper
 {
   struct GNUNET_ESCROW_Handle *h;
   const struct GNUNET_IDENTITY_Ego *ego;
@@ -74,7 +74,7 @@ struct GNUNET_ESCROW_Plugin_EgoContinuationWrapper
  * As this type of function is called from the scheduler, which only takes
  * one argument as closure, this struct is used to pass more arguments.
  */
-struct GNUNET_ESCROW_Plugin_VerifyContinuationWrapper
+struct ESCROW_Plugin_VerifyContinuationWrapper
 {
   struct GNUNET_ESCROW_Handle *h;
   int verificationResult;