[taler-anastasis] 01/03: fixed core secret assembling - cli

[gnunet]

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

dennis-neufeld pushed a commit to branch master
in repository anastasis.

commit 99235ad428bc5a0284163c61df178dc867fc9ccb
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Wed Jun 17 16:32:24 2020 +0000

    fixed core secret assembling - cli
---
 src/lib/anastasis.c                     | 16 ++++++++++------
 src/lib/anastasis_api_keyshare_lookup.c |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/lib/anastasis.c b/src/lib/anastasis.c
index 6f8c637..094505a 100644
--- a/src/lib/anastasis.c
+++ b/src/lib/anastasis.c
@@ -601,10 +601,12 @@ policy_lookup_cb (void *cls,
                  json_unpack ((json_t *) recovery_document,
                               "{s:o,"   /* policies */
                               " s:o,"   /* decryption policies */
-                              " s:s}",   /* encrypted core secret */
+                              " s:s,"   /* encrypted core secret */
+                              " s:I}",/* core secret size */
                               "policies", &dec_policies,
                               "escrow_methods", &esc_methods,
-                              "core_secret", &enc_core_secret));
+                              "core_secret", &enc_core_secret,
+                              "core_secret_size", &r->enc_core_secret_size));
 
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -618,11 +620,11 @@ policy_lookup_cb (void *cls,
   r->ri->dps_len = json_array_size (dec_policies);
   r->ri->dps = GNUNET_new_array (r->ri->dps_len, struct
                                  ANASTASIS_DecryptionPolicy);
-  r->enc_core_secret_size = strlen (enc_core_secret);
+  r->enc_core_secret = GNUNET_malloc (r->enc_core_secret_size);
   GNUNET_STRINGS_string_to_data (enc_core_secret,
                                  strlen (enc_core_secret),
                                  r->enc_core_secret,
-                                 strlen (enc_core_secret));
+                                 r->enc_core_secret_size);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "At %s:%d encrypted core secret is %s-%llu b\n", __FILE__,
               __LINE__,
@@ -1924,11 +1926,13 @@ ANASTASIS_secret_share (struct GNUNET_CURL_Context *ctx,
   recovery_document = json_pack (
     "{s:o," /* policies */
     " s:o," /* decryption policies */
-    " s:o}", /* encrypted core secret */
+    " s:o," /* encrypted core secret */
+    " s:I}",/* core secret size */
     "policies", dec_policies,
     "escrow_methods", esc_methods,
     "core_secret", GNUNET_JSON_from_data (encrypted_core_secret,
-                                          core_secret_size));
+                                          core_secret_size),
+    "core_secret_size", (json_int_t) core_secret_size);
   GNUNET_assert (NULL != recovery_document);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "recovery document json before upload: %s\n",
diff --git a/src/lib/anastasis_api_keyshare_lookup.c 
b/src/lib/anastasis_api_keyshare_lookup.c
index 2dcaf4b..aac19e9 100644
--- a/src/lib/anastasis_api_keyshare_lookup.c
+++ b/src/lib/anastasis_api_keyshare_lookup.c
@@ -129,7 +129,7 @@ handle_keyshare_lookup_finished (void *cls,
       kdd.encrypted_key_share = data;
       kdd.encrypted_keyshare_size = data_size;
       kslo->cb (kslo->cb_cls,
-                response_code,
+                (unsigned int) response_code,
                 &kdd);
       kslo->cb = NULL;
       ANASTASIS_keyshare_lookup_cancel (kslo);

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