commit 9a4727d44368d1fd6633824f1ec3c23158cad1c3
parent 39e2d0252c1f78cbaf29891e68ee8613fd039b6c
Author: Pius Loosli <loosp2@bfh.ch>
Date: Tue, 7 Nov 2023 15:58:33 +0100
[lib] commit missing Makefile and formatted source files
Diffstat:
7 files changed, 73 insertions(+), 69 deletions(-)
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
@@ -2,7 +2,7 @@
talerincludedir = $(includedir)/taler
talerinclude_HEADERS = \
- taler_donau_service.h \
- taler_donaudb_lib.h \
- taler_donaudb_plugin.h
+ donau_service.h \
+ donaudb_lib.h \
+ donaudb_plugin.h
diff --git a/src/include/donau_crypto_lib.h b/src/include/donau_crypto_lib.h
@@ -35,7 +35,6 @@
#include <jansson.h>
-
/* ****************** donau crypto primitives ************* */
/**
@@ -63,7 +62,6 @@ struct DONAU_CharityPublicKeyP
};
-
/**
* Hash of a donation unit public key
*/
diff --git a/src/include/donau_service.h b/src/include/donau_service.h
@@ -96,7 +96,7 @@ struct TALER_DonationUnitInformation
* amount of the donation
*/
struct TALER_Amount donation_unit;
-
+
/**
* Year of validity
*/
@@ -492,7 +492,7 @@ struct TALER_BlindedUniqueDonationIdentifier
*/
struct TALER_BlindedUniqueDonationIdentifierKeyPair
{
-
+
/**
* The hash of the donation unit's public key.
*/
@@ -513,7 +513,7 @@ struct TALER_DONAU_BatchIssueReceiptHandle;
/**
- * Structure with information about a batch
+ * Structure with information about a batch
* of issue receipts.
*/
struct TALER_DONAU_BatchIssueReceipts
@@ -534,7 +534,7 @@ struct TALER_DONAU_BatchIssueReceipts
{
unsigned int num_donau_sigs;
-
+
/**
* Blind signature provided by the donau
*/
@@ -752,7 +752,6 @@ TALER_DONAU_donor_receipts_to_statement_cancel (
struct TALER_DONAU_DonorReceiptsToStatementHandle *);
-
/* ********************* POST /csr batch-issue *********************** */
@@ -849,8 +848,6 @@ TALER_DONAU_csr_batch_issue_cancel (
struct TALER_DONAU_CsRBatchIssueHandle *csrh);
-
-
/* ********************* GET /charities/ *********************** */
/**
@@ -861,22 +858,22 @@ struct CharitySummary
/**
* charity id
*/
- unsigned int charity_id;
+ unsigned int charity_id;
- /**
- * charity name
- */
- char *name;
+ /**
+ * charity name
+ */
+ char *name;
- /**
- * Max donation amout for this charitiy and year.
- */
- struct TALER_Amount amount;
+ /**
+ * Max donation amout for this charitiy and year.
+ */
+ struct TALER_Amount amount;
/**
* Current donation amount for this charity and year.
*/
- struct TALER_Amount amount;
+ struct TALER_Amount amount;
};
@@ -990,7 +987,7 @@ struct CharityHistoryYear
/**
* final donation amount at the end of @a year;
*/
- struct TALER_Amount amount;
+ struct TALER_Amount amount;
};
diff --git a/src/include/donaudb_lib.h b/src/include/donaudb_lib.h
@@ -1,21 +1,24 @@
-
- This file is part of TALER
- Copyright (C) 2014-2020 Taler Systems SA
-
- TALER is free software; you can redistribute it and/or modify it under the
- terms of the GNU General Public License as published by the Free Software
- Foundation; either version 3, or (at your option) any later version.
-
- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of CHARITYABILITY or FITNESS FOR
- A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along with
- TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
-*/
-/**
- * @file include/taler_donaudb_lib.h
- * @brief IO operations for the donau's private keys
+This file is part of TALER
+ Copyright (C) 2014 - 2020 Taler Systems SA
+
+TALER is free software; you can redistribute it and / or modify it under the
+terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 3,
+or (at your option) any later version.
+
+TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of CHARITYABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+ TALER; see the file
+COPYING.If not, see <http: // www.gnu.org/licenses/>
+*
+// **
+*@file include / taler_donaudb_lib.h
+* @brief IO operations for the
+ donau
+'s private keys
* @author Florian Dold
* @author Benedikt Mueller
* @author Christian Grothoff
@@ -122,7 +125,7 @@ typedef void
*/
void
TALER_DONAUDB_find_accounts (TALER_DONAUDB_AccountCallback cb,
- void *cb_cls);
+ void *cb_cls);
/**
diff --git a/src/include/donaudb_plugin.h b/src/include/donaudb_plugin.h
@@ -122,4 +122,3 @@ typedef void
void *cls,
const struct TALER_DonauPublicKeyP *donau_pub,
const struct TALER_DONAUDB_SignkeyMetaData *meta);
-
diff --git a/src/include/taler_error_codes.h b/src/include/taler_error_codes.h
@@ -20,7 +20,7 @@
Note: the LGPL does not apply to all components of GNU Taler,
but it does apply to this file.
*/
- /**
+/**
* @file include/taler_error_codes.h
* @brief GNU Taler error codes, generated via https://gana.gnunet.org/
*
@@ -627,7 +627,8 @@ enum TALER_ErrorCode
* Returned with an HTTP status code of #MHD_HTTP_BAD_REQUEST (400).
* (A value of 0 indicates that the error is generated client-side).
*/
- TALER_EC_EXCHANGE_PURSE_DEPOSIT_COIN_CONFLICTING_ATTEST_VS_AGE_COMMITMENT = 1029,
+ TALER_EC_EXCHANGE_PURSE_DEPOSIT_COIN_CONFLICTING_ATTEST_VS_AGE_COMMITMENT =
+ 1029,
/**
@@ -2395,7 +2396,8 @@ enum TALER_ErrorCode
* Returned with an HTTP status code of #MHD_HTTP_INTERNAL_SERVER_ERROR (500).
* (A value of 0 indicates that the error is generated client-side).
*/
- TALER_EC_MERCHANT_POST_ORDERS_ID_PAY_REFUND_DEADLINE_PAST_WIRE_TRANSFER_DEADLINE = 2159,
+ TALER_EC_MERCHANT_POST_ORDERS_ID_PAY_REFUND_DEADLINE_PAST_WIRE_TRANSFER_DEADLINE
+ = 2159,
/**
@@ -2467,7 +2469,8 @@ enum TALER_ErrorCode
* Returned with an HTTP status code of #MHD_HTTP_UNINITIALIZED (0).
* (A value of 0 indicates that the error is generated client-side).
*/
- TALER_EC_DEAD_QQQ_PAY_MERCHANT_POST_ORDERS_ID_ABORT_REFUND_REFUSED_PAYMENT_COMPLETE = 2169,
+ TALER_EC_DEAD_QQQ_PAY_MERCHANT_POST_ORDERS_ID_ABORT_REFUND_REFUSED_PAYMENT_COMPLETE
+ = 2169,
/**
@@ -2667,7 +2670,8 @@ enum TALER_ErrorCode
* Returned with an HTTP status code of #MHD_HTTP_NOT_FOUND (404).
* (A value of 0 indicates that the error is generated client-side).
*/
- TALER_EC_MERCHANT_PRIVATE_POST_ORDERS_INSTANCE_CONFIGURATION_LACKS_WIRE = 2500,
+ TALER_EC_MERCHANT_PRIVATE_POST_ORDERS_INSTANCE_CONFIGURATION_LACKS_WIRE =
+ 2500,
/**
@@ -2795,7 +2799,8 @@ enum TALER_ErrorCode
* Returned with an HTTP status code of #MHD_HTTP_FORBIDDEN (403).
* (A value of 0 indicates that the error is generated client-side).
*/
- TALER_EC_MERCHANT_PRIVATE_POST_ORDERS_ID_REFUND_NOT_ALLOWED_BY_CONTRACT = 2532,
+ TALER_EC_MERCHANT_PRIVATE_POST_ORDERS_ID_REFUND_NOT_ALLOWED_BY_CONTRACT =
+ 2532,
/**
@@ -3123,7 +3128,8 @@ enum TALER_ErrorCode
* Returned with an HTTP status code of #MHD_HTTP_CONFLICT (409).
* (A value of 0 indicates that the error is generated client-side).
*/
- TALER_EC_MERCHANT_POST_USING_TEMPLATES_AMOUNT_CONFLICT_TEMPLATES_CONTRACT_AMOUNT = 2860,
+ TALER_EC_MERCHANT_POST_USING_TEMPLATES_AMOUNT_CONFLICT_TEMPLATES_CONTRACT_AMOUNT
+ = 2860,
/**
@@ -3131,7 +3137,8 @@ enum TALER_ErrorCode
* Returned with an HTTP status code of #MHD_HTTP_CONFLICT (409).
* (A value of 0 indicates that the error is generated client-side).
*/
- TALER_EC_MERCHANT_POST_USING_TEMPLATES_SUMMARY_CONFLICT_TEMPLATES_CONTRACT_SUBJECT = 2861,
+ TALER_EC_MERCHANT_POST_USING_TEMPLATES_SUMMARY_CONFLICT_TEMPLATES_CONTRACT_SUBJECT
+ = 2861,
/**
@@ -3163,7 +3170,8 @@ enum TALER_ErrorCode
* Returned with an HTTP status code of #MHD_HTTP_CONFLICT (409).
* (A value of 0 indicates that the error is generated client-side).
*/
- TALER_EC_MERCHANT_PRIVATE_POST_PENDING_WEBHOOKS_CONFLICT_PENDING_WEBHOOK_EXISTS = 2910,
+ TALER_EC_MERCHANT_PRIVATE_POST_PENDING_WEBHOOKS_CONFLICT_PENDING_WEBHOOK_EXISTS
+ = 2910,
/**
diff --git a/src/util/charity_signatures.c b/src/util/charity_signatures.c
@@ -135,33 +135,33 @@ TALER_charity_refund_verify (
// struct TALER_PaymentResponsePS
// {
- /**
+/**
* Set to #TALER_SIGNATURE_CHARITY_PAYMENT_OK. Note that
* unsuccessful payments are usually proven by some donau's signature.
*/
- // struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+// struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
- /**
+/**
* Hash of the proposal data associated with this confirmation
*/
- // struct TALER_PrivateContractHashP h_contract_terms;
+// struct TALER_PrivateContractHashP h_contract_terms;
// };
// void
// TALER_charity_pay_sign (
- // const struct TALER_PrivateContractHashP *h_contract_terms,
- // const struct TALER_CharityPrivateKeyP *merch_priv,
- // struct GNUNET_CRYPTO_EddsaSignature *merch_sig)
+// const struct TALER_PrivateContractHashP *h_contract_terms,
+// const struct TALER_CharityPrivateKeyP *merch_priv,
+// struct GNUNET_CRYPTO_EddsaSignature *merch_sig)
// {
- // struct TALER_PaymentResponsePS mr = {
- // .purpose.purpose = htonl (TALER_SIGNATURE_CHARITY_PAYMENT_OK),
- // .purpose.size = htonl (sizeof (mr)),
- // .h_contract_terms = *h_contract_terms
- // };
-
- // GNUNET_CRYPTO_eddsa_sign (&merch_priv->eddsa_priv,
- // &mr,
- // merch_sig);
+// struct TALER_PaymentResponsePS mr = {
+// .purpose.purpose = htonl (TALER_SIGNATURE_CHARITY_PAYMENT_OK),
+// .purpose.size = htonl (sizeof (mr)),
+// .h_contract_terms = *h_contract_terms
+// };
+
+// GNUNET_CRYPTO_eddsa_sign (&merch_priv->eddsa_priv,
+// &mr,
+// merch_sig);
// }
@@ -185,5 +185,4 @@ TALER_charity_refund_verify (
// }
-
/* end of charity_signatures.c */
