9 files changed, 188 insertions, 93 deletions

diff --git a/src/escrow/escrow_api.c b/src/escrow/escrow_api.c
index ddbf6a2b7..e35ba3e9e 100644
--- a/src/escrow/escrow_api.c
+++ b/src/escrow/escrow_api.c
@@ -295,8 +295,7 @@ handle_restore_key_result (void *cls)
  * Get the escrowed data back
  * 
  * @param h the handle for the escrow component
- * @param escrowAnchor the escrow anchor returned by the GNUNET_ESCROW_put method
- * @param egoName the name of the ego to get back
+ * @param anchor the escrow anchor returned by the GNUNET_ESCROW_put method
  * @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
@@ -305,8 +304,7 @@ handle_restore_key_result (void *cls)
  */
 struct GNUNET_ESCROW_Operation *
 GNUNET_ESCROW_get (struct GNUNET_ESCROW_Handle *h,
-                   struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                   const char *egoName,
+                   struct GNUNET_ESCROW_Anchor *anchor,
                    enum GNUNET_ESCROW_Key_Escrow_Method method,
                    GNUNET_ESCROW_EgoContinuation cb,
                    void *cb_cls)
@@ -323,7 +321,7 @@ GNUNET_ESCROW_get (struct GNUNET_ESCROW_Handle *h,
   GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
 
   api = init_plugin (h, method);
-  op->plugin_op_wrap = api->restore_key (h, escrowAnchor, egoName, &handle_restore_key_result, op->id);
+  op->plugin_op_wrap = api->restore_key (h, anchor, &handle_restore_key_result, op->id);
 
   return op;
 }
@@ -420,7 +418,8 @@ GNUNET_ESCROW_get_status (struct GNUNET_ESCROW_Handle *h,
  * @param anchorString the encoded escrow anchor string
  * @param method the escrow method to use
  * 
- * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct
+ * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct,
+ *         NULL if we failed to parse the string
  */
 struct GNUNET_ESCROW_Anchor *
 GNUNET_ESCROW_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
diff --git a/src/escrow/gnunet-escrow.c b/src/escrow/gnunet-escrow.c
index 23fa5d061..b212247e4 100644
--- a/src/escrow/gnunet-escrow.c
+++ b/src/escrow/gnunet-escrow.c
@@ -63,7 +63,7 @@ static char *verify_ego;
 /**
  * -G option
  */
-static char *get_ego;
+static int get_flag;
 
 /**
  * -S option
@@ -172,11 +172,6 @@ do_cleanup (void *cls)
     GNUNET_free (verify_ego);
     verify_ego = NULL;
   }
-  if (NULL != get_ego)
-  {
-    GNUNET_free (get_ego);
-    get_ego = NULL;
-  }
   if (NULL != status_ego)
   {
     GNUNET_free (status_ego);
@@ -313,18 +308,10 @@ start_process ()
     return;
   }
   /* get */
-  if (NULL != get_ego)
+  if (GNUNET_YES == get_flag)
   {
-    if (NULL != ego)
-    {
-      ret = 1;
-      fprintf (stderr, "The name %s is already in use for an ego\n", get_ego);
-      cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
-      return;
-    }
     escrow_op = GNUNET_ESCROW_get (escrow_handle,
                                    anchor,
-                                   get_ego,
                                    method,
                                    &get_cb,
                                    NULL);
@@ -388,7 +375,7 @@ ego_cb (void *cls,
     }
     return;
   }
-  if (0 != strcmp (name, ego_name))
+  if (NULL != ego_name && 0 != strcmp (name, ego_name))
     return;
   ego = e;
 }
@@ -414,7 +401,7 @@ run (void *cls,
 
   if (NULL != put_ego)
   {
-    if (NULL != verify_ego || NULL != get_ego || NULL != status_ego)
+    if (NULL != verify_ego || GNUNET_YES == get_flag || NULL != status_ego)
     {
       ret = 1;
       fprintf (stderr, _ ("-P may only be used without -V, -G or -S!\n"));
@@ -425,7 +412,7 @@ run (void *cls,
   }
   else if (NULL != verify_ego)
   {
-    if (NULL != get_ego || NULL != status_ego)
+    if (GNUNET_YES == get_flag || NULL != status_ego)
     {
       ret = 1;
       fprintf (stderr, _ ("-V may only be used without -P, -G or -S!\n"));
@@ -440,7 +427,7 @@ run (void *cls,
     }
     ego_name = verify_ego;
   }
-  else if (NULL != get_ego)
+  else if (GNUNET_YES == get_flag)
   {
     if (NULL != status_ego)
     {
@@ -455,7 +442,7 @@ run (void *cls,
       fprintf (stderr, _ ("-a is needed for -G!\n"));
       return;
     }
-    ego_name = get_ego;
+    ego_name = NULL;
   }
   else if (NULL != status_ego)
   {
@@ -480,7 +467,7 @@ run (void *cls,
   else
   {
     ret = 1;
-    fprintf (stderr, _ ("unknown method name!"));
+    fprintf (stderr, _ ("unknown method name!\n"));
     return;
   }
 
@@ -492,6 +479,13 @@ run (void *cls,
     anchor = GNUNET_ESCROW_anchor_string_to_data (escrow_handle,
                                                   anchor_string,
                                                   method);
+    if (NULL == anchor)
+    {
+      ret = 1;
+      fprintf (stderr, _ ("failed to parse anchor string!\n"));
+      cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
+      return;
+    }
   }
 
   /* connect to identity service in order to get the egos */
@@ -513,11 +507,10 @@ main (int argc, char *const argv[])
                                  "NAME",
                                  gettext_noop ("Verify the escrow of the ego NAME"),
                                  &verify_ego),
-    GNUNET_GETOPT_option_string ('G',
-                                 "get",
-                                 "NAME",
-                                 gettext_noop ("Get the ego NAME back from escrow"),
-                                 &get_ego),
+    GNUNET_GETOPT_option_flag ('G',
+                               "get",
+                               gettext_noop ("Get an ego back from escrow"),
+                               &get_flag),
     GNUNET_GETOPT_option_string ('S',
                                  "status",
                                  "NAME",
diff --git a/src/escrow/plugin_escrow_anastasis.c b/src/escrow/plugin_escrow_anastasis.c
index c0be1f50f..b3029f885 100644
--- a/src/escrow/plugin_escrow_anastasis.c
+++ b/src/escrow/plugin_escrow_anastasis.c
@@ -110,8 +110,7 @@ verify_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
  * Restore the key from Anastasis escrow
  * 
  * @param h the handle for the escrow component
- * @param escrowAnchor the escrow anchor needed to restore the key
- * @param egoName the name of the ego to restore
+ * @param anchor the escrow anchor needed to restore the key
  * @param cb the function called upon completion
  * @param op_id unique ID of the respective ESCROW_Operation
  * 
@@ -119,8 +118,7 @@ verify_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
  */
 struct ESCROW_PluginOperationWrapper *
 restore_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
-                              struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                              const char *egoName,
+                              struct GNUNET_ESCROW_Anchor *anchor,
                               GNUNET_SCHEDULER_TaskCallback cb,
                               uint32_t op_id)
 {
@@ -159,7 +157,8 @@ anastasis_get_status (struct GNUNET_ESCROW_Handle *h,
  * 
  * @param anchorString the encoded escrow anchor string
  * 
- * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct
+ * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct,
+ *         NULL if we failed to parse the string
  */
 struct GNUNET_ESCROW_Anchor *
 anastasis_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
@@ -167,13 +166,34 @@ anastasis_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
 {
   struct GNUNET_ESCROW_Anchor *anchor;
   uint32_t data_size;
-
-  data_size = strlen (anchorString) + 1;
-
+  char *anchorStringCopy, *ptr, *egoNameCopy;
+  char delimiter[] = ":";
+  
+  anchorStringCopy = GNUNET_strdup (anchorString);
+
+  // split the string at the first occurrence of the delimiter
+  ptr = strtok (anchorStringCopy, delimiter);
+  egoNameCopy = GNUNET_strdup (ptr);
+  ptr = strtok (NULL, delimiter);
+
+  if (NULL == ptr)
+  {
+    // delimiter was not found
+    GNUNET_free (egoNameCopy);
+    GNUNET_free (anchorStringCopy);
+    return NULL;
+  }
+
+  data_size = strlen (ptr) + 1;
   anchor = GNUNET_malloc (sizeof (struct GNUNET_ESCROW_Anchor) + data_size);
   anchor->size = data_size;
+  anchor->egoName = egoNameCopy;
+  anchor->method = GNUNET_ESCROW_KEY_ANASTASIS;
+  
   // TODO: deserialize?
-  GNUNET_memcpy (&anchor[1], anchorString, data_size);
+  GNUNET_memcpy (&anchor[1], ptr, data_size);
+
+  GNUNET_free (anchorStringCopy);
 
   return anchor;
 }
@@ -191,8 +211,17 @@ char *
 anastasis_anchor_data_to_string (struct GNUNET_ESCROW_Handle *h,
                                  struct GNUNET_ESCROW_Anchor *escrowAnchor)
 {
-  // TODO: implement
-  return NULL;
+  char *anchorString;
+  size_t egoNameSize;
+
+  egoNameSize = strlen (escrowAnchor->egoName);
+
+  anchorString = GNUNET_malloc (egoNameSize + 1 + escrowAnchor->size);
+  GNUNET_memcpy (anchorString, escrowAnchor->egoName, egoNameSize);
+  anchorString[egoNameSize] = ':';
+  GNUNET_memcpy (anchorString + egoNameSize + 1, &escrowAnchor[1], escrowAnchor->size);
+
+  return anchorString;
 }
 
 
diff --git a/src/escrow/plugin_escrow_gns.c b/src/escrow/plugin_escrow_gns.c
index f9a68728d..94ce175c5 100644
--- a/src/escrow/plugin_escrow_gns.c
+++ b/src/escrow/plugin_escrow_gns.c
@@ -37,12 +37,6 @@
 #include <inttypes.h>
 
 
-/* declare this function here, as it is used by other functions above the definition */
-char *
-gns_anchor_data_to_string (struct GNUNET_ESCROW_Handle *h,
-                           struct GNUNET_ESCROW_Anchor *escrowAnchor);
-
-
 /**
  * Continuation with a private key (used for restore_private_key)
  */
@@ -534,6 +528,7 @@ keyshare_distribution_finished (void *cls)
   anchorDataSize = strlen(p_op->userSecret) + 1;
   anchor = GNUNET_malloc (sizeof (struct GNUNET_ESCROW_Anchor) + anchorDataSize);
   anchor->method = GNUNET_ESCROW_KEY_GNS;
+  anchor->egoName = GNUNET_strdup (p_op->ego->name);
   anchor->size = anchorDataSize;
   GNUNET_memcpy (&anchor[1], p_op->userSecret, anchorDataSize);
   
@@ -1311,6 +1306,18 @@ timeout_gns_request (void *cls)
 }
 
 
+static char *
+get_user_secret_from_anchor (const struct GNUNET_ESCROW_Anchor *anchor)
+{
+  char *userSecret;
+
+  userSecret = GNUNET_malloc (anchor->size);
+  GNUNET_memcpy (userSecret, &anchor[1], anchor->size);
+
+  return userSecret;
+}
+
+
 static void
 restore_private_key (struct ESCROW_PluginOperationWrapper *plugin_op_wrap,
                      struct GNUNET_ESCROW_Anchor *escrowAnchor,
@@ -1449,7 +1456,7 @@ verify_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
   p_op->cont = cb;
   p_op->ego = ego;
   p_op->egoName = GNUNET_strdup (ego->name);
-  p_op->userSecret = gns_anchor_data_to_string (h, escrowAnchor);
+  p_op->userSecret = get_user_secret_from_anchor (escrowAnchor);
 
   w = GNUNET_new (struct ESCROW_Plugin_VerifyContinuationWrapper);
   w->h = h;
@@ -1463,6 +1470,13 @@ verify_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
     p_op->sched_task = GNUNET_SCHEDULER_add_now (&verify_cont, plugin_op_wrap);
     return plugin_op_wrap;
   }
+  if (0 != strcmp (ego->name, escrowAnchor->egoName))
+  {
+    w->verificationResult = GNUNET_ESCROW_INVALID;
+    w->emsg = _ ("This anchor was not created when putting ego that in escrow!\n");
+    p_op->sched_task = GNUNET_SCHEDULER_add_now (&verify_cont, plugin_op_wrap);
+    return plugin_op_wrap;
+  }
 
   /* load config */
   if (GNUNET_OK != load_keyshare_config (plugin_op_wrap))
@@ -1569,8 +1583,7 @@ restore_ego_from_pk (void *cls,
  * Restore the key from GNS escrow
  * 
  * @param h the handle for the escrow component
- * @param escrowAnchor the escrow anchor needed to restore the key
- * @param egoName the name of the ego to restore
+ * @param anchor the escrow anchor needed to restore the key
  * @param cb the function called upon completion
  * @param op_id unique ID of the respective ESCROW_Operation
  * 
@@ -1578,8 +1591,7 @@ restore_ego_from_pk (void *cls,
  */
 struct ESCROW_PluginOperationWrapper *
 restore_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
-                        struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                        const char *egoName,
+                        struct GNUNET_ESCROW_Anchor *anchor,
                         GNUNET_SCHEDULER_TaskCallback cb,
                         uint32_t op_id)
 {
@@ -1598,18 +1610,18 @@ restore_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
   p_op->h = h;
   // set cont here (has to be scheduled from the IDENTITY service when it finished)
   p_op->cont = cb;
-  p_op->egoName = GNUNET_strdup (egoName);
-  p_op->userSecret = gns_anchor_data_to_string (h, escrowAnchor);
+  p_op->egoName = GNUNET_strdup (anchor->egoName);
+  p_op->userSecret = get_user_secret_from_anchor (anchor);
 
   w = GNUNET_new (struct ESCROW_Plugin_EgoContinuationWrapper);
   w->h = h;
   w->op_id = op_id;
   p_op->ego_wrap = w;
 
-  if (NULL == escrowAnchor)
+  if (NULL == anchor)
   {
     w->ego = NULL;
-    w->emsg = _ ("ESCROW_get was called with escrowAnchor == NULL!\n");
+    w->emsg = _ ("ESCROW_get was called with anchor == NULL!\n");
     // schedule handle_restore_error, which calls the callback and cleans up
     p_op->sched_task = GNUNET_SCHEDULER_add_now (&handle_restore_error, plugin_op_wrap);
     return plugin_op_wrap;
@@ -1620,7 +1632,7 @@ restore_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
     return plugin_op_wrap;
 
   restore_private_key (plugin_op_wrap,
-                       escrowAnchor,
+                       anchor,
                        &restore_ego_from_pk,
                        plugin_op_wrap);
 
@@ -1649,7 +1661,8 @@ gns_get_status (struct GNUNET_ESCROW_Handle *h,
  * 
  * @param anchorString the encoded escrow anchor string
  * 
- * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct
+ * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct,
+ *         NULL if we failed to parse the string
  */
 struct GNUNET_ESCROW_Anchor *
 gns_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
@@ -1657,13 +1670,34 @@ gns_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
 {
   struct GNUNET_ESCROW_Anchor *anchor;
   uint32_t data_size;
+  char *anchorStringCopy, *ptr, *egoNameCopy;
+  char delimiter[] = ":";
+  
+  anchorStringCopy = GNUNET_strdup (anchorString);
 
-  data_size = strlen (anchorString) + 1;
+  // split the string at the first occurrence of the delimiter
+  ptr = strtok (anchorStringCopy, delimiter);
+  egoNameCopy = GNUNET_strdup (ptr);
+  ptr = strtok (NULL, delimiter);
 
+  if (NULL == ptr)
+  {
+    // delimiter was not found
+    GNUNET_free (egoNameCopy);
+    GNUNET_free (anchorStringCopy);
+    return NULL;
+  }
+
+  data_size = strlen (ptr) + 1;
   anchor = GNUNET_malloc (sizeof (struct GNUNET_ESCROW_Anchor) + data_size);
   anchor->size = data_size;
+  anchor->egoName = egoNameCopy;
+  anchor->method = GNUNET_ESCROW_KEY_GNS;
+  
   // TODO: deserialize?
-  GNUNET_memcpy (&anchor[1], anchorString, data_size);
+  GNUNET_memcpy (&anchor[1], ptr, data_size);
+
+  GNUNET_free (anchorStringCopy);
 
   return anchor;
 }
@@ -1682,9 +1716,14 @@ gns_anchor_data_to_string (struct GNUNET_ESCROW_Handle *h,
                            struct GNUNET_ESCROW_Anchor *escrowAnchor)
 {
   char *anchorString;
+  size_t egoNameSize;
+
+  egoNameSize = strlen (escrowAnchor->egoName);
 
-  anchorString = GNUNET_malloc (escrowAnchor->size);
-  GNUNET_memcpy (anchorString, &escrowAnchor[1], escrowAnchor->size);
+  anchorString = GNUNET_malloc (egoNameSize + 1 + escrowAnchor->size);
+  GNUNET_memcpy (anchorString, escrowAnchor->egoName, egoNameSize);
+  anchorString[egoNameSize] = ':';
+  GNUNET_memcpy (anchorString + egoNameSize + 1, &escrowAnchor[1], escrowAnchor->size);
 
   return anchorString;
 }
diff --git a/src/escrow/plugin_escrow_plaintext.c b/src/escrow/plugin_escrow_plaintext.c
index 0dab8fd1e..eace829ea 100644
--- a/src/escrow/plugin_escrow_plaintext.c
+++ b/src/escrow/plugin_escrow_plaintext.c
@@ -182,6 +182,7 @@ start_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
   anchorDataSize = strlen (pkString) + 1;
   anchor = GNUNET_malloc (sizeof (struct GNUNET_ESCROW_Anchor) + anchorDataSize);
   anchor->method = GNUNET_ESCROW_KEY_PLAINTEXT;
+  anchor->egoName = GNUNET_strdup (ego->name);
   anchor->size = anchorDataSize;
   GNUNET_memcpy (&anchor[1], pkString, anchorDataSize);
 
@@ -256,11 +257,17 @@ verify_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
     p_op->sched_task = GNUNET_SCHEDULER_add_now (&verify_cont, plugin_op_wrap);
     return plugin_op_wrap;
   }
+  if (0 != strcmp (ego->name, escrowAnchor->egoName))
+  {
+    w->verificationResult = GNUNET_ESCROW_INVALID;
+    w->emsg = _ ("This anchor was not created when putting ego that in escrow!\n");
+    p_op->sched_task = GNUNET_SCHEDULER_add_now (&verify_cont, plugin_op_wrap);
+    return plugin_op_wrap;
+  }
   pk = GNUNET_IDENTITY_ego_get_private_key (ego);
   pkString = GNUNET_CRYPTO_ecdsa_private_key_to_string (pk);
-  verificationResult = strncmp (pkString,
-                                (char *)&escrowAnchor[1],
-                                strlen (pkString)) == 0 ?
+  verificationResult = strcmp (pkString,
+                               (char *)&escrowAnchor[1]) == 0 ?
     GNUNET_ESCROW_VALID : GNUNET_ESCROW_INVALID;
 
   w->verificationResult = verificationResult;
@@ -357,8 +364,7 @@ handle_restore_error (void *cls)
  * Restore the key from plaintext escrow
  * 
  * @param h the handle for the escrow component
- * @param escrowAnchor the escrow anchor needed to restore the key
- * @param egoName the name of the ego to restore
+ * @param anchor the escrow anchor needed to restore the key
  * @param cb the function called upon completion
  * @param op_id unique ID of the respective ESCROW_Operation
  * 
@@ -366,8 +372,7 @@ handle_restore_error (void *cls)
  */
 struct ESCROW_PluginOperationWrapper *
 restore_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
-                              struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                              const char *egoName,
+                              struct GNUNET_ESCROW_Anchor *anchor,
                               ESCROW_Plugin_Continuation cb,
                               uint32_t op_id)
 {
@@ -393,17 +398,17 @@ restore_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
   w->op_id = op_id;
   p_op->ego_wrap = w;
 
-  if (NULL == escrowAnchor)
+  if (NULL == anchor)
   {
     w->ego = NULL;
-    w->emsg = _ ("ESCROW_get was called with escrowAnchor == NULL!\n");
+    w->emsg = _ ("ESCROW_get was called with anchor == NULL!\n");
     // schedule handle_restore_error, which calls the callback and cleans up
     p_op->sched_task = GNUNET_SCHEDULER_add_now (&handle_restore_error, plugin_op_wrap);
     return plugin_op_wrap;
   }
   if (GNUNET_OK !=
-    GNUNET_CRYPTO_ecdsa_private_key_from_string ((char *)&escrowAnchor[1],
-                                                 strlen ((char *)&escrowAnchor[1]),
+    GNUNET_CRYPTO_ecdsa_private_key_from_string ((char *)&anchor[1],
+                                                 strlen ((char *)&anchor[1]),
                                                  &pk))
   {
     w->ego = NULL;
@@ -414,7 +419,7 @@ restore_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
   }
   
   p_op->id_op = GNUNET_IDENTITY_create (identity_handle,
-                                        egoName,
+                                        anchor->egoName,
                                         &pk,
                                         &create_finished,
                                         p_op);
@@ -445,7 +450,8 @@ plaintext_get_status (struct GNUNET_ESCROW_Handle *h,
  * @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
+ * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct,
+ *         NULL if we failed to parse the string
  */
 struct GNUNET_ESCROW_Anchor *
 plaintext_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
@@ -453,13 +459,34 @@ plaintext_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
 {
   struct GNUNET_ESCROW_Anchor *anchor;
   uint32_t data_size;
+  char *anchorStringCopy, *ptr, *egoNameCopy;
+  char delimiter[] = ":";
+  
+  anchorStringCopy = GNUNET_strdup (anchorString);
 
-  data_size = strlen (anchorString) + 1;
+  // split the string at the first occurrence of the delimiter
+  ptr = strtok (anchorStringCopy, delimiter);
+  egoNameCopy = GNUNET_strdup (ptr);
+  ptr = strtok (NULL, delimiter);
 
+  if (NULL == ptr)
+  {
+    // delimiter was not found
+    GNUNET_free (egoNameCopy);
+    GNUNET_free (anchorStringCopy);
+    return NULL;
+  }
+
+  data_size = strlen (ptr) + 1;
   anchor = GNUNET_malloc (sizeof (struct GNUNET_ESCROW_Anchor) + data_size);
   anchor->size = data_size;
+  anchor->egoName = egoNameCopy;
+  anchor->method = GNUNET_ESCROW_KEY_PLAINTEXT;
+
   // TODO: deserialize?
-  GNUNET_memcpy (&anchor[1], anchorString, data_size);
+  GNUNET_memcpy (&anchor[1], ptr, data_size);
+
+  GNUNET_free (anchorStringCopy);
 
   return anchor;
 }
@@ -478,9 +505,14 @@ plaintext_anchor_data_to_string (struct GNUNET_ESCROW_Handle *h,
                                  struct GNUNET_ESCROW_Anchor *escrowAnchor)
 {
   char *anchorString;
+  size_t egoNameSize;
+
+  egoNameSize = strlen (escrowAnchor->egoName);
 
-  anchorString = GNUNET_malloc (escrowAnchor->size);
-  GNUNET_memcpy (anchorString, &escrowAnchor[1], escrowAnchor->size);
+  anchorString = GNUNET_malloc (egoNameSize + 1 + escrowAnchor->size);
+  GNUNET_memcpy (anchorString, escrowAnchor->egoName, egoNameSize);
+  anchorString[egoNameSize] = ':';
+  GNUNET_memcpy (anchorString + egoNameSize + 1, &escrowAnchor[1], escrowAnchor->size);
 
   return anchorString;
 }
diff --git a/src/escrow/test_gns_escrow.sh b/src/escrow/test_gns_escrow.sh
index b29650718..5af2c806d 100755
--- a/src/escrow/test_gns_escrow.sh
+++ b/src/escrow/test_gns_escrow.sh
@@ -36,7 +36,7 @@ then
         exit 1
 fi
 gnunet-identity -D testego -c test_escrow.conf
-gnunet-escrow -m gns -G testego -a $ANCHOR -c test_escrow.conf
+gnunet-escrow -m gns -G -a $ANCHOR -c test_escrow.conf
 if test $? != 0
 then
         echo "GNS restore failed!"
diff --git a/src/escrow/test_plaintext_escrow.sh b/src/escrow/test_plaintext_escrow.sh
index 8113110e2..6b66de8ba 100755
--- a/src/escrow/test_plaintext_escrow.sh
+++ b/src/escrow/test_plaintext_escrow.sh
@@ -35,7 +35,7 @@ then
         exit 1
 fi
 gnunet-identity -D testego -c test_escrow.conf
-gnunet-escrow -m plaintext -G testego -a $ANCHOR -c test_escrow.conf
+gnunet-escrow -m plaintext -G -a $ANCHOR -c test_escrow.conf
 if test $? != 0
 then
         echo "Plaintext restore failed!"
diff --git a/src/include/gnunet_escrow_lib.h b/src/include/gnunet_escrow_lib.h
index 7d9d39dce..dddf5e030 100644
--- a/src/include/gnunet_escrow_lib.h
+++ b/src/include/gnunet_escrow_lib.h
@@ -75,6 +75,11 @@ struct GNUNET_ESCROW_Anchor
   enum GNUNET_ESCROW_Key_Escrow_Method method;
 
   /**
+   * The name of the ego that was put in escrow.
+   */
+  char *egoName;
+
+  /**
    * The size of the anchor data.
    */
   uint32_t size;
@@ -305,8 +310,7 @@ GNUNET_ESCROW_put (
  * Get the escrowed data back
  * 
  * @param h the handle for the escrow component
- * @param escrowAnchor the escrow anchor returned by the GNUNET_ESCROW_put method
- * @param egoName the name of the ego to get back
+ * @param anchor the escrow anchor returned by the GNUNET_ESCROW_put method
  * @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
@@ -316,8 +320,7 @@ GNUNET_ESCROW_put (
 struct GNUNET_ESCROW_Operation *
 GNUNET_ESCROW_get (
   struct GNUNET_ESCROW_Handle *h,
-  struct GNUNET_ESCROW_Anchor *escrowAnchor,
-  const char *egoName,
+  struct GNUNET_ESCROW_Anchor *anchor,
   enum GNUNET_ESCROW_Key_Escrow_Method method,
   GNUNET_ESCROW_EgoContinuation cb,
   void *cb_cls);
@@ -371,7 +374,8 @@ GNUNET_ESCROW_get_status (
  * @param anchorString the encoded escrow anchor string
  * @param method the escrow method to use
  * 
- * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct
+ * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct,
+ *         NULL if we failed to parse the string
  */
 struct GNUNET_ESCROW_Anchor *
 GNUNET_ESCROW_anchor_string_to_data (
diff --git a/src/include/gnunet_escrow_plugin.h b/src/include/gnunet_escrow_plugin.h
index b54506970..b8b88ff3f 100644
--- a/src/include/gnunet_escrow_plugin.h
+++ b/src/include/gnunet_escrow_plugin.h
@@ -85,8 +85,7 @@ typedef struct ESCROW_PluginOperationWrapper *(*GNUNET_ESCROW_VerifyKeyEscrowFun
  * Function called to restore a key from an escrow
  * 
  * @param h the handle for the escrow component
- * @param escrowAnchor the escrow anchor needed to restore the key
- * @param egoName the name of the ego to restore
+ * @param anchor the escrow anchor needed to restore the key
  * @param cb the function called upon completion
  * @param op_id unique ID of the respective ESCROW_Operation
  * 
@@ -94,8 +93,7 @@ typedef struct ESCROW_PluginOperationWrapper *(*GNUNET_ESCROW_VerifyKeyEscrowFun
  */
 typedef struct ESCROW_PluginOperationWrapper *(*GNUNET_ESCROW_RestoreKeyFunction) (
   struct GNUNET_ESCROW_Handle *h,
-  struct GNUNET_ESCROW_Anchor *escrowAnchor,
-  const char *egoName,
+  struct GNUNET_ESCROW_Anchor *anchor,
   GNUNET_SCHEDULER_TaskCallback cb,
   uint32_t op_id);
 
@@ -122,7 +120,8 @@ typedef struct GNUNET_ESCROW_Status *(*GNUNET_ESCROW_GetEscrowStatusFunction) (
  * @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
+ * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct,
+ *         NULL if we failed to parse the string
  */
 typedef struct GNUNET_ESCROW_Anchor *(*GNUNET_ESCROW_AnchorStringToDataFunction) (
   struct GNUNET_ESCROW_Handle *h,