[taler-anastasis] branch master updated (7737a00 -> a5b4c84)

[gnunet]

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

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

    from 7737a00  keyshare lookup
     new f2f380e  FIXME
     new a5b4c84  fix

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/backend/anastasis-httpd_salt.c     |  2 +-
 src/lib/anastasis.c                    | 12 ++++++++----
 src/lib/testing_api_cmd_policy_store.c |  4 +++-
 src/util/anastasis_crypto.c            | 31 +++++++++++++++----------------
 4 files changed, 27 insertions(+), 22 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/anastasis.c b/src/lib/anastasis.c
index df62d8c..1d98ceb 100644
--- a/src/lib/anastasis.c
+++ b/src/lib/anastasis.c
@@ -26,6 +26,7 @@
 
 
 /**
+ * FIXME: Needed?
  * State for a "salt" CMD.
  */
 struct SaltState
@@ -53,6 +54,7 @@ struct SaltState
 
 
 /**
+ * FIXME: Needed?
  * Function called with the results of a #ANASTASIS_salt().
  *
  * @param cls closure
@@ -93,6 +95,7 @@ salt_cb (void *cls,
 
 
 /**
+ * FIXME: Needed?
  * Free the state of a "salt" CMD, and possibly
  * cancel it if it did not complete.
  *
@@ -765,7 +768,7 @@ ANASTASIS_truth_upload (struct GNUNET_CURL_Context *ctx,
 
   tu = GNUNET_new (struct ANASTASIS_TruthUpload);
   t = GNUNET_new (struct ANASTASIS_Truth);
-  // ss = GNUNET_new (struct SaltState);
+  // ss = GNUNET_new (struct SaltState); FIXME: Needed?
   tu->tc_cls = tc_cls;
   tu->tpc_cls = tpc_cls;
   tu->tpc = tpc;
@@ -778,6 +781,7 @@ ANASTASIS_truth_upload (struct GNUNET_CURL_Context *ctx,
   uuid_generate (t->uuid);
 
   /*
+  FIXME: Needed?
   ss->http_status = MHD_HTTP_OK;
   ss->so = ANASTASIS_salt (tu->ctx,
                            provider_url,
@@ -832,9 +836,9 @@ ANASTASIS_truth_upload (struct GNUNET_CURL_Context *ctx,
                                   &encrypted_truth,
                                   &encrypted_truth_size);
 
-  truth = json_pack ("{s:o," /* encrypted KeyShare */
+  truth = json_pack ("{s:O," /* encrypted KeyShare */
                      " s:s," /* method */
-                     " s:o," /* nonce */
+                     " s:O," /* nonce */
                      " s:s}", /* truth_mime */
                      "keyshare_data", GNUNET_JSON_from_data_auto (
                        encrypted_key_share),
@@ -855,7 +859,7 @@ ANASTASIS_truth_upload (struct GNUNET_CURL_Context *ctx,
                                    tu->paid_order_id,
                                    &truth_store_callback,
                                    tu);
-  // salt_cleanup (ss);
+  // salt_cleanup (ss); FIXME: Needed?
   // SETUP TRUTH CALLBACK
   tu->tc = tc;
   tu->tc_cls = tc_cls;
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.