[taler-anastasis] 02/02: fix

[gnunet]

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

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

commit a5b4c84ec0ab01f67a9d7954c4b25f5c23eee736
Author: Dennis Neufeld <address@hidden>
AuthorDate: Thu Apr 30 09:17:35 2020 +0000

    fix
---
 src/backend/anastasis-httpd_salt.c     |  2 +-
 src/lib/testing_api_cmd_policy_store.c |  4 +++-
 src/util/anastasis_crypto.c            | 31 +++++++++++++++----------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/backend/anastasis-httpd_salt.c 
b/src/backend/anastasis-httpd_salt.c
index 4c0c47a..99099cc 100644
--- a/src/backend/anastasis-httpd_salt.c
+++ b/src/backend/anastasis-httpd_salt.c
@@ -51,7 +51,7 @@ AH_handler_salt (struct MHD_Connection *connection,
 
   return TALER_MHD_reply_json_pack (connection,
                                     MHD_HTTP_OK,
-                                    "{s:O}",
+                                    "{s:o}",
                                     "server_salt",
                                     GNUNET_JSON_from_data_auto (&salt));
 }
\ No newline at end of file
diff --git a/src/lib/testing_api_cmd_policy_store.c 
b/src/lib/testing_api_cmd_policy_store.c
index ca1ad3d..f078f6d 100644
--- a/src/lib/testing_api_cmd_policy_store.c
+++ b/src/lib/testing_api_cmd_policy_store.c
@@ -20,7 +20,9 @@
 /**
  * @file lib/testing_api_cmd_policy_store.c
  * @brief command to execute the anastasis backend service.
- * @author Marcello Stanisci
+ * @author Christian Grothoff
+ * @author Dominik Meister
+ * @author Dennis Neufeld
  */
 
 #include "platform.h"
diff --git a/src/util/anastasis_crypto.c b/src/util/anastasis_crypto.c
index 8dfe23f..fab1c96 100644
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@ -314,7 +314,7 @@ anastasis_decrypt (const void *key,
  * for the public and private key for signing the data.
  * @param id_data JSON encoded data, which contains the raw user secret
  * @param server_salt salt from the server (escrow provider)
- * @param id[out] reference to the id which was created
+ * @param[out] id reference to the id which was created
  */
 void
 ANASTASIS_CRYPTO_user_identifier_derive (
@@ -323,21 +323,20 @@ ANASTASIS_CRYPTO_user_identifier_derive (
   struct ANASTASIS_CRYPTO_UserIdentifierP *id)
 {
   char *json_enc;
-  json_enc = json_dumps (id_data, 0);
-  if (0 !=
-      gcry_kdf_derive (json_enc,
-                       strlen (json_enc),
-                       GCRY_KDF_SCRYPT,
-                       1, // subalgo
-                       server_salt,
-                       sizeof (*server_salt),
-                       SCRYPT_ITERATION, // iterations
-                       sizeof (struct ANASTASIS_CRYPTO_UserIdentifierP),
-                       id))
-  {
-    GNUNET_break (0);
-    return;
-  }
+  json_enc = json_dumps (id_data,
+                         JSON_SORT_KEYS);
+  GNUNET_assert (NULL != json_enc);
+  GNUNET_assert (0 ==
+                 gcry_kdf_derive (json_enc,
+                                  strlen (json_enc),
+                                  GCRY_KDF_SCRYPT,
+                                  1, // subalgo
+                                  server_salt,
+                                  sizeof (*server_salt),
+                                  SCRYPT_ITERATION, // iterations
+                                  sizeof (struct
+                                          ANASTASIS_CRYPTO_UserIdentifierP),
+                                  id));
   free (json_enc);
 }
 

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