-rename fest for #7045

2 files changed, 35 insertions, 35 deletions

diff --git a/src/lib/anastasis_backup.c b/src/lib/anastasis_backup.c
index 466dbe8..24d9643 100644
--- a/src/lib/anastasis_backup.c
+++ b/src/lib/anastasis_backup.c
@@ -55,7 +55,7 @@ struct ANASTASIS_Truth
   /**
    * Server salt used to derive hash from security answer
    */
-  struct ANASTASIS_CRYPTO_QuestionSaltP salt;
+  struct ANASTASIS_CRYPTO_QuestionSaltP question_salt;
 
   /**
    * Url of the server
@@ -107,8 +107,8 @@ ANASTASIS_truth_from_json (const json_t *json)
                                  &t->key_share),
     GNUNET_JSON_spec_fixed_auto ("truth_key",
                                  &t->truth_key),
-    GNUNET_JSON_spec_fixed_auto ("salt",
-                                 &t->salt),
+    GNUNET_JSON_spec_fixed_auto ("question_salt",
+                                 &t->question_salt),
     GNUNET_JSON_spec_fixed_auto ("provider_salt",
                                  &t->provider_salt),
     GNUNET_JSON_spec_end ()
@@ -142,8 +142,8 @@ ANASTASIS_truth_to_json (const struct ANASTASIS_Truth *t)
                                 &t->key_share),
     GNUNET_JSON_pack_data_auto ("truth_key",
                                 &t->truth_key),
-    GNUNET_JSON_pack_data_auto ("salt",
-                                &t->salt),
+    GNUNET_JSON_pack_data_auto ("question_salt",
+                                &t->question_salt),
     GNUNET_JSON_pack_data_auto ("nonce",
                                 &t->nonce),
     GNUNET_JSON_pack_data_auto ("provider_salt",
@@ -252,7 +252,7 @@ ANASTASIS_truth_upload3 (struct GNUNET_CURL_Context *ctx,
                              truth_data_size);
     ANASTASIS_CRYPTO_secure_answer_hash (answer,
                                          &t->uuid,
-                                         &t->salt,
+                                         &t->question_salt,
                                          &nt);
     ANASTASIS_CRYPTO_keyshare_encrypt (&t->key_share,
                                        &tu->id,
@@ -314,7 +314,7 @@ ANASTASIS_truth_upload2 (
   struct GNUNET_TIME_Relative pay_timeout,
   const struct ANASTASIS_CRYPTO_NonceP *nonce,
   const struct ANASTASIS_CRYPTO_TruthUUIDP *uuid,
-  const struct ANASTASIS_CRYPTO_QuestionSaltP *salt,
+  const struct ANASTASIS_CRYPTO_QuestionSaltP *question_salt,
   const struct ANASTASIS_CRYPTO_TruthKeyP *truth_key,
   const struct ANASTASIS_CRYPTO_KeyShareP *key_share,
   ANASTASIS_TruthCallback tc,
@@ -332,7 +332,7 @@ ANASTASIS_truth_upload2 (
                  ? GNUNET_strdup (mime_type)
                  : NULL;
   t->provider_salt = *provider_salt;
-  t->salt = *salt;
+  t->question_salt = *question_salt;
   t->nonce = *nonce;
   t->uuid = *uuid;
   t->truth_key = *truth_key;
@@ -443,7 +443,7 @@ struct ANASTASIS_Policy
   /**
    * Salt used to encrypt the master key
    */
-  struct ANASTASIS_CRYPTO_MasterSaltP salt;
+  struct ANASTASIS_CRYPTO_MasterSaltP master_salt;
 
   /**
    * Array of truths
@@ -487,8 +487,8 @@ ANASTASIS_policy_create (const struct ANASTASIS_Truth *truths[],
 
   p = GNUNET_new (struct ANASTASIS_Policy);
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
-                              &p->salt,
-                              sizeof (p->salt));
+                              &p->master_salt,
+                              sizeof (p->master_salt));
   {
     struct ANASTASIS_CRYPTO_KeyShareP key_shares[truths_len];
 
@@ -496,7 +496,7 @@ ANASTASIS_policy_create (const struct ANASTASIS_Truth *truths[],
       key_shares[i] = truths[i]->key_share;
     ANASTASIS_CRYPTO_policy_key_derive (key_shares,
                                         truths_len,
-                                        &p->salt,
+                                        &p->master_salt,
                                         &p->policy_key);
   }
   p->truths = GNUNET_new_array (truths_len,
@@ -542,7 +542,7 @@ struct PolicyStoreState
    * Server salt. Points into a truth object from which we got the
    * salt.
    */
-  struct ANASTASIS_CRYPTO_ProviderSaltP server_salt;
+  struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt;
 
   /**
    * The /policy POST operation handle.
@@ -785,8 +785,8 @@ ANASTASIS_secret_share (struct GNUNET_CURL_Context *ctx,
                                                       [k]),
                        GNUNET_JSON_pack_array_steal ("uuids",
                                                      uuids),
-                       GNUNET_JSON_pack_data_auto ("salt",
-                                                   &policy->salt))));
+                       GNUNET_JSON_pack_data_auto ("master_salt",
+                                                   &policy->master_salt))));
   }
 
   esc_methods = json_array ();
@@ -830,8 +830,8 @@ ANASTASIS_secret_share (struct GNUNET_CURL_Context *ctx,
                                                   pt->instructions),
                          GNUNET_JSON_pack_data_auto ("truth_key",
                                                      &pt->truth_key),
-                         GNUNET_JSON_pack_data_auto ("truth_salt",
-                                                     &pt->salt),
+                         GNUNET_JSON_pack_data_auto ("question_salt",
+                                                     &pt->question_salt),
                          GNUNET_JSON_pack_data_auto ("provider_salt",
                                                      &pt->provider_salt),
                          GNUNET_JSON_pack_string ("escrow_type",
@@ -915,10 +915,10 @@ ANASTASIS_secret_share (struct GNUNET_CURL_Context *ctx,
 
     pss->ss = ss;
     pss->anastasis_url = GNUNET_strdup (providers[l].provider_url);
-    pss->server_salt = providers[l].provider_salt;
+    pss->provider_salt = providers[l].provider_salt;
     pss->payment_secret = providers[l].payment_secret;
     ANASTASIS_CRYPTO_user_identifier_derive (id_data,
-                                             &pss->server_salt,
+                                             &pss->provider_salt,
                                              &pss->id);
     ANASTASIS_CRYPTO_recovery_metadata_encrypt (&pss->id,
                                                 meta,
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 ()