[taler-anastasis] branch master updated: expand logic to store a secret name in the recovery document

[gnunet]

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

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new 4a77dcb  expand logic to store a secret name in the recovery document
4a77dcb is described below

commit 4a77dcbdb9e8fd1c3f3cd4963efb9d257eefe86f
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Jul 13 21:43:02 2021 +0200

    expand logic to store a secret name in the recovery document
---
 src/include/anastasis.h                  |  2 ++
 src/lib/anastasis_backup.c               |  4 +++-
 src/reducer/anastasis_api_backup_redux.c | 14 +++++---------
 src/testing/testing_cmd_secret_share.c   |  1 +
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/include/anastasis.h b/src/include/anastasis.h
index 705dd07..668bafe 100644
--- a/src/include/anastasis.h
+++ b/src/include/anastasis.h
@@ -930,6 +930,7 @@ struct ANASTASIS_ProviderDetails
  * @param spc_cls closure for the @a spc payment callback
  * @param src callback for the upload process
  * @param src_cls closure for the @a src upload callback
+ * @param secret_name name of the core secret
  * @param core_secret input of the user which is secured by anastasis e.g. 
(wallet private key)
  * @param core_secret_size size of the @a core_secret
  * @return NULL on error
@@ -945,6 +946,7 @@ ANASTASIS_secret_share (struct GNUNET_CURL_Context *ctx,
                         struct GNUNET_TIME_Relative pay_timeout,
                         ANASTASIS_ShareResultCallback src,
                         void *src_cls,
+                        const char *secret_name,
                         const void *core_secret,
                         size_t core_secret_size);
 
diff --git a/src/lib/anastasis_backup.c b/src/lib/anastasis_backup.c
index c3eaed9..dcbccb5 100644
--- a/src/lib/anastasis_backup.c
+++ b/src/lib/anastasis_backup.c
@@ -721,6 +721,7 @@ ANASTASIS_secret_share (struct GNUNET_CURL_Context *ctx,
                         struct GNUNET_TIME_Relative pay_timeout,
                         ANASTASIS_ShareResultCallback src,
                         void *src_cls,
+                        const char *secret_name,
                         const void *core_secret,
                         size_t core_secret_size)
 {
@@ -864,7 +865,8 @@ ANASTASIS_secret_share (struct GNUNET_CURL_Context *ctx,
     uint32_t be_size;
 
     recovery_document = json_pack (
-      "{s:o, s:o, s:o}",
+      "{s:s?, s:o, s:o, s:o}",
+      "secret_name", secret_name,
       "policies", dec_policies,
       "escrow_methods", esc_methods,
       "core_secret", GNUNET_JSON_from_data (encrypted_core_secret,
diff --git a/src/reducer/anastasis_api_backup_redux.c 
b/src/reducer/anastasis_api_backup_redux.c
index c3893a7..05d1075 100644
--- a/src/reducer/anastasis_api_backup_redux.c
+++ b/src/reducer/anastasis_api_backup_redux.c
@@ -2935,6 +2935,7 @@ share_secret (struct UploadContext *uc)
   json_t *jpolicies;
   json_t *providers = NULL;
   size_t policies_len;
+  const char *secret_name = NULL;
   unsigned int pds_len;
   struct GNUNET_TIME_Relative timeout = GNUNET_TIME_UNIT_ZERO;
   struct GNUNET_JSON_Specification spec[] = {
@@ -2946,6 +2947,9 @@ share_secret (struct UploadContext *uc)
                            &providers),
     GNUNET_JSON_spec_json ("core_secret",
                            &core_secret),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_string ("secret_name",
+                               &secret_name)),
     GNUNET_JSON_spec_end ()
   };
 
@@ -3216,6 +3220,7 @@ share_secret (struct UploadContext *uc)
                                        timeout,
                                        &secret_share_result_cb,
                                        uc,
+                                       secret_name,
                                        secret,
                                        secret_size);
       GNUNET_free (secret);
@@ -4054,14 +4059,10 @@ enter_secret (json_t *state,
               void *cb_cls)
 {
   json_t *jsecret;
-  const char *secret_name = NULL;
   struct GNUNET_TIME_Absolute expiration = {0};
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_json ("secret",
                            &jsecret),
-    GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_string ("name",
-                               &secret_name)),
     GNUNET_JSON_spec_mark_optional (
       GNUNET_JSON_spec_absolute_time ("expiration",
                                       &expiration)),
@@ -4125,11 +4126,6 @@ enter_secret (json_t *state,
       return NULL;
     }
   }
-  if (NULL != secret_name)
-    GNUNET_assert (0 ==
-                   json_object_set_new (state,
-                                        "secret_name",
-                                        json_string (secret_name)));
   GNUNET_assert (0 ==
                  json_object_set (state,
                                   "core_secret",
diff --git a/src/testing/testing_cmd_secret_share.c 
b/src/testing/testing_cmd_secret_share.c
index 85eb639..b80006e 100644
--- a/src/testing/testing_cmd_secret_share.c
+++ b/src/testing/testing_cmd_secret_share.c
@@ -309,6 +309,7 @@ secret_share_run (void *cls,
                                      GNUNET_TIME_UNIT_ZERO,
                                      &secret_share_result_cb,
                                      sss,
+                                     "test-case",
                                      sss->core_secret,
                                      sss->core_secret_size);
   if (NULL == sss->sso)

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