1 files changed, 16 insertions, 16 deletions

diff --git a/src/lib/anastasis_recovery.c b/src/lib/anastasis_recovery.c
index c425398..95c131d 100644
--- a/src/lib/anastasis_recovery.c
+++ b/src/lib/anastasis_recovery.c
@@ -47,7 +47,7 @@ struct ANASTASIS_Challenge
   /**
    * Salt; used to derive hash from security question answers.
    */
-  struct ANASTASIS_CRYPTO_QuestionSaltP salt;
+  struct ANASTASIS_CRYPTO_QuestionSaltP question_salt;
 
   /**
    * Provider salt; used to derive our key material from our identity
@@ -146,7 +146,7 @@ struct DecryptionPolicy
   /**
    * Salt used to decrypt master key.
    */
-  struct ANASTASIS_CRYPTO_MasterSaltP salt;
+  struct ANASTASIS_CRYPTO_MasterSaltP master_salt;
 
 };
 
@@ -437,7 +437,7 @@ truth_solve_cb (void *cls,
           key_shares[l] = recovery->solved_challenges[m]->key_share;
     ANASTASIS_CRYPTO_policy_key_derive (key_shares,
                                         rdps->pub_details.challenges_length,
-                                        &rdps->salt,
+                                        &rdps->master_salt,
                                         &policy_key);
     GNUNET_assert (NULL != rdps->emk);
     GNUNET_assert (rdps->emk_size > 0);
@@ -552,7 +552,7 @@ ANASTASIS_challenge_answer (
   c->answer = GNUNET_strdup (answer_str);
   ANASTASIS_CRYPTO_secure_answer_hash (answer_str,
                                        &c->ci.uuid,
-                                       &c->salt,
+                                       &c->question_salt,
                                        &hashed_answer);
   return ANASTASIS_challenge_answer3 (c,
                                       psp,
@@ -824,8 +824,8 @@ policy_lookup_cb (void *cls,
                                &instructions),
       GNUNET_JSON_spec_fixed_auto ("truth_key",
                                    &cs->truth_key),
-      GNUNET_JSON_spec_fixed_auto ("truth_salt",
-                                   &cs->salt),
+      GNUNET_JSON_spec_fixed_auto ("question_salt",
+                                   &cs->question_salt),
       GNUNET_JSON_spec_fixed_auto ("provider_salt",
                                    &cs->provider_salt),
       GNUNET_JSON_spec_string ("escrow_type",
@@ -871,8 +871,8 @@ policy_lookup_cb (void *cls,
       GNUNET_JSON_spec_varsize ("master_key",
                                 &dp->emk,
                                 &dp->emk_size),
-      GNUNET_JSON_spec_fixed_auto ("salt",
-                                   &dp->salt),
+      GNUNET_JSON_spec_fixed_auto ("master_salt",
+                                   &dp->master_salt),
       GNUNET_JSON_spec_json ("uuids",
                              &uuids),
       GNUNET_JSON_spec_end ()
@@ -1048,8 +1048,8 @@ ANASTASIS_recovery_serialize (const struct ANASTASIS_Recovery *r)
       GNUNET_JSON_pack_data_varsize ("emk",
                                      dp->emk,
                                      dp->emk_size),
-      GNUNET_JSON_pack_data_auto ("salt",
-                                  &dp->salt),
+      GNUNET_JSON_pack_data_auto ("master_salt",
+                                  &dp->master_salt),
       GNUNET_JSON_pack_array_steal ("challenges",
                                     c_arr));
     GNUNET_assert (0 ==
@@ -1070,8 +1070,8 @@ ANASTASIS_recovery_serialize (const struct ANASTASIS_Recovery *r)
                                ANASTASIS_CRYPTO_uuid2s (&c->ci.uuid)),
       GNUNET_JSON_pack_data_auto ("truth_key",
                                   &c->truth_key),
-      GNUNET_JSON_pack_data_auto ("salt",
-                                  &c->salt),
+      GNUNET_JSON_pack_data_auto ("question_salt",
+                                  &c->question_salt),
       GNUNET_JSON_pack_data_auto ("provider_salt",
                                   &c->provider_salt),
       GNUNET_JSON_pack_allow_null (
@@ -1159,8 +1159,8 @@ parse_cs_array (struct ANASTASIS_Recovery *r,
                                &instructions),
       GNUNET_JSON_spec_fixed_auto ("truth_key",
                                    &c->truth_key),
-      GNUNET_JSON_spec_fixed_auto ("salt",
-                                   &c->salt),
+      GNUNET_JSON_spec_fixed_auto ("question_salt",
+                                   &c->question_salt),
       GNUNET_JSON_spec_fixed_auto ("provider_salt",
                                    &c->provider_salt),
       GNUNET_JSON_spec_string ("type",
@@ -1235,8 +1235,8 @@ parse_dps_array (struct ANASTASIS_Recovery *r,
       GNUNET_JSON_spec_varsize ("emk",
                                 &dp->emk,
                                 &dp->emk_size),
-      GNUNET_JSON_spec_fixed_auto ("salt",
-                                   &dp->salt),
+      GNUNET_JSON_spec_fixed_auto ("master_salt",
+                                   &dp->master_salt),
       GNUNET_JSON_spec_json ("challenges",
                              &challenges),
       GNUNET_JSON_spec_end ()