[taler-anastasis] branch master updated: adaptations for signing API change in GNUnet (#6164)

[gnunet]

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

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new 009658d  adaptations for signing API change in GNUnet (#6164)
009658d is described below

commit 009658dc04e6e8793d899ccb82bf59ca792ab941
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Apr 8 16:36:24 2020 +0200

    adaptations for signing API change in GNUnet (#6164)
---
 src/backend/anastasis-httpd_policy_upload.c | 13 +++++++------
 src/lib/anastasis_api_policy_lookup.c       | 11 ++++++-----
 src/lib/anastasis_api_policy_store.c        | 19 +++++++------------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/backend/anastasis-httpd_policy_upload.c 
b/src/backend/anastasis-httpd_policy_upload.c
index bfd0682..1a8ec67 100644
--- a/src/backend/anastasis-httpd_policy_upload.c
+++ b/src/backend/anastasis-httpd_policy_upload.c
@@ -791,15 +791,16 @@ AH_handler_policy_post (struct MHD_Connection *connection,
     }
     /* validate signature */
     {
-      struct ANASTASIS_UploadSignaturePS usp;
+      struct ANASTASIS_UploadSignaturePS usp = {
+        .purpose.size = htonl (sizeof (usp)),
+        .purpose.purpose = htonl (TALER_SIGNATURE_ANASTASIS_POLICY_UPLOAD),
+        .old_recovery_data_hash = puc->old_policy_upload_hash,
+        .new_recovery_data_hash = puc->new_policy_upload_hash
+      };
 
-      usp.purpose.size = htonl (sizeof (struct ANASTASIS_UploadSignaturePS));
-      usp.purpose.purpose = htonl (TALER_SIGNATURE_ANASTASIS_POLICY_UPLOAD);
-      usp.old_recovery_data_hash = puc->old_policy_upload_hash;
-      usp.new_recovery_data_hash = puc->new_policy_upload_hash;
       if (GNUNET_OK !=
           GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_ANASTASIS_POLICY_UPLOAD,
-                                      &usp.purpose,
+                                      &usp,
                                       &puc->account_sig.eddsa_sig,
                                       &accountPubP.pub))
       {
diff --git a/src/lib/anastasis_api_policy_lookup.c 
b/src/lib/anastasis_api_policy_lookup.c
index fc8bfbb..48c5dd5 100644
--- a/src/lib/anastasis_api_policy_lookup.c
+++ b/src/lib/anastasis_api_policy_lookup.c
@@ -131,11 +131,12 @@ handle_policy_lookup_finished (void *cls,
   case MHD_HTTP_OK:
     {
       struct ANASTASIS_DownloadDetails dd;
-      struct ANASTASIS_UploadSignaturePS usp;
+      struct ANASTASIS_UploadSignaturePS usp = {
+        .purpose.purpose = htonl (TALER_SIGNATURE_ANASTASIS_POLICY_UPLOAD),
+        .purpose.size = htonl (sizeof (usp)),
+        .old_recovery_data_hash = plo->anastasis_previous
+      };
 
-      usp.purpose.purpose = htonl (TALER_SIGNATURE_ANASTASIS_POLICY_UPLOAD);
-      usp.purpose.size = htonl (sizeof (struct ANASTASIS_UploadSignaturePS));
-      usp.old_recovery_data_hash = plo->anastasis_previous;
       GNUNET_CRYPTO_hash (data,
                           data_size,
                           &usp.new_recovery_data_hash);
@@ -148,7 +149,7 @@ handle_policy_lookup_finished (void *cls,
 
       if (GNUNET_OK !=
           GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_ANASTASIS_POLICY_UPLOAD,
-                                      &usp.purpose,
+                                      &usp,
                                       &plo->account_sig.eddsa_sig,
                                       &plo->account_pub.pub))
       {
diff --git a/src/lib/anastasis_api_policy_store.c 
b/src/lib/anastasis_api_policy_store.c
index e34d3d9..fb1738a 100644
--- a/src/lib/anastasis_api_policy_store.c
+++ b/src/lib/anastasis_api_policy_store.c
@@ -286,27 +286,22 @@ ANASTASIS_policy_store (struct GNUNET_CURL_Context *ctx,
 {
   struct ANASTASIS_PolicyStoreOperation *pso;
   struct ANASTASIS_AccountSignatureP account_sig;
-  struct ANASTASIS_UploadSignaturePS usp;
   CURL *eh;
   struct curl_slist *job_headers;
+  struct ANASTASIS_UploadSignaturePS usp = {
+    .purpose.purpose = htonl (TALER_SIGNATURE_ANASTASIS_POLICY_UPLOAD),
+    .purpose.size = htonl (sizeof (usp))
+  };
 
-  memset (&usp, 0, sizeof (usp));
-  usp.purpose.purpose = htonl (TALER_SIGNATURE_ANASTASIS_POLICY_UPLOAD);
-  usp.purpose.size = htonl (sizeof (usp));
   if (NULL != prev_recovery_data_hash)
     usp.old_recovery_data_hash = *prev_recovery_data_hash;
 
   GNUNET_CRYPTO_hash (recovery_data,
                       recovery_data_size,
                       &usp.new_recovery_data_hash);
-  if (GNUNET_OK !=
-      GNUNET_CRYPTO_eddsa_sign (&anastasis_priv->priv,
-                                &usp.purpose,
-                                &account_sig.eddsa_sig))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
+  GNUNET_CRYPTO_eddsa_sign (&anastasis_priv->priv,
+                            &usp,
+                            &account_sig.eddsa_sig);
   /* setup our HTTP headers */
   job_headers = NULL;
   {

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