[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] branch master updated: fix ftbfs
From: |
gnunet |
Subject: |
[taler-anastasis] branch master updated: fix ftbfs |
Date: |
Mon, 23 Mar 2020 10:24:44 +0100 |
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 b263e4b fix ftbfs
b263e4b is described below
commit b263e4bf5388a763d5dc591d0d11d89cc49d2f0e
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Mar 23 10:24:40 2020 +0100
fix ftbfs
---
src/include/anastasis_crypto_lib.h | 73 +++++++++++++++++++-------------------
1 file changed, 36 insertions(+), 37 deletions(-)
diff --git a/src/include/anastasis_crypto_lib.h
b/src/include/anastasis_crypto_lib.h
index 4031207..f9b2281 100644
--- a/src/include/anastasis_crypto_lib.h
+++ b/src/include/anastasis_crypto_lib.h
@@ -15,12 +15,11 @@
*/
#include "anastasis_service.h"
-#include "anastasis.h"
/**
* An EdDSA public key that is used to identify a user's account.
*/
- struct ANASTASIS_CRYPTO_AccountSignature
+struct ANASTASIS_CRYPTO_AccountSignature
{
struct GNUNET_CRYPTO_EddsaPublicKey pub;
};
@@ -70,7 +69,7 @@ struct ANASTASIS_CRYPTO_Nonce
*/
struct ANASTASIS_CRYPTO_Iv
{
- uint32_t iv[3];
+ uint32_t iv[3];
};
/**
@@ -112,7 +111,7 @@ ANASTASIS_CRYPTO_user_identifier_create (const json_t
*id_data);
*/
void
ANASTASIS_CRYPTO_user_identifier_destroy (
- struct ANASTASIS_CRYPTO_UserIdentifier *id);
+ struct ANASTASIS_CRYPTO_UserIdentifier *id);
/**
* Generates the eddsa public Key used as the account identifier on the
providers
@@ -121,7 +120,7 @@ ANASTASIS_CRYPTO_user_identifier_destroy (
*/
struct ANASTASIS_CRYPTO_AccountSignature *
ANASTASIS_CRYPTO_account_signature_create (
- const struct ANASTASIS_CRYPTO_UserIdentifier *id);
+ const struct ANASTASIS_CRYPTO_UserIdentifier *id);
/**
* Destroys an account signature
@@ -129,7 +128,7 @@ ANASTASIS_CRYPTO_account_signature_create (
*/
void
ANASTASIS_CRYPTO_account_signature_destroy (
- struct ANASTASIS_CRYPTO_AccountSignature *as);
+ struct ANASTASIS_CRYPTO_AccountSignature *as);
/**
* Encrypt and signs the recovery document with AES256, the recovery document
is
@@ -144,10 +143,10 @@ ANASTASIS_CRYPTO_account_signature_destroy (
*/
int
ANASTASIS_CRYPTO_recovery_document_encrypt (
- const struct ANASTASIS_RecoveryDocument *rd,
- const struct ANASTASIS_CRYPTO_UserIdentifier *id,
- void **res,
- size_t *res_size);
+ const struct ANASTASIS_RecoveryDocument *rd,
+ const struct ANASTASIS_CRYPTO_UserIdentifier *id,
+ void **res,
+ size_t *res_size);
/**
* Decrypts the recovery document with AES256, the decryption key is generated
with
@@ -161,9 +160,9 @@ ANASTASIS_CRYPTO_recovery_document_encrypt (
*/
struct ANASTASIS_RecoveryDocument *
ANASTASIS_CRYPTO_recovery_document_decrypt (
- const struct ANASTASIS_CRYPTO_UserIdentifier *id,
- const void *data,
- size_t data_size);
+ const struct ANASTASIS_CRYPTO_UserIdentifier *id,
+ const void *data,
+ size_t data_size);
/**
* Destroys a recovery document
@@ -171,7 +170,7 @@ ANASTASIS_CRYPTO_recovery_document_decrypt (
*/
void
ANASTASIS_CRYPTO_recovery_document_destroy (
- struct ANASTASIS_RecoveryDocument *rd);
+ struct ANASTASIS_RecoveryDocument *rd);
/**
@@ -184,8 +183,8 @@ ANASTASIS_CRYPTO_recovery_document_destroy (
*/
struct ANASTASIS_CRYPTO_EscrowMasterKey *
ANASTASIS_CRYPTO_escrow_master_key_create (
- const struct ANASTASIS_CRYPTO_KeyShare *key_shares,
- unsigned int keyshare_length);
+ const struct ANASTASIS_CRYPTO_KeyShare *key_shares,
+ unsigned int keyshare_length);
/**
* Destroys a escrow master key
@@ -193,7 +192,7 @@ ANASTASIS_CRYPTO_escrow_master_key_create (
*/
void
ANASTASIS_CRYPTO_escrow_master_key_destroy (
- struct ANASTASIS_CRYPTO_EscrowMasterKey *emk);
+ struct ANASTASIS_CRYPTO_EscrowMasterKey *emk);
/**
* Encrypts the master key of the user with the escrow master key with
AES256-GCM.
@@ -205,9 +204,9 @@ ANASTASIS_CRYPTO_escrow_master_key_destroy (
*/
struct ANASTASIS_CRYPTO_EncryptedMasterKey *
ANASTASIS_CRYPTO_master_key_encrypt (
- const struct ANASTASIS_CRYPTO_EscrowMasterKey *escrow_master_key,
- const void *data,
- size_t data_size);
+ const struct ANASTASIS_CRYPTO_EscrowMasterKey *escrow_master_key,
+ const void *data,
+ size_t data_size);
/**
* Decrypts the master key of the user with the escrow master key with
AES256-GCM and the provided
@@ -221,10 +220,10 @@ ANASTASIS_CRYPTO_master_key_encrypt (
*/
int
ANASTASIS_CRYPTO_master_key_decrypt (
- const struct ANASTASIS_CRYPTO_EscrowMasterKey *escrow_master_key,
- const struct ANASTASIS_CRYPTO_EncryptedMasterKey *encrypted_master_key,
- void **res,
- size_t *res_size);
+ const struct ANASTASIS_CRYPTO_EscrowMasterKey *escrow_master_key,
+ const struct ANASTASIS_CRYPTO_EncryptedMasterKey *encrypted_master_key,
+ void **res,
+ size_t *res_size);
/**
* Destroys an encrypted master key
@@ -232,7 +231,7 @@ ANASTASIS_CRYPTO_master_key_decrypt (
*/
void
ANASTASIS_CRYPTO_master_key_destroy (
- struct ANASTASIS_CRYPTO_EncryptedMasterKey *emk);
+ struct ANASTASIS_CRYPTO_EncryptedMasterKey *emk);
/**
* Encrypts a keyshare with a key generated with the user identification as
entropy and the salt "eks".
@@ -245,10 +244,10 @@ ANASTASIS_CRYPTO_master_key_destroy (
*/
int
ANASTASIS_CRYPTO_key_share_encrypt (
- const struct ANASTASIS_CRYPTO_KeyShare *key_share,
- const struct ANASTASIS_CRYPTO_UserIdentifier *id,
- void **res,
- void *res_size);
+ const struct ANASTASIS_CRYPTO_KeyShare *key_share,
+ const struct ANASTASIS_CRYPTO_UserIdentifier *id,
+ void **res,
+ void *res_size);
/**
* Decrypts a keyshare with a key generated with the user identification as
entropy and the salt "eks".
@@ -260,9 +259,9 @@ ANASTASIS_CRYPTO_key_share_encrypt (
*/
struct ANASTASIS_CRYPTO_KeyShare *
ANASTASIS_CRYPTO_key_share_decrypt (
- const struct ANASTASIS_CRYPTO_UserIdentifier *id,
- const void *data,
- size_t data_size);
+ const struct ANASTASIS_CRYPTO_UserIdentifier *id,
+ const void *data,
+ size_t data_size);
/**
* Destroys a key share
@@ -270,7 +269,7 @@ ANASTASIS_CRYPTO_key_share_decrypt (
*/
void
ANASTASIS_CRYPTO_key_share_destroy (
- struct ANASTASIS_CRYPTO_KeyShare *ks);
+ struct ANASTASIS_CRYPTO_KeyShare *ks);
/**
* Encrypts the truth data which contains the hashed answer or the phone
number..
@@ -286,10 +285,10 @@ ANASTASIS_CRYPTO_key_share_destroy (
*/
int
ANASTASIS_CRYPTO_truth_encrypt (
- const struct ANASTASIS_Truth *t,
- const struct ANASTASIS_CRYPTO_UserIdentifier *id,
- void **res,
- size_t *res_size);
+ const struct ANASTASIS_Truth *t,
+ const struct ANASTASIS_CRYPTO_UserIdentifier *id,
+ void **res,
+ size_t *res_size);
/*
struct ANASTASIS_CRYPTO_TruthKey *
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-anastasis] branch master updated: fix ftbfs,
gnunet <=