[taler-anastasis] branch master updated: comments / fixes

[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 3314870  comments / fixes
3314870 is described below

commit 3314870d3b14bd0f530f63e46d9a40e1213e6541
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Jan 16 10:02:36 2020 +0100

    comments / fixes
---
 src/backend/anastasis-httpd_truth_upload.c |  1 +
 src/include/anastasis_crypto_lib.h         | 95 +++++++++++++++++-------------
 src/include/anastasis_service.h            |  2 -
 3 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/src/backend/anastasis-httpd_truth_upload.c 
b/src/backend/anastasis-httpd_truth_upload.c
index 9c84661..05a10da 100644
--- a/src/backend/anastasis-httpd_truth_upload.c
+++ b/src/backend/anastasis-httpd_truth_upload.c
@@ -57,6 +57,7 @@ verify_and_execute_truth (struct MHD_Connection *connection,
                         AH_truth_expiration);
 }
 
+
 /**
  * @param connection the MHD connection to handle
  * @param con_cls the connection's closure
diff --git a/src/include/anastasis_crypto_lib.h 
b/src/include/anastasis_crypto_lib.h
index 82f4276..4124670 100644
--- a/src/include/anastasis_crypto_lib.h
+++ b/src/include/anastasis_crypto_lib.h
@@ -1,6 +1,13 @@
 #include "anastasis_service.h"
 #include <uuid/uuid.h>
 
+struct TruthData
+{
+  const void *truth;
+  size_t truth_size;
+  const char *truth_mime;
+};
+
 
 struct ANASTASIS_CRYPTO_RecoveryDocument;
 
@@ -8,12 +15,17 @@ struct ANASTASIS_CRYPTO_EscrowMethod;
 
 struct ANASTASIS_CRYPTO_Policy;
 
-struct ANASTASIS_CRYPTO_Truth;
+// => high level API
+struct ANASTASIS_CRYPTO_TruthUploadRequest;
 
 struct ANASTASIS_CRYPTO_Encrypted_KeyShare;
 
 struct ANASTAIS_CRYPTO_Encrypted_Truth;
 
+struct ANASTASIS_CRYPTO_AccountSignatureP
+{
+  struct GNUNET_CRYPTO_EddsaSignatureP eddsa_sig;
+};
 
 struct ANASTASIS_CRYPTO_KeyShare
 {
@@ -76,25 +88,14 @@ ANASTASIS_CRYPTO_uid_hash (const json_t *id_data,
                            struct ANASTASIS_CRYPTO_UserIdentifier
                            *id);
 
-/**
- * Generates the eddsa Public Key
- * @param uid Hashed Userinput, used as entropy source for the key Generation
- * @return AccountPrivP the generated eddsa private Key
- */
-struct ANASTASIS_AccountPrivP *
-ANASTASIS_CRYPTO_privKey (const struct
-                          ANASTASIS_CRYPTO_UserIdentifier
-                          *uid);
-
 /**
  * Generates the eddsa public Key from the private Key
  * @param privP generated eddsa private key
  * @return AccountPrivP the generated eddsa private Key
  */
-struct ANASTASIS_AccountPubP *
-ANASTASIS_CRYPTO_pubKey (const struct
-                         ANASTASIS_AccountPrivP
-                         *privP);
+void
+ANASTASIS_CRYPTO_pubKey (const struct ANASTASIS_CRYPTO_UserIdentifier *id,
+                         struct ANASTASIS_AccountPubP *pub);
 
 /**
  * Encrypts the Recoverydocument
@@ -111,7 +112,10 @@ ANASTASIS_CRYPTO_recovery_document_encrypt (const struct
                                             const struct
                                             ANASTASIS_CRYPTO_UserIdentifier 
*id,
                                             void **res,
-                                            size_t *res_size);
+                                            size_t *res_size,
+                                            struct
+                                            ANASTASIS_CRYPTO_AccountSignatureP 
*
+                                            sig);
 
 /**
  * Encrypts the Recoverydocument
@@ -166,28 +170,29 @@ ANASTASIS_CRYPTO_escrow_method_create (const char 
*base_url,
 struct ANASTASIS_CRYPTO_RecoveryDocument *
 ANASTASIS_CRYPTO_recovery_document_create (struct
                                            ANASTASIS_CRYPTO_EscrowMethod *
-                                           escrowMethod,
-                                           unsigned int method_lenght,
+                                           escrow_methods,
+                                           unsigned int escrow_methods_length,
                                            struct
                                            ANASTASIS_CRYPTO_Policy *
-                                           policy,
-                                           unsigned int policy_lenght);
-
-struct ANASTASIS_CRYPTO_Truth *
-ANASTASIS_CRYPTO_truth_create (struct
-                               ANASTASIS_CRYPTO_Encrypted_KeyShare *
-                               encryptedKeyShare,
-                               const char *method,
-                               struct
-                               ANASTASIS_CRYPTO_Nonce *
-                               nonce,
-                               struct
-                               ANASTASIS_CRYPTO_AES_Tag *
-                               aesTag,
-                               struct
-                               ANASTAIS_CRYPTO_Encrypted_Truth *
-                               truth,
-                               const char *truth_mime);
+                                           policies,
+                                           unsigned int policies_length);
+
+struct ANASTASIS_CRYPTO_TruthUploadRequest *
+ANASTASIS_CRYPTO_truth_upload_request_create (struct
+                                              
ANASTASIS_CRYPTO_Encrypted_KeyShare
+                                              *
+                                              encryptedKeyShare,
+                                              const char *method,
+                                              struct
+                                              ANASTASIS_CRYPTO_Nonce *
+                                              nonce,
+                                              struct
+                                              ANASTASIS_CRYPTO_AES_Tag *
+                                              aesTag,
+                                              struct
+                                              ANASTAIS_CRYPTO_Encrypted_Truth *
+                                              truth,
+                                              const char *truth_mime);
 
 
 struct ANASTASIS_CRYPTO_Encrypted_KeyShare *
@@ -202,12 +207,16 @@ ANASTASIS_CRYPTO_encrypted_keyshare_create (struct
                                             keyShare);
 
 
-struct ANASTAIS_CRYPTO_Encrypted_Truth *
-ANASTASIS_CRYPTO_encrypted_truth_create (void *truth,
-                                         size_t truth_size,
-                                         char *truth_mime);
+struct TruthData *
+ANASTASIS_CRYPTO_truth_decrypt (const struct
+                                ANASTAIS_CRYPTO_Encrypted_Truth *et,
+                                const struct ANASTASIS_CRYPTO_truth_key *tk);
 
 
+const struct ANASTAIS_CRYPTO_Encrypted_Truth *
+ANASTASIS_CRYPTO_truth_encrypt (struct TruthData *td,
+                                const struct ANASTASIS_CRYPTO_truth_key *tk);
+
 
 void
 ANASTASIS_CRYPTO_recovery_document_destroy (struct
@@ -220,13 +229,15 @@ ANASTASIS_CRYPTO_escrow_method_destroy (struct
 void
 ANASTASIS_CRYPTO_policy_destroy (struct
                                  ANASTASIS_CRYPTO_Policy *p);
+
 void
-ANASTASIS_CRYPTO_truth_destroy (struct
-                                ANASTASIS_CRYPTO_Truth *p);
+ANASTASIS_CRYPTO_truth_destroy (struct ANASTASIS_CRYPTO_TruthUploadRequest *p);
+
 void
 ANASTASIS_CRYPTO_encrypted_keyshare_destroy (struct
                                              
ANASTASIS_CRYPTO_Encrypted_KeyShare
                                              *p);
+
 void
 ANASTASIS_CRYPTO_encrypted_truth_destroy (struct
                                           ANASTAIS_CRYPTO_Encrypted_Truth *p);
diff --git a/src/include/anastasis_service.h b/src/include/anastasis_service.h
index 6dc8477..1920e81 100644
--- a/src/include/anastasis_service.h
+++ b/src/include/anastasis_service.h
@@ -393,8 +393,6 @@ ANASTASIS_policy_store_cancel (struct
                                ANASTASIS_PolicyStoreOperation *pso);
 
 
-
-
 /****** TRUTH API ******/
 
 /**

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