-server_salt is now provider_salt

5 files changed, 22 insertions, 19 deletions

diff --git a/src/include/anastasis_crypto_lib.h b/src/include/anastasis_crypto_lib.h
index da60630..648a8eb 100644
--- a/src/include/anastasis_crypto_lib.h
+++ b/src/include/anastasis_crypto_lib.h
@@ -301,13 +301,13 @@ ANASTASIS_hash_answer (uint64_t code,
  * data.
  *
  * @param id_data JSON encoded data, which contains the raw user secret
- * @param server_salt salt from the server (escrow provider)
+ * @param provider_salt salt from the server (escrow provider)
  * @param[out] id reference to the id which was created
  */
 void
 ANASTASIS_CRYPTO_user_identifier_derive (
   const json_t *id_data,
-  const struct ANASTASIS_CRYPTO_ProviderSaltP *server_salt,
+  const struct ANASTASIS_CRYPTO_ProviderSaltP *provider_salt,
   struct ANASTASIS_CRYPTO_UserIdentifierP *id);
 
 
diff --git a/src/restclient/anastasis_api_config.c b/src/restclient/anastasis_api_config.c
index dab63f7..7f5e630 100644
--- a/src/restclient/anastasis_api_config.c
+++ b/src/restclient/anastasis_api_config.c
@@ -129,6 +129,9 @@ handle_config_finished (void *cls,
                              NULL, NULL))
       {
         GNUNET_break_op (0);
+        json_dumpf (json,
+                    stderr,
+                    JSON_INDENT (2));
         response_code = 0;
         break;
       }
diff --git a/src/util/anastasis-crypto-tvg.c b/src/util/anastasis-crypto-tvg.c
index a14e045..d5fc4c1 100644
--- a/src/util/anastasis-crypto-tvg.c
+++ b/src/util/anastasis-crypto-tvg.c
@@ -338,7 +338,7 @@ output_vectors ()
 
   {
     json_t *vec = vec_for (vecs, "user_identifier_derive");
-    struct ANASTASIS_CRYPTO_ProviderSaltP server_salt;
+    struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt;
     struct ANASTASIS_CRYPTO_UserIdentifierP id;
     json_t *id_data = json_pack ("{s:s, s:s}",
                                  "name",
@@ -346,13 +346,13 @@ output_vectors ()
                                  "ssn",
                                  "AB123");
     GNUNET_assert (NULL != id_data);
-    random_auto (&server_salt);
+    random_auto (&provider_salt);
 
     ANASTASIS_CRYPTO_user_identifier_derive (id_data,
-                                             &server_salt,
+                                             &provider_salt,
                                              &id);
     json_object_set_new (vec, "input_id_data", id_data);
-    d2j_auto (vec, "input_server_salt", &server_salt);
+    d2j_auto (vec, "input_provider_salt", &provider_salt);
     d2j_auto (vec, "output_id", &id);
   }
 
diff --git a/src/util/anastasis_crypto.c b/src/util/anastasis_crypto.c
index 3ab8227..579f097 100644
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@ -216,7 +216,7 @@ anastasis_decrypt (const void *key,
 void
 ANASTASIS_CRYPTO_user_identifier_derive (
   const json_t *id_data,
-  const struct ANASTASIS_CRYPTO_ProviderSaltP *server_salt,
+  const struct ANASTASIS_CRYPTO_ProviderSaltP *provider_salt,
   struct ANASTASIS_CRYPTO_UserIdentifierP *id)
 {
   char *json_enc;
@@ -225,7 +225,7 @@ ANASTASIS_CRYPTO_user_identifier_derive (
   json_enc = json_dumps (id_data,
                          JSON_COMPACT | JSON_SORT_KEYS);
   GNUNET_assert (NULL != json_enc);
-  GNUNET_CRYPTO_pow_hash (&server_salt->salt,
+  GNUNET_CRYPTO_pow_hash (&provider_salt->salt,
                           json_enc,
                           strlen (json_enc),
                           &hash);
diff --git a/src/util/test_anastasis_crypto.c b/src/util/test_anastasis_crypto.c
index 6b292a0..6132e35 100644
--- a/src/util/test_anastasis_crypto.c
+++ b/src/util/test_anastasis_crypto.c
@@ -41,11 +41,11 @@ test_user_identifier_derive (void)
   struct ANASTASIS_CRYPTO_UserIdentifierP id_1;
   struct ANASTASIS_CRYPTO_UserIdentifierP id_2;
   struct ANASTASIS_CRYPTO_UserIdentifierP id_3;
-  struct ANASTASIS_CRYPTO_ProviderSaltP server_salt;
+  struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt;
 
   char *salt_str = "Server-Salt-Test";
 
-  GNUNET_memcpy (&server_salt,
+  GNUNET_memcpy (&provider_salt,
                  salt_str,
                  strlen (salt_str));
   // sample data 1
@@ -59,13 +59,13 @@ test_user_identifier_derive (void)
   json_object_set_new (id_data_3, "arg1", json_string ("Hallo2"));
 
   ANASTASIS_CRYPTO_user_identifier_derive (id_data_1,
-                                           &server_salt,
+                                           &provider_salt,
                                            &id_1);
   ANASTASIS_CRYPTO_user_identifier_derive (id_data_2,
-                                           &server_salt,
+                                           &provider_salt,
                                            &id_2);
   ANASTASIS_CRYPTO_user_identifier_derive (id_data_3,
-                                           &server_salt,
+                                           &provider_salt,
                                            &id_3);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "UserIdentifier_1: %s\n",
@@ -97,19 +97,19 @@ test_recovery_document (void)
   void *plaintext;
   size_t size_plaintext;
   struct ANASTASIS_CRYPTO_UserIdentifierP id;
-  struct ANASTASIS_CRYPTO_ProviderSaltP server_salt;
+  struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt;
   int ret;
 
   json_t *id_data = json_object ();
   const char *test = "TEST_ERD";
   char *salt_str = "Server-Salt-Test";
 
-  GNUNET_memcpy (&server_salt,
+  GNUNET_memcpy (&provider_salt,
                  salt_str,
                  strlen (salt_str));
   json_object_set_new (id_data, "arg1", json_string ("ID_DATA"));
   ANASTASIS_CRYPTO_user_identifier_derive (id_data,
-                                           &server_salt,
+                                           &provider_salt,
                                            &id);
   ANASTASIS_CRYPTO_recovery_document_encrypt (&id,
                                               test,
@@ -296,17 +296,17 @@ test_public_key_derive (void)
 {
   struct ANASTASIS_CRYPTO_UserIdentifierP id;
   struct ANASTASIS_CRYPTO_AccountPublicKeyP pub_key;
-  struct ANASTASIS_CRYPTO_ProviderSaltP server_salt;
+  struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt;
   json_t *id_data = json_object ();
   const char *salt_str = "Server-Salt-Test";
 
-  GNUNET_memcpy (&server_salt,
+  GNUNET_memcpy (&provider_salt,
                  salt_str,
                  strlen (salt_str));
 
   json_object_set_new (id_data, "arg1", json_string ("ID_DATA"));
   ANASTASIS_CRYPTO_user_identifier_derive (id_data,
-                                           &server_salt,
+                                           &provider_salt,
                                            &id);
 
   ANASTASIS_CRYPTO_account_public_key_derive (&id,