[taler-anastasis] 02/02: worked on assembler cli command 'answer'

[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 13c45fc4e55eeb30102f6dfc739e69e79b32e461
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Wed Jun 17 10:47:23 2020 +0000

    worked on assembler cli command 'answer'
---
 src/include/anastasis.h |  5 -----
 src/lib/anastasis.c     | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/include/anastasis.h b/src/include/anastasis.h
index ef6702d..164f95f 100644
--- a/src/include/anastasis.h
+++ b/src/include/anastasis.h
@@ -87,11 +87,6 @@ struct ANASTASIS_RecoveryInformation
   struct ANASTASIS_CRYPTO_SaltP salt;
 
   unsigned int version;     // actual version obtained
-
-  void *enc_core_secret;
-
-  size_t enc_core_secret_size;
-
 };
 
 /**
diff --git a/src/lib/anastasis.c b/src/lib/anastasis.c
index 431876c..6f8c637 100644
--- a/src/lib/anastasis.c
+++ b/src/lib/anastasis.c
@@ -406,14 +406,14 @@ keyshare_lookup_cb (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "At %s:%d encrypted core secret is %s-%llu b\n", __FILE__,
                 __LINE__,
-                TALER_b2s (c->recovery->ri->enc_core_secret,
-                           c->recovery->ri->enc_core_secret_size),
-                (unsigned long long) c->recovery->ri->enc_core_secret_size);
+                TALER_b2s (c->recovery->enc_core_secret,
+                           c->recovery->enc_core_secret_size),
+                (unsigned long long) c->recovery->enc_core_secret_size);
 
     ANASTASIS_CRYPTO_core_secret_recover (&c->recovery->ri->dps[success].emk,
                                           policy_key,
-                                          c->recovery->ri->enc_core_secret,
-                                          
c->recovery->ri->enc_core_secret_size,
+                                          c->recovery->enc_core_secret,
+                                          c->recovery->enc_core_secret_size,
                                           &core_secret,
                                           &core_secret_size);
 
@@ -601,7 +601,7 @@ policy_lookup_cb (void *cls,
                  json_unpack ((json_t *) recovery_document,
                               "{s:o,"   /* policies */
                               " s:o,"   /* decryption policies */
-                              " s:o}",   /* encrypted core secret */
+                              " s:s}",   /* encrypted core secret */
                               "policies", &dec_policies,
                               "escrow_methods", &esc_methods,
                               "core_secret", &enc_core_secret));
@@ -618,17 +618,17 @@ 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->ri->enc_core_secret_size = strlen (enc_core_secret);
+  r->enc_core_secret_size = strlen (enc_core_secret);
   GNUNET_STRINGS_string_to_data (enc_core_secret,
                                  strlen (enc_core_secret),
-                                 r->ri->enc_core_secret,
-                                 r->ri->enc_core_secret_size);
+                                 r->enc_core_secret,
+                                 strlen (enc_core_secret));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "At %s:%d encrypted core secret is %s-%llu b\n", __FILE__,
               __LINE__,
-              TALER_b2s (r->ri->enc_core_secret,
-                         r->ri->enc_core_secret_size),
-              (unsigned long long) r->ri->enc_core_secret_size);
+              TALER_b2s (r->enc_core_secret,
+                         r->enc_core_secret_size),
+              (unsigned long long) r->enc_core_secret_size);
 
   r->solved_challenges = GNUNET_new_array (r->ri->cs_len,
                                            struct ANASTASIS_Challenge);
@@ -704,7 +704,7 @@ policy_lookup_cb (void *cls,
                                 " s:s,"         /* policy uuids  */
                                 " s:s,"         /* policy salt */
                                 " s:i}",        /* policy uuids length */
-                                "master_key",&enc_master_key,
+                                "master_key", &enc_master_key,
                                 "uuids",&uuids,
                                 "salt", &salt,
                                 "uuids_length", &r->ri->dps[j].uuids_length));

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