[taler-anastasis] branch master updated: fixed json unpack error

[gnunet]

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

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

The following commit(s) were added to refs/heads/master by this push:
     new 1863950  fixed json unpack error
1863950 is described below

commit 1863950fa1cfb90c8cbd022667f06940ebd5871e
Author: Dennis Neufeld <address@hidden>
AuthorDate: Tue May 12 19:11:37 2020 +0000

    fixed json unpack error
---
 src/lib/anastasis.c      | 20 ++++++++++----------
 src/lib/test_anastasis.c |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/lib/anastasis.c b/src/lib/anastasis.c
index d876c5f..cd4ce35 100644
--- a/src/lib/anastasis.c
+++ b/src/lib/anastasis.c
@@ -515,10 +515,10 @@ policy_lookup_cb (void *cls,
   }
   void *plaintext;
   size_t size_plaintext;
-  json_t *recovery_document;
+  const json_t *recovery_document;
   json_error_t json_error;
-  json_t *dec_policies = json_array ();
-  json_t *esc_methods = json_array ();
+  json_t *dec_policies;
+  json_t *esc_methods;
 
   ANASTASIS_CRYPTO_recovery_document_decrypt (&r->id,
                                               dd->policy,
@@ -541,21 +541,21 @@ policy_lookup_cb (void *cls,
 
 
   GNUNET_assert (0 ==
-                 json_unpack (recovery_document,
+                 json_unpack ((json_t *) recovery_document,
                               "{s:o,"   /* policies */
                               " s:o,"   /* decryption policies */
-                              " s:o,"   /* encrypted core secret */
-                              "policies", dec_policies,
-                              "escrow_methods", esc_methods,
-                              "core_secret", r->enc_core_secret));
+                              " s:o}",   /* encrypted core secret */
+                              "policies", &dec_policies,
+                              "escrow_methods", &esc_methods,
+                              "core_secret", &r->enc_core_secret));
 
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Decryption Policies after unpack  %s\n",
-              json_dumps (dec_policies, JSON_COMPACT));
+              json_dumps (dec_policies, JSON_COMPACT | JSON_SORT_KEYS));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Escrow Methods after unpack  %s\n",
-              json_dumps (esc_methods, JSON_COMPACT));
+              json_dumps (esc_methods, JSON_COMPACT | JSON_SORT_KEYS));
 
   r->ri->cs_len = json_array_size (esc_methods);
   r->ri->dps_len = json_array_size (dec_policies);
diff --git a/src/lib/test_anastasis.c b/src/lib/test_anastasis.c
index 80a9f07..0bf89a7 100644
--- a/src/lib/test_anastasis.c
+++ b/src/lib/test_anastasis.c
@@ -281,17 +281,17 @@ run (void *cls,
                                         ANASTASIS_TESTING_SSO_NONE,
                                         "policy-create-1",
                                         NULL),
-    /**
+
     ANASTASIS_TESTING_cmd_recover_secret ("recover-secret-1",
                                           anastasis_url,
                                           
ANASTASIS_TESTING_make_id_data_example (
-                                          "MaxMuster123456789"),
+                                            "MaxMuster123456789"),
                                           0,
                                           MHD_HTTP_PAYMENT_REQUIRED,
                                           ANASTASIS_TESTING_RSO_NONE,
                                           "salt-request-1",
-                                          "secret-share-1"),
-
+                                          "secret-share-2"),
+    /**
     ANASTASIS_TESTING_cmd_challenge_answer ("challenge-answer-1",
                                             MHD_HTTP_OK,
                                             "recover-secret-1",

-- 
To stop receiving notification emails like this one, please contact
address@hidden.