[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] 05/06: merge
From: |
gnunet |
Subject: |
[taler-anastasis] 05/06: merge |
Date: |
Thu, 22 Oct 2020 18:52:10 +0200 |
This is an automated email from the git hooks/post-receive script.
dennis-neufeld pushed a commit to branch master
in repository anastasis.
commit 319cbe9a9ae42c782b3cde78c0f1edc654681cff
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Thu Oct 22 17:49:24 2020 +0200
merge
---
src/include/anastasis_service.h | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/include/anastasis_service.h b/src/include/anastasis_service.h
index fd71456..b07cbe1 100644
--- a/src/include/anastasis_service.h
+++ b/src/include/anastasis_service.h
@@ -198,7 +198,6 @@ struct ANASTASIS_UploadDetails
union
{
-
/**
* Hash of the stored recovery data, returned if
* @e us is #ANASTASIS_US_SUCCESS.
@@ -414,29 +413,29 @@ typedef void
*
* @param ctx the CURL context used to connect to the backend
* @param backend_url backend's base URL, including final "/"
- * @param anastasis_pub public key of the user's account
* @param anastasis_priv private key of the user's account
- * @param prev_recovery_data_hash hash of the privious policy update, NULL for
the first upload ever
+ * @param prev_recovery_data_hash hash of the previous uploaded recovery
document
* @param recovery_data policy data to be stored
* @param recovery_data_size number of bytes in @a recovery_data
* @param payment_requested #GNUNET_YES if the client wants to pay more for
the account now
- * @param payment_secret payment secret of last payment, or NULL (corresponds
to the Taler order ID)
+ * @param paid_order_id payment identifier of last payment
* @param cb callback processing the response from /policy
* @param cb_cls closure for cb
* @return handle for the operation
*/
struct ANASTASIS_PolicyStoreOperation *
-ANASTASIS_policy_store (
- struct GNUNET_CURL_Context *ctx,
- const char *backend_url,
- const struct ANASTASIS_CRYPTO_AccountPrivateKeyP *anastasis_priv,
- const struct GNUNET_HashCode *prev_recovery_data_hash,
- const void *recovery_data,
- size_t recovery_data_size,
- int payment_requested,
- const struct ANASTASIS_PaymentSecretP *payment_secret,
- ANASTASIS_PolicyStoreCallback cb,
- void *cb_cls);
+ANASTASIS_policy_store (struct GNUNET_CURL_Context *ctx,
+ const char *backend_url,
+ const struct
+ ANASTASIS_CRYPTO_AccountPrivateKeyP *anastasis_priv,
+ const struct
+ GNUNET_HashCode *prev_recovery_data_hash,
+ const void *recovery_data,
+ size_t recovery_data_size,
+ int payment_requested,
+ const struct ANASTASIS_PaymentSecretP *payment_secret,
+ ANASTASIS_PolicyStoreCallback cb,
+ void *cb_cls);
/**
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-anastasis] branch master updated (a6ef5c5 -> 7062901), gnunet, 2020/10/22
- [taler-anastasis] 02/06: reduce code reuse, gnunet, 2020/10/22
- [taler-anastasis] 04/06: fix memory leaks, gnunet, 2020/10/22
- [taler-anastasis] 03/06: fix memory leaks, gnunet, 2020/10/22
- [taler-anastasis] 01/06: fix strncpy warnings, gnunet, 2020/10/22
- [taler-anastasis] 06/06: merge, gnunet, 2020/10/22
- [taler-anastasis] 05/06: merge,
gnunet <=