pass only ESCROW_Operation to the plugins

7 files changed, 256 insertions, 158 deletions

diff --git a/src/escrow/Makefile.am b/src/escrow/Makefile.am
index 78acfbb16..2f3ada944 100644
--- a/src/escrow/Makefile.am
+++ b/src/escrow/Makefile.am
@@ -1,7 +1,7 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
- plugindir = $(libdir)/gnunet
+plugindir = $(libdir)/gnunet
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
@@ -46,9 +46,10 @@ libgnunet_plugin_escrow_plaintext_la_SOURCES = \
   escrow_plugin_helper.c \
   escrow_plugin_helper.h
 libgnunet_plugin_escrow_plaintext_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetescrow.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(LTLIBINTL)
+  $(LTLIBINTL) $(MHD_LIBS)
 libgnunet_plugin_escrow_plaintext_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
@@ -57,10 +58,11 @@ libgnunet_plugin_escrow_gns_la_SOURCES = \
   escrow_plugin_helper.c \
   escrow_plugin_helper.h
 libgnunet_plugin_escrow_gns_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetescrow.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   -lsss \
-  $(LTLIBINTL)
+  $(LTLIBINTL) $(MHD_LIBS)
 libgnunet_plugin_escrow_gns_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
@@ -69,9 +71,10 @@ libgnunet_plugin_escrow_anastasis_la_SOURCES = \
   escrow_plugin_helper.c \
   escrow_plugin_helper.h
 libgnunet_plugin_escrow_anastasis_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetescrow.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(LTLIBINTL)
+  $(LTLIBINTL) $(MHD_LIBS)
 libgnunet_plugin_escrow_anastasis_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
@@ -79,9 +82,9 @@ libgnunet_plugin_escrow_anastasis_la_LDFLAGS = \
 gnunet_escrow_SOURCES = \
  gnunet-escrow.c
 gnunet_escrow_LDADD = \
+  libgnunetescrow.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  libgnunetescrow.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(GN_LIBINTL)
 
diff --git a/src/escrow/escrow_api.c b/src/escrow/escrow_api.c
index 1706d2a5a..ccd314db1 100644
--- a/src/escrow/escrow_api.c
+++ b/src/escrow/escrow_api.c
@@ -197,9 +197,10 @@ GNUNET_ESCROW_put (struct GNUNET_ESCROW_Handle *h,
   op = GNUNET_new (struct GNUNET_ESCROW_Operation);
   op->h = h;
   op->cb_put = cb;
+  op->cb_cls = cb_cls;
 
   api = init_plugin (h, method);
-  api->start_key_escrow (h, ego, cb, cb_cls);
+  api->start_key_escrow (op, ego);
 
   return op;
 }
@@ -231,7 +232,7 @@ GNUNET_ESCROW_renew (struct GNUNET_ESCROW_Handle *h,
   op->cb_renew = cb;
 
   api = init_plugin (h, method);
-  api->renew_key_escrow (h, escrowAnchor, cb, cb_cls);
+  api->renew_key_escrow (op, escrowAnchor);
   
   return op;
 }
@@ -265,7 +266,7 @@ GNUNET_ESCROW_get (struct GNUNET_ESCROW_Handle *h,
   op->cb_get = cb;
 
   api = init_plugin (h, method);
-  api->restore_key (h, escrowAnchor, egoName, cb, cb_cls);
+  api->restore_key (op, escrowAnchor, egoName);
 
   return op;
 }
@@ -299,7 +300,7 @@ GNUNET_ESCROW_verify (struct GNUNET_ESCROW_Handle *h,
   op->cb_verify = cb;
 
   api = init_plugin (h, method);
-  api->verify_key_escrow (h, ego, escrowAnchor, cb, cb_cls);
+  api->verify_key_escrow (op, ego, escrowAnchor);
 
   return op;
 }
@@ -323,5 +324,29 @@ GNUNET_ESCROW_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
   struct GNUNET_ESCROW_KeyPluginFunctions *api;
 
   api = init_plugin (h, method);
-  return api->anchor_string_to_data (anchorString);
+  return api->anchor_string_to_data (h, anchorString);
 }
+
+
+/**
+ * Serialize an escrow anchor (struct GNUNET_ESCROW_Anchor) into a string
+ * 
+ * @param h the handle for the escrow component
+ * @param escrowAnchor the escrow anchor struct
+ * @param method the escrow method to use
+ * 
+ * @return the encoded escrow anchor string
+ */
+char *
+GNUNET_ESCROW_anchor_data_to_string (struct GNUNET_ESCROW_Handle *h,
+                                     struct GNUNET_ESCROW_Anchor *escrowAnchor,
+                                     enum GNUNET_ESCROW_Key_Escrow_Method method)
+{
+  struct GNUNET_ESCROW_KeyPluginFunctions *api;
+
+  api = init_plugin (h, method);
+  return api->anchor_data_to_string (h, escrowAnchor);
+}
+
+
+/* end of escrow_api.c */
diff --git a/src/escrow/escrow_plugin_helper.c b/src/escrow/escrow_plugin_helper.c
index ba177b252..05c5be90b 100644
--- a/src/escrow/escrow_plugin_helper.c
+++ b/src/escrow/escrow_plugin_helper.c
@@ -71,14 +71,14 @@ ESCROW_list_ego (void *cls,
                  void **ctx,
                  const char *identifier)
 {
+  struct EscrowPluginHandle *ph = cls;
   struct EgoEntry *ego_entry;
   struct GNUNET_CRYPTO_EcdsaPublicKey pk;
-  struct EscrowPluginHandle *ph = cls;
 
   if ((NULL == ego) && (ESCROW_PLUGIN_STATE_INIT == ph->state))
   {
     ph->state = ESCROW_PLUGIN_STATE_POST_INIT;
-    /* call ContinueIdentityInitFunction */
+    /* call IdentityInitContinuation */
     ph->cont ();
     return;
   }
diff --git a/src/escrow/gnunet-escrow.c b/src/escrow/gnunet-escrow.c
index c1d43b80e..1651d96ed 100644
--- a/src/escrow/gnunet-escrow.c
+++ b/src/escrow/gnunet-escrow.c
@@ -28,6 +28,7 @@
 
 #include "gnunet_util_lib.h"
 #include "gnunet_escrow_lib.h"
+#include "../identity/identity.h"
 
 /**
  * return value
@@ -145,10 +146,14 @@ static void
 put_cb (void *cls,
         struct GNUNET_ESCROW_Anchor *escrowAnchor)
 {
-  struct GNUNET_ESCROW_Operation *op = cls;
+  char *anchorString;
 
-  // TODO: implement
-  return;
+  anchorString = GNUNET_ESCROW_anchor_data_to_string (escrow_handle,
+                                                      escrowAnchor,
+                                                      method);
+
+  fprintf (stdout, "Escrow finished! Please keep the following anchor \
+           in order to restore the key later!\n%s\n", anchorString);
 }
 
 
@@ -156,10 +161,20 @@ static void
 verify_cb (void *cls,
            int verificationResult)
 {
-  struct GNUNET_ESCROW_Operation *op = cls;
-
-  // TODO: implement
-  return;
+  switch (verificationResult)
+  {
+    case GNUNET_ESCROW_VALID:
+      fprintf (stdout, "Escrow is valid!\n");
+      break;
+    case GNUNET_ESCROW_INVALID:
+      fprintf (stdout, "Escrow is INvalid! Please perform a new escrow.\n");
+      break;
+    case GNUNET_ESCROW_RENEW_NEEDED:
+      fprintf (stdout, "Escrow needs a renew!\n");
+      break;
+    default:
+      fprintf (stderr, "invalid verificationResult!\n");
+  }
 }
 
 
@@ -167,10 +182,13 @@ static void
 get_cb (void *cls,
         const struct GNUNET_IDENTITY_Ego *ego)
 {
-  struct GNUNET_ESCROW_Operation *op = cls;
-
-  // TODO: implement
-  return;
+  if (NULL == ego)
+  {
+    ret = 1;
+    fprintf (stderr, _ ("escrow failed!"));
+    return;
+  }
+  fprintf (stdout, "Ego %s could successfully be restored!", ego->name);
 }
 
 
@@ -190,7 +208,7 @@ start_process ()
                                    ego,
                                    method,
                                    &put_cb,
-                                   escrow_op);
+                                   NULL);
     return;
   }
   /* verify */
@@ -207,7 +225,7 @@ start_process ()
                                       anchor,
                                       method,
                                       &verify_cb,
-                                      escrow_op);
+                                      NULL);
     return;
   }
   /* get */
@@ -224,7 +242,7 @@ start_process ()
                                    get_ego,
                                    method,
                                    &get_cb,
-                                   escrow_op);
+                                   NULL);
     return;
   }
 }
@@ -309,11 +327,11 @@ run (void *cls,
   }
 
   /* determine method */
-  if (strncmp (plaintext_string, method_name, strlen (plaintext_string)))
+  if (!strncmp (plaintext_string, method_name, strlen (plaintext_string)))
     method = GNUNET_ESCROW_KEY_PLAINTEXT;
-  else if (strncmp (gns_string, method_name, strlen (gns_string)))
+  else if (!strncmp (gns_string, method_name, strlen (gns_string)))
     method = GNUNET_ESCROW_KEY_GNS;
-  else if (strncmp (anastasis_string, method_name, strlen (anastasis_string)))
+  else if (!strncmp (anastasis_string, method_name, strlen (anastasis_string)))
     method = GNUNET_ESCROW_KEY_ANASTASIS;
   else
   {
diff --git a/src/escrow/plugin_escrow_anastasis.c b/src/escrow/plugin_escrow_anastasis.c
index 9543f3cef..c4b4ce1ef 100644
--- a/src/escrow/plugin_escrow_anastasis.c
+++ b/src/escrow/plugin_escrow_anastasis.c
@@ -45,83 +45,64 @@ struct EscrowPluginHandle ph;
 /**
  * Start the Anastasis escrow of the key
  * 
- * @param h the handle for the escrow component
+ * @param op the escrow operation
  * @param ego the identity ego containing the private key
- * @param cb function to call with the escrow anchor on completion
- * @param cb_cls closure for @a cb
  */
 void
-start_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
-                            const struct GNUNET_IDENTITY_Ego *ego,
-                            GNUNET_ESCROW_AnchorContinuation cb,
-                            void *cb_cls)
+start_anastasis_key_escrow (struct GNUNET_ESCROW_Operation *op,
+                            const struct GNUNET_IDENTITY_Ego *ego)
 {
   // TODO: implement
-  cb (cb_cls, NULL);
+  op->cb_put (op->cb_cls, NULL);
 }
 
 
 /**
  * Renew the Anastasis escrow of the key
  * 
- * @param h the handle for the escrow component
+ * @param op the escrow operation
  * @param escrowAnchor the the escrow anchor returned by the start method
- * @param cb function to call with the (new) escrow anchor on completion
- * @param cb_cls closure for @a cb
  */
 void
-renew_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
-                            struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                            GNUNET_ESCROW_AnchorContinuation cb,
-                            void *cb_cls)
+renew_anastasis_key_escrow (struct GNUNET_ESCROW_Operation *op,
+                            struct GNUNET_ESCROW_Anchor *escrowAnchor)
 {
   // TODO: implement
-  cb (cb_cls, NULL);
+  op->cb_renew (op->cb_cls, NULL);
 }
 
 
 /**
  * Verify the Anastasis escrow of the key
  * 
- * @param h the handle for the escrow component
+ * @param op the escrow operation
  * @param ego the identity ego containing the private key
  * @param escrowAnchor the escrow anchor needed to restore the key
- * @param cb function to call with the verification result on completion, i.e.
- *  GNUNET_ESCROW_VALID if the escrow could successfully by restored,
- *  GNUNET_ESCROW_RENEW_NEEDED if the escrow needs to be renewed,
- *  GNUNET_ESCROW_INVALID otherwise
- * @param cb_cls closure for @a cb
  */
 void
-verify_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
+verify_anastasis_key_escrow (struct GNUNET_ESCROW_Operation *op,
                              const struct GNUNET_IDENTITY_Ego *ego,
-                             struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                             GNUNET_ESCROW_VerifyContinuation cb,
-                             void *cb_cls)
+                             struct GNUNET_ESCROW_Anchor *escrowAnchor)
 {
   // TODO: implement
-  cb (cb_cls, GNUNET_ESCROW_INVALID);
+  op->cb_verify (op->cb_cls, GNUNET_ESCROW_INVALID);
 }
 
 
 /**
  * Restore the key from Anastasis escrow
  * 
- * @param h the handle for the escrow component
+ * @param op the escrow operation
  * @param escrowAnchor the escrow anchor needed to restore the key
  * @param egoName the name of the ego to restore
- * @param cb function to call with the restored ego on completion
- * @param cb_cls closure for @a cb
  */
 void
-restore_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
+restore_anastasis_key_escrow (struct GNUNET_ESCROW_Operation *op,
                               struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                              char *egoName,
-                              GNUNET_ESCROW_EgoContinuation cb,
-                              void *cb_cls)
+                              char *egoName)
 {
   // TODO: implement
-  cb (cb_cls, NULL);
+  op->cb_get (op->cb_cls, NULL);
 }
 
 
@@ -129,10 +110,12 @@ restore_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
  * Deserialize an escrow anchor string into a GNUNET_ESCROW_Anchor struct
  * 
  * @param anchorString the encoded escrow anchor string
+ * 
  * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct
  */
 struct GNUNET_ESCROW_Anchor *
-anastasis_anchor_string_to_data (char *anchorString)
+anastasis_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
+                                 char *anchorString)
 {
   struct GNUNET_ESCROW_Anchor *anchor;
   uint32_t data_size;
@@ -149,7 +132,24 @@ anastasis_anchor_string_to_data (char *anchorString)
 
 
 /**
- * ContinueIdentityInitFunction for the Anastasis plugin
+ * Serialize an escrow anchor struct into a string
+ * 
+ * @param h the handle for the escrow component
+ * @param escrowAnchor the escrow anchor struct
+ * 
+ * @return the encoded escrow anchor string
+ */
+char *
+anastasis_anchor_data_to_string (struct GNUNET_ESCROW_Handle *h,
+                                 struct GNUNET_ESCROW_Anchor *escrowAnchor)
+{
+  // TODO: implement
+  return NULL;
+}
+
+
+/**
+ * IdentityInitContinuation for the Anastasis plugin
  */
 void
 anastasis_cont_init ()
@@ -162,6 +162,7 @@ anastasis_cont_init ()
  * Entry point for the plugin.
  *
  * @param cls Config info
+ * 
  * @return the exported block API
  */
 void *
@@ -191,6 +192,7 @@ libgnunet_plugin_escrow_anastasis_init (void *cls)
  * Exit point from the plugin.
  *
  * @param cls the return value from #libgnunet_plugin_block_test_init()
+ * 
  * @return NULL
  */
 void *
diff --git a/src/escrow/plugin_escrow_gns.c b/src/escrow/plugin_escrow_gns.c
index 70f327fb4..f6b2822da 100644
--- a/src/escrow/plugin_escrow_gns.c
+++ b/src/escrow/plugin_escrow_gns.c
@@ -50,16 +50,12 @@ struct EscrowPluginHandle ph;
 /**
  * Start the GNS escrow of the key
  * 
- * @param h the handle for the escrow component
+ * @param op the escrow operation
  * @param ego the identity ego containing the private key
- * @param cb function to call with the escrow anchor on completion
- * @param cb_cls closure for @a cb
  */
 void
-start_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
-                      const struct GNUNET_IDENTITY_Ego *ego,
-                      GNUNET_ESCROW_AnchorContinuation cb,
-                      void *cb_cls)
+start_gns_key_escrow (struct GNUNET_ESCROW_Operation *op,
+                      const struct GNUNET_IDENTITY_Ego *ego)
 {
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk;
   sss_Keyshare keyshares;
@@ -68,7 +64,7 @@ start_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
 
   if (NULL == ego)
   {
-    cb (cb_cls, NULL);
+    op->cb_put (op->cb_cls, NULL);
     return;
   }
   pk = GNUNET_IDENTITY_ego_get_private_key (ego);
@@ -87,71 +83,56 @@ start_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
   // TODO: implement
   anchorDataSize = 0; // TODO!
   anchor = GNUNET_malloc (sizeof (struct GNUNET_ESCROW_Anchor) + anchorDataSize);
-  cb (cb_cls, anchor);
+  op->cb_put (op->cb_cls, anchor);
 }
 
 
 /**
  * Renew the GNS escrow of the key
  * 
- * @param h the handle for the escrow component
+ * @param op the escrow operation
  * @param escrowAnchor the the escrow anchor returned by the start method
- * @param cb function to call with the (new) escrow anchor on completion
- * @param cb_cls closure for @a cb
  */
 void
-renew_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
-                      struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                      GNUNET_ESCROW_AnchorContinuation cb,
-                      void *cb_cls)
+renew_gns_key_escrow (struct GNUNET_ESCROW_Operation *op,
+                      struct GNUNET_ESCROW_Anchor *escrowAnchor)
 {
   // TODO: implement
-  cb (cb_cls, NULL);
+  op->cb_renew (op->cb_cls, NULL);
 }
 
 
 /**
  * Verify the GNS escrow of the key
  * 
- * @param h the handle for the escrow component
+ * @param op the escrow operation
  * @param ego the identity ego containing the private key
  * @param escrowAnchor the escrow anchor needed to restore the key
- * @param cb function to call with the verification result on completion, i.e.
- *  GNUNET_ESCROW_VALID if the escrow could successfully by restored,
- *  GNUNET_ESCROW_RENEW_NEEDED if the escrow needs to be renewed,
- *  GNUNET_ESCROW_INVALID otherwise
- * @param cb_cls closure for @a cb
  */
 void
-verify_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
+verify_gns_key_escrow (struct GNUNET_ESCROW_Operation *op,
                        const struct GNUNET_IDENTITY_Ego *ego,
-                       struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                       GNUNET_ESCROW_VerifyContinuation cb,
-                       void *cb_cls)
+                       struct GNUNET_ESCROW_Anchor *escrowAnchor)
 {
   // TODO: implement
-  cb (cb_cls, GNUNET_ESCROW_INVALID);
+  op->cb_verify (op->cb_cls, GNUNET_ESCROW_INVALID);
 }
 
 
 /**
  * Restore the key from GNS escrow
  * 
- * @param h the handle for the escrow component
+ * @param op the escrow operation
  * @param escrowAnchor the escrow anchor needed to restore the key
  * @param egoName the name of the ego to restore
- * @param cb function to call with the restored ego on completion
- * @param cb_cls closure for @a cb
  */
 void
-restore_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
+restore_gns_key_escrow (struct GNUNET_ESCROW_Operation *op,
                         struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                        char *egoName,
-                        GNUNET_ESCROW_EgoContinuation cb,
-                        void *cb_cls)
+                        char *egoName)
 {
   // TODO: implement
-  cb (cb_cls, NULL);
+  op->cb_get (op->cb_cls, NULL);
 }
 
 
@@ -159,10 +140,12 @@ restore_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
  * Deserialize an escrow anchor string into a GNUNET_ESCROW_Anchor struct
  * 
  * @param anchorString the encoded escrow anchor string
+ * 
  * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct
  */
 struct GNUNET_ESCROW_Anchor *
-gns_anchor_string_to_data (char *anchorString)
+gns_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
+                           char *anchorString)
 {
   struct GNUNET_ESCROW_Anchor *anchor;
   uint32_t data_size;
@@ -179,7 +162,24 @@ gns_anchor_string_to_data (char *anchorString)
 
 
 /**
- * ContinueIdentityInitFunction for the GNS plugin
+ * Serialize an escrow anchor struct into a string
+ * 
+ * @param h the handle for the escrow component
+ * @param escrowAnchor the escrow anchor struct
+ * 
+ * @return the encoded escrow anchor string
+ */
+char *
+gns_anchor_data_to_string (struct GNUNET_ESCROW_Handle *h,
+                           struct GNUNET_ESCROW_Anchor *escrowAnchor)
+{
+  // TODO: implement
+  return NULL;
+}
+
+
+/**
+ * IdentityInitContinuation for the GNS plugin
  */
 void
 gns_cont_init ()
@@ -192,6 +192,7 @@ gns_cont_init ()
  * Entry point for the plugin.
  *
  * @param cls Config info
+ * 
  * @return the exported block API
  */
 void *
@@ -221,6 +222,7 @@ libgnunet_plugin_escrow_gns_init (void *cls)
  * Exit point from the plugin.
  *
  * @param cls the return value from #libgnunet_plugin_block_test_init()
+ * 
  * @return NULL
  */
 void *
diff --git a/src/escrow/plugin_escrow_plaintext.c b/src/escrow/plugin_escrow_plaintext.c
index e1df6bf77..c3680b625 100644
--- a/src/escrow/plugin_escrow_plaintext.c
+++ b/src/escrow/plugin_escrow_plaintext.c
@@ -29,6 +29,7 @@
 #include "gnunet_escrow_plugin.h"
 #include "escrow_plugin_helper.h"
 #include "gnunet_identity_service.h"
+#include "../identity/identity.h"
 #include <inttypes.h>
 
 
@@ -46,16 +47,12 @@ struct EscrowPluginHandle ph;
 /**
  * Start the plaintext escrow of the key, i.e. simply hand out the key
  * 
- * @param h the handle for the escrow component
+ * @param op the escrow operation
  * @param ego the identity ego containing the private key
- * @param cb function to call with the escrow anchor on completion
- * @param cb_cls closure for @a cb
  */
 void
-start_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
-                            const struct GNUNET_IDENTITY_Ego *ego,
-                            GNUNET_ESCROW_AnchorContinuation cb,
-                            void *cb_cls)
+start_plaintext_key_escrow (struct GNUNET_ESCROW_Operation *op,
+                            const struct GNUNET_IDENTITY_Ego *ego)
 {
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk;
   struct GNUNET_ESCROW_Anchor *anchor;
@@ -64,7 +61,7 @@ start_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
 
   if (NULL == ego)
   {
-    cb (cb_cls, NULL);
+    op->cb_put (op->cb_cls, NULL);
     return;
   }
   pk = GNUNET_IDENTITY_ego_get_private_key (ego);
@@ -76,46 +73,35 @@ start_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
   anchor->size = anchorDataSize;
   GNUNET_memcpy (&anchor[1], pkString, anchorDataSize);
 
-  cb (cb_cls, anchor);
+  op->cb_put (op->cb_cls, anchor);
 }
 
 
 /**
  * Renew the plaintext escrow of the key, i.e. simply hand out the key
  * 
- * @param h the handle for the escrow component
+ * @param op the escrow operation
  * @param escrowAnchor the the escrow anchor returned by the start method
- * @param cb function to call with the (new) escrow anchor on completion
- * @param cb_cls closure for @a cb
  */
 void
-renew_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
-                            struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                            GNUNET_ESCROW_AnchorContinuation cb,
-                            void *cb_cls)
+renew_plaintext_key_escrow (struct GNUNET_ESCROW_Operation *op,
+                            struct GNUNET_ESCROW_Anchor *escrowAnchor)
 {
-  cb (cb_cls, escrowAnchor);
+  op->cb_renew (op->cb_cls, escrowAnchor);
 }
 
 
 /**
  * Verify the plaintext escrow of the key
  * 
- * @param h the handle for the escrow component
+ * @param op the escrow operation
  * @param ego the identity ego containing the private key
  * @param escrowAnchor the escrow anchor needed to restore the key
- * @param cb function to call with the verification result on completion, i.e.
- *  GNUNET_ESCROW_VALID if the escrow could successfully by restored,
- *  GNUNET_ESCROW_RENEW_NEEDED if the escrow needs to be renewed,
- *  GNUNET_ESCROW_INVALID otherwise
- * @param cb_cls closure for @a cb
  */
 void
-verify_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
+verify_plaintext_key_escrow (struct GNUNET_ESCROW_Operation *op,
                              const struct GNUNET_IDENTITY_Ego *ego,
-                             struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                             GNUNET_ESCROW_VerifyContinuation cb,
-                             void *cb_cls)
+                             struct GNUNET_ESCROW_Anchor *escrowAnchor)
 {
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk;
   char *pkString;
@@ -123,70 +109,108 @@ verify_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
 
   if (NULL == ego)
   {
-    cb (cb_cls, GNUNET_ESCROW_INVALID);
+    op->cb_verify (op->cb_cls, GNUNET_ESCROW_INVALID);
     return;
   }
   pk = GNUNET_IDENTITY_ego_get_private_key (ego);
   pkString = GNUNET_CRYPTO_ecdsa_private_key_to_string (pk);
   verificationResult = strncmp (pkString,
-                                (char *)escrowAnchor,
+                                (char *)&escrowAnchor[1],
                                 strlen (pkString)) == 0 ?
     GNUNET_ESCROW_VALID : GNUNET_ESCROW_INVALID;
-  cb (cb_cls, verificationResult);
+  op->cb_verify (op->cb_cls, verificationResult);
+}
+
+
+/**
+ * Creation operation finished.
+ *
+ * @param cls pointer to operation handle
+ * @param pk private key of the ego, or NULL on error
+ * @param emsg error message, NULL on success
+ */
+static void
+create_finished (void *cls,
+                 const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk,
+                 const char *emsg)
+{
+  struct GNUNET_ESCROW_Operation *op = cls;
+  struct EgoEntry *ego_list;
+
+  if (NULL == pk)
+  {
+    fprintf (stderr, _ ("Failed to create ego: %s\n"), emsg);
+    return;
+  }
+
+  /* find the ego in our ego list */
+  ego_list = ph.ego_head;
+  while (NULL != ego_list)
+  {
+    if (&ego_list->ego->pk == pk)
+    {
+      /* ego found */
+      op->cb_get (op->cb_cls, ego_list->ego);
+      return;
+    }
+    ego_list = ego_list->next;
+  }
+
+  /* ego not found (should not happen!) */
+  op->cb_get (op->cb_cls, NULL);
 }
 
 
 /**
  * Restore the key from plaintext escrow
  * 
- * @param h the handle for the escrow component
+ * @param op the escrow operation
  * @param escrowAnchor the escrow anchor needed to restore the key
  * @param egoName the name of the ego to restore
- * @param cb function to call with the restored ego on completion
- * @param cb_cls closure for @a cb
  */
 void
-restore_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
+restore_plaintext_key_escrow (struct GNUNET_ESCROW_Operation *op,
                               struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                              char *egoName,
-                              GNUNET_ESCROW_EgoContinuation cb,
-                              void *cb_cls)
+                              char *egoName)
 {
   struct GNUNET_CRYPTO_EcdsaPrivateKey pk;
-  struct GNUNET_IDENTITY_Operation *op;
+  struct GNUNET_IDENTITY_Operation *id_op;
 
   if (NULL == escrowAnchor)
   {
-    cb (cb_cls, NULL);
+    op->cb_get (op->cb_cls, NULL);
     return;
   }
   if (GNUNET_OK !=
-    GNUNET_CRYPTO_ecdsa_private_key_from_string ((char *)escrowAnchor,
-                                                 strlen ((char *)escrowAnchor),
+    GNUNET_CRYPTO_ecdsa_private_key_from_string ((char *)&escrowAnchor[1],
+                                                 strlen ((char *)&escrowAnchor[1]),
                                                  &pk))
   {
-    cb (cb_cls, NULL);
+    op->cb_get (op->cb_cls, NULL);
     return;
   }
   
-  // TODO: implement
-  op = GNUNET_IDENTITY_create (NULL,
-                               egoName,
-                               &pk,
-                               NULL,
-                               NULL);
-  cb (cb_cls, NULL);
+  id_op = GNUNET_IDENTITY_create (identity_handle,
+                                  egoName,
+                                  &pk,
+                                  &create_finished,
+                                  op);
+
+  op->id_op = id_op;
 }
 
 
 /**
  * Deserialize an escrow anchor string into a GNUNET_ESCROW_Anchor struct
  * 
+ * @param h the handle for the escrow component
  * @param anchorString the encoded escrow anchor string
+ * 
  * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct
  */
 struct GNUNET_ESCROW_Anchor *
-plaintext_anchor_string_to_data (char *anchorString)
+plaintext_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
+                                 char *anchorString)
 {
   struct GNUNET_ESCROW_Anchor *anchor;
   uint32_t data_size;
@@ -203,7 +227,28 @@ plaintext_anchor_string_to_data (char *anchorString)
 
 
 /**
- * ContinueIdentityInitFunction for the plaintext plugin
+ * Serialize an escrow anchor struct into a string
+ * 
+ * @param h the handle for the escrow component
+ * @param escrowAnchor the escrow anchor struct
+ * 
+ * @return the encoded escrow anchor string
+ */
+char *
+plaintext_anchor_data_to_string (struct GNUNET_ESCROW_Handle *h,
+                                 struct GNUNET_ESCROW_Anchor *escrowAnchor)
+{
+  char *anchorString;
+
+  anchorString = GNUNET_malloc (escrowAnchor->size);
+  GNUNET_memcpy (anchorString, &escrowAnchor[1], escrowAnchor->size);
+
+  return anchorString;
+}
+
+
+/**
+ * IdentityInitContinuation for the plaintext plugin
  */
 void
 plaintext_cont_init ()
@@ -216,6 +261,7 @@ plaintext_cont_init ()
  * Entry point for the plugin.
  *
  * @param cls Config info
+ * 
  * @return the exported block API
  */
 void *
@@ -230,6 +276,7 @@ libgnunet_plugin_escrow_plaintext_init (void *cls)
   api->verify_key_escrow = &verify_plaintext_key_escrow;
   api->restore_key = &restore_plaintext_key_escrow;
   api->anchor_string_to_data = &plaintext_anchor_string_to_data;
+  api->anchor_data_to_string = &plaintext_anchor_data_to_string;
 
   ph.cont = &plaintext_cont_init;
 
@@ -245,6 +292,7 @@ libgnunet_plugin_escrow_plaintext_init (void *cls)
  * Exit point from the plugin.
  *
  * @param cls the return value from #libgnunet_plugin_block_test_init()
+ * 
  * @return NULL
  */
 void *