[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] branch master updated: refactor truth key and includes
|
From: |
gnunet |
|
Subject: |
[taler-anastasis] branch master updated: refactor truth key and includes |
|
Date: |
Tue, 31 Mar 2020 15:42:22 +0200 |
This is an automated email from the git hooks/post-receive script.
ds-meister pushed a commit to branch master
in repository anastasis.
The following commit(s) were added to refs/heads/master by this push:
new e25acf9 refactor truth key and includes
e25acf9 is described below
commit e25acf9aa16698b212b554b362324d89335e6483
Author: Dominik Meister <address@hidden>
AuthorDate: Tue Mar 31 15:42:09 2020 +0200
refactor truth key and includes
---
src/include/anastasis_service.h | 10 ++++++----
src/include/anastasis_testing_lib.h | 5 +++--
src/lib/anastasis.c | 1 -
src/lib/anastasis_api_keyshare_lookup.c | 4 ++--
src/lib/testing_api_cmd_policy_lookup.c | 1 -
src/lib/testing_api_cmd_policy_store.c | 1 -
src/lib/testing_api_cmd_truth_store.c | 1 -
src/lib/testing_api_trait_account_priv.c | 1 -
src/lib/testing_api_trait_account_pub.c | 1 -
src/lib/testing_api_trait_hash.c | 1 -
src/lib/testing_api_trait_payment_identifier.c | 1 -
src/stasis/plugin_anastasis_postgres.c | 18 +++++++++++-------
src/stasis/test_anastasis_db.c | 4 ++--
13 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/src/include/anastasis_service.h b/src/include/anastasis_service.h
index 90d4392..4aa0d63 100644
--- a/src/include/anastasis_service.h
+++ b/src/include/anastasis_service.h
@@ -293,7 +293,8 @@ typedef void
struct ANASTASIS_PolicyLookupOperation *
ANASTASIS_policy_lookup (struct GNUNET_CURL_Context *ctx,
const char *backend_url,
- const struct ANASTASIS_AccountPubP *anastasis_pub,
+ const struct
+ ANASTASIS_CRYPTO_AccountPublicKey *anastasis_pub,
ANASTASIS_PolicyLookupCallback cb,
void *cb_cls);
@@ -312,7 +313,8 @@ struct ANASTASIS_PolicyLookupOperation *
ANASTASIS_policy_lookup_version (struct GNUNET_CURL_Context *ctx,
const char *backend_url,
const struct
- ANASTASIS_AccountPubP *anastasis_pub,
+ ANASTASIS_CRYPTO_AccountPublicKey *
+ anastasis_pub,
ANASTASIS_PolicyLookupCallback cb,
void *cb_cls,
uint32_t *version);
@@ -368,7 +370,7 @@ struct ANASTASIS_PolicyStoreOperation *
ANASTASIS_policy_store (struct GNUNET_CURL_Context *ctx,
const char *backend_url,
const struct
- ANASTASIS_AccountPrivP *anastasis_priv,
+ ANASTASIS_CRYPTO_AccountPrivateKey *anastasis_priv,
const struct
GNUNET_HashCode *prev_recovery_data_hash,
const void *recovery_data,
@@ -426,7 +428,7 @@ struct ANASTASIS_KeyShareLookupOperation *
ANASTASIS_key_share_lookup (struct GNUNET_CURL_Context *ctx,
const char *backend_url,
uuid_t *truth_uuid,
- const struct ANASTASIS_TruthKey *truth_key,
+ const struct ANASTASIS_CRYPTO_TruthKey *truth_key,
const struct GNUNET_HashCode *hashed_answer,
ANASTASIS_KeyShareLookupCallback cb,
void *cb_cls);
diff --git a/src/include/anastasis_testing_lib.h
b/src/include/anastasis_testing_lib.h
index 7d1b980..dc846c9 100644
--- a/src/include/anastasis_testing_lib.h
+++ b/src/include/anastasis_testing_lib.h
@@ -116,7 +116,7 @@ ANASTASIS_TESTING_get_trait_account_priv (const struct
TALER_TESTING_Command *cmd,
unsigned int index,
const struct
- ANASTASIS_CRYPTO_AccountPublicKey **
+ ANASTASIS_CRYPTO_AccountPrivateKey **
priv);
@@ -130,7 +130,8 @@ ANASTASIS_TESTING_get_trait_account_priv (const struct
struct TALER_TESTING_Trait
ANASTASIS_TESTING_make_trait_account_priv (unsigned int index,
const struct
- ANASTASIS_CRYPTO_AccountPrivKey
*priv);
+ ANASTASIS_CRYPTO_AccountPrivateKey *
+ priv);
/**
* Obtain an account public key from @a cmd.
diff --git a/src/lib/anastasis.c b/src/lib/anastasis.c
index f6e6eae..fd54cf3 100644
--- a/src/lib/anastasis.c
+++ b/src/lib/anastasis.c
@@ -21,7 +21,6 @@
*/
#include "anastasis.h"
-#include "anastasis_crypto_lib.h"
#include <taler/taler_json_lib.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis_service.h"
diff --git a/src/lib/anastasis_api_keyshare_lookup.c
b/src/lib/anastasis_api_keyshare_lookup.c
index b6aac20..806ea8b 100644
--- a/src/lib/anastasis_api_keyshare_lookup.c
+++ b/src/lib/anastasis_api_keyshare_lookup.c
@@ -75,7 +75,7 @@ struct ANASTASIS_KeyShareLookupOperation
/**
* Key to decrypt the truth on the server
*/
- struct ANASTASIS_TruthKey truth_key;
+ struct ANASTASIS_CRYPTO_TruthKey truth_key;
/**
* Hash of the response (security question)
@@ -258,7 +258,7 @@ struct ANASTASIS_KeyShareLookupOperation *
ANASTASIS_key_share_lookup (struct GNUNET_CURL_Context *ctx,
const char *backend_url,
uuid_t *truth_uuid,
- const struct ANASTASIS_TruthKey *truth_key,
+ const struct ANASTASIS_CRYPTO_TruthKey *truth_key,
const struct GNUNET_HashCode *hashed_answer,
ANASTASIS_KeyShareLookupCallback cb,
void *cb_cls)
diff --git a/src/lib/testing_api_cmd_policy_lookup.c
b/src/lib/testing_api_cmd_policy_lookup.c
index 90b5e5f..ff9ad3f 100644
--- a/src/lib/testing_api_cmd_policy_lookup.c
+++ b/src/lib/testing_api_cmd_policy_lookup.c
@@ -25,7 +25,6 @@
*/
#include "platform.h"
-#include "anastasis_service.h"
#include "anastasis_testing_lib.h"
#include <taler/taler_util.h>
#include <taler/taler_testing_lib.h>
diff --git a/src/lib/testing_api_cmd_policy_store.c
b/src/lib/testing_api_cmd_policy_store.c
index 9225a8d..088dcc9 100644
--- a/src/lib/testing_api_cmd_policy_store.c
+++ b/src/lib/testing_api_cmd_policy_store.c
@@ -24,7 +24,6 @@
*/
#include "platform.h"
-#include "anastasis_service.h"
#include "anastasis_testing_lib.h"
#include <taler/taler_util.h>
#include <taler/taler_testing_lib.h>
diff --git a/src/lib/testing_api_cmd_truth_store.c
b/src/lib/testing_api_cmd_truth_store.c
index eb6d370..c7e6b2a 100644
--- a/src/lib/testing_api_cmd_truth_store.c
+++ b/src/lib/testing_api_cmd_truth_store.c
@@ -25,7 +25,6 @@
#include "platform.h"
#include <uuid/uuid.h>
-#include "anastasis_service.h"
#include "anastasis_testing_lib.h"
#include <taler/taler_util.h>
#include <taler/taler_testing_lib.h>
diff --git a/src/lib/testing_api_trait_account_priv.c
b/src/lib/testing_api_trait_account_priv.c
index 97ab6e0..2fb701d 100644
--- a/src/lib/testing_api_trait_account_priv.c
+++ b/src/lib/testing_api_trait_account_priv.c
@@ -22,7 +22,6 @@
* @author Christian Grothoff
*/
#include "platform.h"
-#include "anastasis_service.h"
#include "anastasis_testing_lib.h"
#define ANASTASIS_TESTING_TRAIT_ACCOUNT_PRIV "anastasis-account_priv"
diff --git a/src/lib/testing_api_trait_account_pub.c
b/src/lib/testing_api_trait_account_pub.c
index 08cd52d..ddf5d0d 100644
--- a/src/lib/testing_api_trait_account_pub.c
+++ b/src/lib/testing_api_trait_account_pub.c
@@ -22,7 +22,6 @@
* @author Christian Grothoff
*/
#include "platform.h"
-#include "anastasis_service.h"
#include "anastasis_testing_lib.h"
#define ANASTASIS_TESTING_TRAIT_ACCOUNT_PUB "anastasis-account_pub"
diff --git a/src/lib/testing_api_trait_hash.c b/src/lib/testing_api_trait_hash.c
index faf5bb9..18be1ea 100644
--- a/src/lib/testing_api_trait_hash.c
+++ b/src/lib/testing_api_trait_hash.c
@@ -22,7 +22,6 @@
* @author Christian Grothoff
*/
#include "platform.h"
-#include "anastasis_service.h"
#include "anastasis_testing_lib.h"
#define ANASTASIS_TESTING_TRAIT_HASH "anastasis-hash"
diff --git a/src/lib/testing_api_trait_payment_identifier.c
b/src/lib/testing_api_trait_payment_identifier.c
index 5256a79..e27568a 100644
--- a/src/lib/testing_api_trait_payment_identifier.c
+++ b/src/lib/testing_api_trait_payment_identifier.c
@@ -22,7 +22,6 @@
* @author Dennis Neufeld
*/
#include "platform.h"
-#include "anastasis_service.h"
#include "anastasis_testing_lib.h"
#define ANASTASIS_TESTING_TRAIT_PAYMENT_IDENTIFIER \
diff --git a/src/stasis/plugin_anastasis_postgres.c
b/src/stasis/plugin_anastasis_postgres.c
index 4896f54..d4047e6 100644
--- a/src/stasis/plugin_anastasis_postgres.c
+++ b/src/stasis/plugin_anastasis_postgres.c
@@ -355,7 +355,7 @@ payment_by_account_cb (void *cls,
static enum ANASTASIS_DB_QueryStatus
postgres_lookup_pending_payments_by_account (void *cls,
const struct
- ANASTASIS_AccountPubP *
+ ANASTASIS_CRYPTO_AccountPublicKey
*
anastasis_pub,
ANASTASIS_DB_PaymentPendingIterator
it,
@@ -404,7 +404,8 @@ postgres_lookup_pending_payments_by_account (void *cls,
static enum ANASTASIS_DB_QueryStatus
postgres_store_recovery_document (void *cls,
const struct
- ANASTASIS_AccountPubP *anastasis_pub,
+ ANASTASIS_CRYPTO_AccountPublicKey *
+ anastasis_pub,
const struct
ANASTASIS_AccountSignatureP *account_sig,
const struct
@@ -661,7 +662,8 @@ postgres_store_recovery_document (void *cls,
*/
static enum ANASTASIS_DB_QueryStatus
postgres_increment_lifetime (void *cls,
- const struct ANASTASIS_AccountPubP *anastasis_pub,
+ const struct
+ ANASTASIS_CRYPTO_AccountPublicKey *anastasis_pub,
const struct
ANASTASIS_PaymentSecretP *payment_identifier,
struct GNUNET_TIME_Relative lifetime)
@@ -809,7 +811,8 @@ postgres_increment_lifetime (void *cls,
*/
static enum ANASTASIS_DB_QueryStatus
postgres_record_payment (void *cls,
- const struct ANASTASIS_AccountPubP *anastasis_pub,
+ const struct
+ ANASTASIS_CRYPTO_AccountPublicKey *anastasis_pub,
uint32_t post_counter,
const struct ANASTASIS_PaymentSecretP *payment_secret,
const struct TALER_Amount *amount)
@@ -1104,7 +1107,7 @@ postgres_get_key_share (void *cls,
enum ANASTASIS_DB_QueryStatus
postgres_lookup_account (void *cls,
const struct
- ANASTASIS_AccountPubP *anastasis_pub)
+ ANASTASIS_CRYPTO_AccountPublicKey *anastasis_pub)
{
struct PostgresClosure *pg = cls;
struct GNUNET_TIME_Absolute expiration_date;
@@ -1160,7 +1163,8 @@ postgres_lookup_account (void *cls,
enum ANASTASIS_DB_QueryStatus
postgres_get_latest_recovery_document (void *cls,
const struct
- ANASTASIS_AccountPubP *anastasis_pub,
+ ANASTASIS_CRYPTO_AccountPublicKey *
+ anastasis_pub,
struct
ANASTASIS_AccountSignatureP
*account_sig,
struct
@@ -1227,7 +1231,7 @@ postgres_get_latest_recovery_document (void *cls,
enum ANASTASIS_DB_QueryStatus
postgres_get_recovery_document (void *cls,
const struct
- ANASTASIS_AccountPubP *anastasis_pub,
+ ANASTASIS_CRYPTO_AccountPublicKey
*anastasis_pub,
struct
ANASTASIS_AccountSignatureP *account_sig,
struct
diff --git a/src/stasis/test_anastasis_db.c b/src/stasis/test_anastasis_db.c
index 594db84..2ae6536 100644
--- a/src/stasis/test_anastasis_db.c
+++ b/src/stasis/test_anastasis_db.c
@@ -59,12 +59,12 @@ static struct ANASTASIS_PaymentSecretP paymentSecretP;
/**
* User public key, set to a random value
*/
-static struct ANASTASIS_AccountPubP accountPubP;
+static struct ANASTASIS_CRYPTO_AccountPublicKey accountPubP;
/**
* User private key
*/
-static struct ANASTASIS_AccountPrivP accountPrivP;
+static struct ANASTASIS_CRYPTO_AccountPrivateKey accountPrivP;
/**
* Signature
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis] branch master updated: refactor truth key and includes,
gnunet <=