1 files changed, 30 insertions, 50 deletions

diff --git a/src/lib/anastasis_recovery.c b/src/lib/anastasis_recovery.c
index c9f8c0e..e844737 100644
--- a/src/lib/anastasis_recovery.c
+++ b/src/lib/anastasis_recovery.c
@@ -624,8 +624,8 @@ policy_lookup_cb (void *cls,
   void *plaintext;
   size_t size_plaintext;
   json_error_t json_error;
-  json_t *dec_policies;
-  json_t *esc_methods;
+  const json_t *dec_policies;
+  const json_t *esc_methods;
 
   r->plo = NULL;
   switch (http_status)
@@ -761,10 +761,10 @@ policy_lookup_cb (void *cls,
     {
       const char *secret_name = NULL;
       struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_json ("policies",
-                               &dec_policies),
-        GNUNET_JSON_spec_json ("escrow_methods",
-                               &esc_methods),
+        GNUNET_JSON_spec_array_const ("policies",
+                                      &dec_policies),
+        GNUNET_JSON_spec_array_const ("escrow_methods",
+                                      &esc_methods),
         GNUNET_JSON_spec_mark_optional (
           GNUNET_JSON_spec_string ("secret_name",
                                    &secret_name),
@@ -848,8 +848,6 @@ policy_lookup_cb (void *cls,
                            NULL, NULL))
     {
       GNUNET_break_op (0);
-      json_decref (esc_methods);
-      json_decref (dec_policies);
       r->csc (r->csc_cls,
               ANASTASIS_RS_POLICY_MALFORMED_JSON,
               NULL,
@@ -864,13 +862,11 @@ policy_lookup_cb (void *cls,
     cs->instructions = GNUNET_strdup (instructions);
     cs->ci.instructions = cs->instructions;
   }
-  json_decref (esc_methods);
 
   for (unsigned int j = 0; j < r->ri.dps_len; j++)
   {
     struct DecryptionPolicy *dp = &r->dps[j];
-
-    json_t *uuids = NULL;
+    const json_t *uuids;
     json_t *uuid;
     size_t n_index;
     struct GNUNET_JSON_Specification spec[] = {
@@ -879,22 +875,19 @@ policy_lookup_cb (void *cls,
                                 &dp->emk_size),
       GNUNET_JSON_spec_fixed_auto ("master_salt",
                                    &dp->master_salt),
-      GNUNET_JSON_spec_json ("uuids",
-                             &uuids),
+      GNUNET_JSON_spec_array_const ("uuids",
+                                    &uuids),
       GNUNET_JSON_spec_end ()
     };
 
     r->ri.dps[j] = &r->dps[j].pub_details;
-    if ( (GNUNET_OK !=
-          GNUNET_JSON_parse (json_array_get (dec_policies,
-                                             j),
-                             spec,
-                             NULL, NULL)) ||
-         (! json_is_array (uuids)) )
+    if (GNUNET_OK !=
+        GNUNET_JSON_parse (json_array_get (dec_policies,
+                                           j),
+                           spec,
+                           NULL, NULL))
     {
       GNUNET_break_op (0);
-      json_decref (uuids);
-      json_decref (dec_policies);
       r->csc (r->csc_cls,
               ANASTASIS_RS_POLICY_MALFORMED_JSON,
               NULL,
@@ -925,8 +918,6 @@ policy_lookup_cb (void *cls,
               sizeof (uuid))) )
       {
         GNUNET_break_op (0);
-        json_decref (dec_policies);
-        json_decref (uuids);
         r->csc (r->csc_cls,
                 ANASTASIS_RS_POLICY_MALFORMED_JSON,
                 NULL,
@@ -947,8 +938,6 @@ policy_lookup_cb (void *cls,
       if (! found)
       {
         GNUNET_break_op (0);
-        json_decref (dec_policies);
-        json_decref (uuids);
         r->csc (r->csc_cls,
                 ANASTASIS_RS_POLICY_MALFORMED_JSON,
                 NULL,
@@ -957,9 +946,7 @@ policy_lookup_cb (void *cls,
         return;
       }
     }
-    json_decref (uuids);
   }
-  json_decref (dec_policies);
   r->pc (r->pc_cls,
          &r->ri);
 }
@@ -1134,7 +1121,7 @@ ANASTASIS_recovery_serialize (const struct ANASTASIS_Recovery *r)
  */
 static enum GNUNET_GenericReturnValue
 parse_cs_array (struct ANASTASIS_Recovery *r,
-                json_t *cs_arr)
+                const json_t *cs_arr)
 {
   json_t *cs;
   unsigned int n_index;
@@ -1220,7 +1207,7 @@ parse_cs_array (struct ANASTASIS_Recovery *r,
  */
 static enum GNUNET_GenericReturnValue
 parse_dps_array (struct ANASTASIS_Recovery *r,
-                 json_t *dps_arr)
+                 const json_t *dps_arr)
 {
   json_t *dps;
   unsigned int n_index;
@@ -1239,15 +1226,15 @@ parse_dps_array (struct ANASTASIS_Recovery *r,
   json_array_foreach (dps_arr, n_index, dps)
   {
     struct DecryptionPolicy *dp = &r->dps[n_index];
-    json_t *challenges;
+    const json_t *challenges;
     struct GNUNET_JSON_Specification spec[] = {
       GNUNET_JSON_spec_varsize ("encrypted_master_key",
                                 &dp->emk,
                                 &dp->emk_size),
       GNUNET_JSON_spec_fixed_auto ("master_salt",
                                    &dp->master_salt),
-      GNUNET_JSON_spec_json ("challenges",
-                             &challenges),
+      GNUNET_JSON_spec_array_const ("challenges",
+                                    &challenges),
       GNUNET_JSON_spec_end ()
     };
     const char *err_json_name;
@@ -1270,12 +1257,6 @@ parse_dps_array (struct ANASTASIS_Recovery *r,
     }
     GNUNET_assert (NULL != dp->emk);
     GNUNET_assert (dp->emk_size > 0);
-    if (! json_is_array (challenges))
-    {
-      GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
-      return GNUNET_SYSERR;
-    }
     dp->pub_details.challenges_length = json_array_size (challenges);
     dp->pub_details.challenges = GNUNET_new_array (
       dp->pub_details.challenges_length,
@@ -1320,8 +1301,7 @@ parse_dps_array (struct ANASTASIS_Recovery *r,
         }
       }
     }
-    /* We don't free the spec, since we're still using dp->ems. */
-    json_decref (challenges);
+    /* Do NOT free the spec: we are still using dp->ems. */
   }
   return GNUNET_OK;
 }
@@ -1363,9 +1343,9 @@ ANASTASIS_recovery_deserialize (struct GNUNET_CURL_Context *ctx,
     const char *err_json_name;
     unsigned int err_line;
     uint32_t version;
-    json_t *dps_arr;
-    json_t *cs_arr;
-    json_t *id_data;
+    const json_t *dps_arr;
+    const json_t *cs_arr;
+    const json_t *id_data;
     const char *provider_url;
     const char *secret_name;
     void *ecs;
@@ -1381,12 +1361,12 @@ ANASTASIS_recovery_deserialize (struct GNUNET_CURL_Context *ctx,
         NULL),
       GNUNET_JSON_spec_uint32 ("version",
                                &version),
-      GNUNET_JSON_spec_json ("decryption_policies",
-                             &dps_arr),
-      GNUNET_JSON_spec_json ("challenges",
-                             &cs_arr),
-      GNUNET_JSON_spec_json ("id_data",
-                             &id_data),
+      GNUNET_JSON_spec_array_const ("decryption_policies",
+                                    &dps_arr),
+      GNUNET_JSON_spec_array_const ("challenges",
+                                    &cs_arr),
+      GNUNET_JSON_spec_object_const ("id_data",
+                                     &id_data),
       GNUNET_JSON_spec_varsize ("encrypted_core_secret",
                                 &ecs,
                                 &ecs_size),
@@ -1420,7 +1400,7 @@ ANASTASIS_recovery_deserialize (struct GNUNET_CURL_Context *ctx,
       GNUNET_JSON_parse_free (spec);
       return NULL;
     }
-    r->id_data = json_incref (id_data);
+    r->id_data = json_incref ((json_t *) id_data);
     r->provider_url = GNUNET_strdup (provider_url);
     if (NULL != secret_name)
       r->secret_name = GNUNET_strdup (secret_name);