[gnunet] 70/70: -fixup merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 4a2c758df3b20104580fc5ff9efc1d6cd7237bd0
Merge: cc70504a2 6f72f1958
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Aug 31 17:59:47 2022 +0200

    -fixup merge

 src/reclaim/.gitignore        |   2 +
 src/reclaim/Makefile.am       |  44 +++-
 src/reclaim/did_core.c        | 267 +++++++++++++++++++++++
 src/reclaim/did_core.h        | 138 ++++++++++++
 src/reclaim/did_helper.c      | 203 ++++++++++++++++++
 src/reclaim/did_helper.h      |  74 +++++++
 src/reclaim/gnunet-did.c      | 482 +++++++++++-------------------------------
 src/reclaim/test_did_helper.c | 131 ++++++++++++
 8 files changed, 973 insertions(+), 368 deletions(-)

diff --cc src/reclaim/gnunet-did.c
index 4c5704d44,c0f81c3e2..6f802aded
--- a/src/reclaim/gnunet-did.c
+++ b/src/reclaim/gnunet-did.c
@@@ -146,76 -148,58 +148,9 @@@ cleanup (void *cls
    GNUNET_SCHEDULER_shutdown ();
  }
  
- /**
-  * @brief Callback for ego loockup of get_did_for_ego()
-  *
-  * @param cls closure
-  * @param ego the returned ego
-  */
- static void
- get_did_for_ego_lookup_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
- {
-   char *did_str;
- 
-   if (ego == NULL)
-   {
-     printf ("EGO not found\n");
-     GNUNET_SCHEDULER_add_now (&cleanup, NULL);
-     ret = 1;
-     return;
-   }
-   did_str = DID_ego_to_did (ego);
- 
-   printf ("%s\n", did_str);
- 
-   GNUNET_SCHEDULER_add_now (&cleanup, NULL);
-   ret = 0;
-   return;
- }
- 
- /**
-  * @brief Get the DID for a given EGO
-  *
-  */
- static void
- get_did_for_ego ()
- {
-   if (egoname != NULL)
-   {
-     GNUNET_IDENTITY_ego_lookup (my_cfg,
-                                 egoname,
-                                 &get_did_for_ego_lookup_cb,
-                                 NULL);
-   }
-   else {
-     printf ("Set the EGO argument to get the DID for a given EGO\n");
-     GNUNET_SCHEDULER_add_now (&cleanup, NULL);
-     ret = 1;
-     return;
-   }
- }
- 
- 
- /**
-  * @brief Get the public key from did attribute given by the user
-  *
-  * @param pkey place to write the public key to
-  */
- static void
- get_pkey_from_attr_did (struct GNUNET_IDENTITY_PublicKey *pkey)
- {
-   if (GNUNET_OK != DID_public_key_from_did (did, pkey))
-   {
-     fprintf (stderr, _("Invalid DID `%s'\n"), did);
-     GNUNET_SCHEDULER_add_now (cleanup, NULL);
-     ret = 1;
-     return;
-   }
- }
- 
  /**
 - * @brief Callback for ego loockup of get_did_for_ego()
 - *
 - * @param cls closure
 - * @param ego the returned ego
 - */
 -// static void
 -// get_did_for_ego_lookup_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
 -// {
 -//   char *did_str;
 -//
 -//   if (ego == NULL)
 -//   {
 -//     printf ("EGO not found\n");
 -//     GNUNET_SCHEDULER_add_now (&cleanup, NULL);
 -//     ret = 1;
 -//     return;
 -//   }
 -//   did_str = DID_identity_to_did (ego);
 -//
 -//   printf ("%s\n", did_str);
 -//
 -//   GNUNET_SCHEDULER_add_now (&cleanup, NULL);
 -//   ret = 0;
 -//   return;
 -// }
 -
 -/**
 - * @brief Get the DID for a given EGO
 - *
 - */
 -// static void
 -// get_did_for_ego ()
 -// {
 -//   if (egoname != NULL)
 -//   {
 -//     GNUNET_IDENTITY_ego_lookup (my_cfg,
 -//                                 egoname,
 -//                                 &get_did_for_ego_lookup_cb,
 -//                                 NULL);
 -//   }
 -//   else {
 -//     printf ("Set the EGO argument to get the DID for a given EGO\n");
 -//     GNUNET_SCHEDULER_add_now (&cleanup, NULL);
 -//     ret = 1;
 -//     return;
 -//   }
 -// }
 -
 -/**
 - * @brief Resolve DID callback. Prints the DID Document to standard out.
 - * Prints error message if resolve fails
 + * @brief GNS lookup callback. Prints the DID Document to standard out.
 + * Fails if there is more than one DID record.
   *
   * @param cls closure
   * @param rd_count number of records in @a rd

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.