commit 17b010bccf3c7945f475a73d90b75f2aeac89066
parent c8ecda70e197c2b54045be12171014769d6b8b82
Author: Christian Grothoff <christian@grothoff.org>
Date: Thu, 30 Oct 2025 11:28:22 +0100
adjust to latest GNUnet APIs
Diffstat:
18 files changed, 91 insertions(+), 83 deletions(-)
diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
@@ -3793,7 +3793,7 @@ TEH_keys_denomination_revoke (const struct TALER_DenominationHashP *h_denom_pub)
enum TALER_ErrorCode
TEH_keys_exchange_sign_ (
- const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose,
+ const struct GNUNET_CRYPTO_SignaturePurpose *purpose,
struct TALER_ExchangePublicKeyP *pub,
struct TALER_ExchangeSignatureP *sig)
{
@@ -3818,7 +3818,7 @@ TEH_keys_exchange_sign_ (
enum TALER_ErrorCode
TEH_keys_exchange_sign2_ (
void *cls,
- const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose,
+ const struct GNUNET_CRYPTO_SignaturePurpose *purpose,
struct TALER_ExchangePublicKeyP *pub,
struct TALER_ExchangeSignatureP *sig)
{
diff --git a/src/exchange/taler-exchange-httpd_keys.h b/src/exchange/taler-exchange-httpd_keys.h
@@ -441,7 +441,7 @@ TEH_resume_keys_requests (bool do_shutdown);
*/
enum TALER_ErrorCode
TEH_keys_exchange_sign_ (
- const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose,
+ const struct GNUNET_CRYPTO_SignaturePurpose *purpose,
struct TALER_ExchangePublicKeyP *pub,
struct TALER_ExchangeSignatureP *sig);
@@ -463,7 +463,7 @@ TEH_keys_exchange_sign_ (
enum TALER_ErrorCode
TEH_keys_exchange_sign2_ (
void *cls,
- const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose,
+ const struct GNUNET_CRYPTO_SignaturePurpose *purpose,
struct TALER_ExchangePublicKeyP *pub,
struct TALER_ExchangeSignatureP *sig);
diff --git a/src/exchange/taler-exchange-httpd_withdraw.c b/src/exchange/taler-exchange-httpd_withdraw.c
@@ -66,7 +66,7 @@ enum WithdrawError
WITHDRAW_ERROR_KYC_REQUIRED,
WITHDRAW_ERROR_LEGITIMIZATION_RESULT,
WITHDRAW_ERROR_MAXIMUM_AGE_TOO_LARGE,
- WITHDRAW_ERROR_NONCE_RESUSE,
+ WITHDRAW_ERROR_NONCE_REUSE,
WITHDRAW_ERROR_REQUEST_PARAMETER_MALFORMED,
WITHDRAW_ERROR_RESERVE_CIPHER_UNKNOWN,
WITHDRAW_ERROR_RESERVE_SIGNATURE_INVALID,
@@ -507,7 +507,7 @@ withdraw_transaction (
{
GNUNET_break (0);
SET_ERROR (wc,
- WITHDRAW_ERROR_NONCE_RESUSE);
+ WITHDRAW_ERROR_NONCE_REUSE);
return GNUNET_DB_STATUS_HARD_ERROR;
}
@@ -1500,6 +1500,14 @@ phase_generate_reply_error (
TALER_EC_EXCHANGE_WITHDRAW_IDEMPOTENT_PLANCHET,
NULL));
return;
+ case WITHDRAW_ERROR_NONCE_REUSE:
+ finish_loop (wc,
+ TALER_MHD_reply_with_error (
+ wc->rc->connection,
+ MHD_HTTP_CONFLICT,
+ TALER_EC_EXCHANGE_WITHDRAW_NONCE_REUSE,
+ NULL));
+ return;
case WITHDRAW_ERROR_RESERVE_SIGNATURE_INVALID:
finish_loop (wc,
TALER_MHD_reply_with_ec (
diff --git a/src/include/taler/taler_crypto_lib.h b/src/include/taler/taler_crypto_lib.h
@@ -3750,7 +3750,7 @@ TALER_CRYPTO_helper_esign_poll (struct TALER_CRYPTO_ExchangeSignHelper *esh);
enum TALER_ErrorCode
TALER_CRYPTO_helper_esign_sign_ (
struct TALER_CRYPTO_ExchangeSignHelper *esh,
- const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose,
+ const struct GNUNET_CRYPTO_SignaturePurpose *purpose,
struct TALER_ExchangePublicKeyP *exchange_pub,
struct TALER_ExchangeSignatureP *exchange_sig);
@@ -4927,7 +4927,7 @@ TALER_merchant_deposit_verify (
*/
typedef enum TALER_ErrorCode
(*TALER_ExchangeSignCallback)(
- const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose,
+ const struct GNUNET_CRYPTO_SignaturePurpose *purpose,
struct TALER_ExchangePublicKeyP *pub,
struct TALER_ExchangeSignatureP *sig);
@@ -4948,7 +4948,7 @@ typedef enum TALER_ErrorCode
typedef enum TALER_ErrorCode
(*TALER_ExchangeSignCallback2)(
void *cls,
- const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose,
+ const struct GNUNET_CRYPTO_SignaturePurpose *purpose,
struct TALER_ExchangePublicKeyP *pub,
struct TALER_ExchangeSignatureP *sig);
diff --git a/src/include/taler/taler_json_lib.h b/src/include/taler/taler_json_lib.h
@@ -433,7 +433,7 @@ TALER_JSON_spec_otp_type (const char *name,
* The value could be provided as an integer or
* as a descriptive string.
*
- * @param name name of the OTP method type in the JSON
+ * @param name name of the KYC trigger event type in the JSON
* @param[out] kte where to store the operation type
* @return spec for parsing trigger event type
*/
diff --git a/src/util/age_restriction.c b/src/util/age_restriction.c
@@ -407,7 +407,7 @@ struct TALER_AgeAttestationPPS
* Purpose must be #TALER_SIGNATURE_WALLET_AGE_ATTESTATION.
* (no GNUNET_PACKED here because the struct is already packed)
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Age mask that defines the underlying age groups
diff --git a/src/util/aml_signatures.c b/src/util/aml_signatures.c
@@ -34,7 +34,7 @@ struct TALER_AmlDecisionPS
* Purpose must be #TALER_SIGNATURE_AML_DECISION.
* Used for an EdDSA signature with the `struct TALER_AmlOfficerPublicKeyP`.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Time when this decision was made.
@@ -181,7 +181,7 @@ struct TALER_AmlQueryPS
* Purpose must be #TALER_SIGNATURE_AML_QUERY.
* Used for an EdDSA signature with the `struct TALER_AmlOfficerPublicKeyP`.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
};
diff --git a/src/util/auditor_signatures.c b/src/util/auditor_signatures.c
@@ -34,7 +34,7 @@ struct TALER_ExchangeKeyValidityPS
/**
* Purpose is #TALER_SIGNATURE_AUDITOR_EXCHANGE_KEYS.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash of the auditor's URL (including 0-terminator).
diff --git a/src/util/crypto_helper_esign.c b/src/util/crypto_helper_esign.c
@@ -343,7 +343,7 @@ more:
enum TALER_ErrorCode
TALER_CRYPTO_helper_esign_sign_ (
struct TALER_CRYPTO_ExchangeSignHelper *esh,
- const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose,
+ const struct GNUNET_CRYPTO_SignaturePurpose *purpose,
struct TALER_ExchangePublicKeyP *exchange_pub,
struct TALER_ExchangeSignatureP *exchange_sig)
{
@@ -360,7 +360,7 @@ TALER_CRYPTO_helper_esign_sign_ (
UINT16_MAX - sizeof (struct TALER_CRYPTO_EddsaSignRequest));
{
char buf[sizeof (struct TALER_CRYPTO_EddsaSignRequest) + purpose_size
- - sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose)];
+ - sizeof (struct GNUNET_CRYPTO_SignaturePurpose)];
struct TALER_CRYPTO_EddsaSignRequest *sr
= (struct TALER_CRYPTO_EddsaSignRequest *) buf;
diff --git a/src/util/exchange_signatures.c b/src/util/exchange_signatures.c
@@ -35,7 +35,7 @@ struct TALER_DepositConfirmationPS
* Purpose must be #TALER_SIGNATURE_EXCHANGE_CONFIRM_DEPOSIT. Signed
* by a `struct TALER_ExchangePublicKeyP` using EdDSA.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash over the contract for which this deposit is made.
@@ -204,7 +204,7 @@ struct TALER_RefundConfirmationPS
/**
* Purpose must be #TALER_SIGNATURE_EXCHANGE_CONFIRM_REFUND.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash over the proposal data to identify the contract
@@ -315,7 +315,7 @@ struct TALER_RefreshMeltConfirmationPS
* Purpose is #TALER_SIGNATURE_EXCHANGE_CONFIRM_MELT. Signed
* by a `struct TALER_ExchangePublicKeyP` using EdDSA.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Commitment made in the /refresh/melt.
@@ -392,7 +392,7 @@ struct TALER_WithdrawConfirmationPS
* Purpose is #TALER_SIGNATURE_EXCHANGE_CONFIRM_WITHDRAW. Signed by a
* `struct TALER_ExchangePublicKeyP` using EdDSA.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Commitment made in the /withdraw call.
@@ -525,7 +525,7 @@ struct TALER_ExchangeKeySetPS
* Purpose is #TALER_SIGNATURE_EXCHANGE_KEY_SET. Signed
* by a `struct TALER_ExchangePublicKeyP` using EdDSA.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Time of the key set issue.
@@ -661,7 +661,7 @@ struct TALER_WireDepositDataPS
* Purpose header for the signature over the contract with
* purpose #TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE_DEPOSIT.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Total amount that was transferred.
@@ -766,7 +766,7 @@ struct TALER_ConfirmWirePS
* Purpose header for the signature over the contract with
* purpose #TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash over the wiring information of the merchant.
@@ -883,7 +883,7 @@ struct TALER_RecoupConfirmationPS
/**
* Purpose is #TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* When did the exchange receive the recoup request?
@@ -978,7 +978,7 @@ struct TALER_RecoupRefreshConfirmationPS
/**
* Purpose is #TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP_REFRESH
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* When did the exchange receive the recoup request?
@@ -1075,7 +1075,7 @@ struct TALER_DenominationUnknownAffirmationPS
/**
* Purpose is #TALER_SIGNATURE_EXCHANGE_AFFIRM_DENOM_UNKNOWN
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* When did the exchange sign this message.
@@ -1147,7 +1147,7 @@ struct TALER_DenominationExpiredAffirmationPS
/**
* Purpose is #TALER_SIGNATURE_EXCHANGE_AFFIRM_DENOM_EXPIRED
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* When did the exchange sign this message.
@@ -1238,7 +1238,7 @@ struct TALER_ReserveCloseConfirmationPS
/**
* Purpose is #TALER_SIGNATURE_EXCHANGE_RESERVE_CLOSED
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* When did the exchange initiate the wire transfer.
@@ -1351,7 +1351,7 @@ struct TALER_PurseCreateDepositConfirmationPS
/**
* Purpose is #TALER_SIGNATURE_EXCHANGE_CONFIRM_PURSE_CREATION
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* When did the exchange receive the deposits.
@@ -1463,7 +1463,7 @@ struct TALER_CoinPurseRefundConfirmationPS
/**
* Purpose is #TALER_SIGNATURE_EXCHANGE_CONFIRM_PURSE_REFUND
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Public key of the purse.
@@ -1557,7 +1557,7 @@ struct TALER_PurseMergedConfirmationPS
/**
* Purpose is #TALER_SIGNATURE_EXCHANGE_CONFIRM_PURSE_MERGED
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* When did the exchange receive the deposits.
@@ -1680,7 +1680,7 @@ struct TALER_PurseStatusPS
* Purpose must be #TALER_SIGNATURE_EXCHANGE_PURSE_STATUS. Signed
* by a `struct TALER_ExchangePublicKeyP` using EdDSA.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Time when the purse was merged, possibly 'never'.
@@ -1769,7 +1769,7 @@ struct TALER_ExchangeAttestPS
/**
* Purpose is #TALER_SIGNATURE_EXCHANGE_RESERVE_ATTEST_DETAILS
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Time when the attestation was made.
diff --git a/src/util/kyc_signatures.c b/src/util/kyc_signatures.c
@@ -35,7 +35,7 @@ struct TALER_KycQueryPS
* Purpose must be #TALER_SIGNATURE_KYC_AUTH.
* Used for an EdDSA signature with the `union TALER_AccountPublicKeyP`.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
};
diff --git a/src/util/merchant_signatures.c b/src/util/merchant_signatures.c
@@ -34,7 +34,7 @@ struct TALER_DepositTrackPS
/**
* Purpose must be #TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash over the proposal data of the contract for which this deposit is made.
@@ -112,7 +112,7 @@ struct TALER_RefundRequestPS
/**
* Purpose must be #TALER_SIGNATURE_MERCHANT_REFUND.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash over the proposal data to identify the contract
@@ -201,7 +201,7 @@ struct TALER_MerchantWireDetailsPS
/**
* Purpose is #TALER_SIGNATURE_MERCHANT_WIRE_DETAILS.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Salted hash over the account holder's payto:// URL and
@@ -265,7 +265,7 @@ struct TALER_PaymentResponsePS
* Set to #TALER_SIGNATURE_MERCHANT_PAYMENT_OK. Note that
* unsuccessful payments are usually proven by some exchange's signature.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash of the proposal data associated with this confirmation
@@ -320,7 +320,7 @@ struct TALER_ProposalDataPS
* Purpose header for the signature over the proposal data
* with purpose #TALER_SIGNATURE_MERCHANT_CONTRACT.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash of the JSON contract in UTF-8 including 0-termination,
diff --git a/src/util/offline_signatures.c b/src/util/offline_signatures.c
@@ -36,7 +36,7 @@ struct TALER_MasterAmlOfficerStatusPS
* Purpose is #TALER_SIGNATURE_MASTER_AML_KEY. Signed
* by a `struct TALER_MasterPublicKeyP` using EdDSA.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Time of the change.
@@ -129,7 +129,7 @@ struct TALER_MasterAddAuditorPS
* Purpose is #TALER_SIGNATURE_MASTER_ADD_AUDITOR. Signed
* by a `struct TALER_MasterPublicKeyP` using EdDSA.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Time of the change.
@@ -212,7 +212,7 @@ struct TALER_MasterDelAuditorPS
* Purpose is #TALER_SIGNATURE_MASTER_DEL_AUDITOR. Signed
* by a `struct TALER_MasterPublicKeyP` using EdDSA.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Time of the change.
@@ -280,7 +280,7 @@ struct TALER_MasterDenominationKeyRevocationPS
/**
* Purpose is #TALER_SIGNATURE_MASTER_DENOMINATION_KEY_REVOKED.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash of the denomination key.
@@ -341,7 +341,7 @@ struct TALER_MasterSigningKeyRevocationPS
/**
* Purpose is #TALER_SIGNATURE_MASTER_SIGNING_KEY_REVOKED.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* The exchange's public key.
@@ -406,7 +406,7 @@ struct TALER_ExchangeSigningKeyValidityPS
/**
* Purpose is #TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* When does this signing key begin to be valid?
@@ -507,7 +507,7 @@ struct TALER_DenominationKeyValidityPS
/**
* Purpose is #TALER_SIGNATURE_MASTER_DENOMINATION_KEY_VALIDITY.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* The long-term offline master key of the exchange that was
@@ -666,7 +666,7 @@ struct TALER_MasterAddWirePS
* Purpose is #TALER_SIGNATURE_MASTER_ADD_WIRE. Signed
* by a `struct TALER_MasterPublicKeyP` using EdDSA.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Time of the change.
@@ -778,7 +778,7 @@ struct TALER_MasterDelWirePS
* Purpose is #TALER_SIGNATURE_MASTER_DEL_WIRE. Signed
* by a `struct TALER_MasterPublicKeyP` using EdDSA.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Time of the change.
@@ -852,7 +852,7 @@ struct TALER_MasterWireFeePS
/**
* Purpose is #TALER_SIGNATURE_MASTER_WIRE_FEES.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash over the wire method (yes, H("x-taler-bank") or H("iban")), in lower
@@ -950,7 +950,7 @@ struct TALER_MasterGlobalFeePS
/**
* Purpose is #TALER_SIGNATURE_MASTER_GLOBAL_FEES.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Start date when the fee goes into effect.
@@ -1066,7 +1066,7 @@ struct TALER_MasterExtensionManifestPS
* Purpose is #TALER_SIGNATURE_MASTER_EXTENSION. Signed
* by a `struct TALER_MasterPublicKeyP` using EdDSA.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash of the JSON object that represents the manifests of extensions.
@@ -1126,7 +1126,7 @@ struct TALER_MasterWireDetailsPS
/**
* Purpose is #TALER_SIGNATURE_MASTER_WIRE_DETAILS.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash over the account holder's payto:// URL.
@@ -1226,7 +1226,7 @@ struct TALER_PartnerConfigurationPS
/**
* Purpose is #TALER_SIGNATURE_MASTER_PARNTER_DETAILS
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
struct TALER_MasterPublicKeyP partner_pub;
struct GNUNET_TIME_TimestampNBO start_date;
struct GNUNET_TIME_TimestampNBO end_date;
@@ -1313,7 +1313,7 @@ struct TALER_DrainProfitPS
/**
* Purpose is #TALER_SIGNATURE_MASTER_DRAIN_PROFITS
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
struct TALER_WireTransferIdentifierRawP wtid;
struct GNUNET_TIME_TimestampNBO date;
struct TALER_AmountNBO amount;
diff --git a/src/util/secmod_eddsa.c b/src/util/secmod_eddsa.c
@@ -233,7 +233,7 @@ static enum GNUNET_GenericReturnValue
handle_sign_request (struct TES_Client *client,
const struct TALER_CRYPTO_EddsaSignRequest *sr)
{
- const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose = &sr->purpose;
+ const struct GNUNET_CRYPTO_SignaturePurpose *purpose = &sr->purpose;
size_t purpose_size = ntohs (sr->header.size) - sizeof (*sr)
+ sizeof (*purpose);
struct Key *key;
diff --git a/src/util/secmod_eddsa.h b/src/util/secmod_eddsa.h
@@ -121,7 +121,7 @@ struct TALER_CRYPTO_EddsaSignRequest
/**
* What should be signed over.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/* followed by rest of data to sign */
};
diff --git a/src/util/secmod_signatures.c b/src/util/secmod_signatures.c
@@ -34,7 +34,7 @@ struct TALER_SigningKeyAnnouncementPS
* Purpose must be #TALER_SIGNATURE_SM_SIGNING_KEY.
* Used with an EdDSA signature of a `struct TALER_SecurityModulePublicKeyP`.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Public signing key of the exchange this is about.
@@ -111,7 +111,7 @@ struct TALER_DenominationKeyAnnouncementPS
* Purpose must be #TALER_SIGNATURE_SM_RSA_DENOMINATION_KEY.
* Used with an EdDSA signature of a `struct TALER_SecurityModulePublicKeyP`.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash of the denomination public key.
diff --git a/src/util/test_helper_eddsa.c b/src/util/test_helper_eddsa.c
@@ -244,7 +244,7 @@ test_revocation (struct TALER_CRYPTO_ExchangeSignHelper *esh)
static int
test_signing (struct TALER_CRYPTO_ExchangeSignHelper *esh)
{
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose = {
+ struct GNUNET_CRYPTO_SignaturePurpose purpose = {
.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TEST),
.size = htonl (sizeof (purpose)),
};
@@ -297,7 +297,7 @@ static int
perf_signing (struct TALER_CRYPTO_ExchangeSignHelper *esh,
const char *type)
{
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose = {
+ struct GNUNET_CRYPTO_SignaturePurpose purpose = {
.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TEST),
.size = htonl (sizeof (purpose)),
};
diff --git a/src/util/wallet_signatures.c b/src/util/wallet_signatures.c
@@ -38,7 +38,7 @@ struct TALER_DepositRequestPS
* Purpose must be #TALER_SIGNATURE_WALLET_COIN_DEPOSIT.
* Used for an EdDSA signature with the `struct TALER_CoinSpendPublicKeyP`.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash over the contract for which this deposit is made.
@@ -228,7 +228,7 @@ struct TALER_LinkDataPS
* Purpose must be #TALER_SIGNATURE_WALLET_COIN_LINK.
* Used with an EdDSA signature of a `struct TALER_CoinPublicKeyP`.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash of the denomination public key of the new coin.
@@ -311,7 +311,7 @@ struct TALER_RecoupRequestPS
* Purpose is #TALER_SIGNATURE_WALLET_COIN_RECOUP
* or #TALER_SIGNATURE_WALLET_COIN_RECOUP_REFRESH.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash of the (revoked) denomination public key of the coin.
@@ -422,7 +422,7 @@ struct TALER_RefreshMeltCoinAffirmationPS
* Purpose is #TALER_SIGNATURE_WALLET_COIN_MELT.
* Used for an EdDSA signature with the `struct TALER_CoinSpendPublicKeyP`.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Which melt commitment is made by the wallet.
@@ -538,7 +538,7 @@ struct TALER_RefreshNonceSignaturePS
/**
* Purpose must be #TALER_SIGNATURE_WALLET_COIN_LINK
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* The nonce to sign
@@ -638,7 +638,7 @@ struct TALER_WithdrawCommitmentPre24PS
* Purpose must be #TALER_SIGNATURE_WALLET_RESERVE_WITHDRAW.
* Used with an EdDSA signature of a `struct TALER_ReservePublicKeyP`.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Value of the coin being exchanged (matching the denomination key)
@@ -723,7 +723,7 @@ struct TALER_WithdrawRequestPS
/**
* Purpose is #TALER_SIGNATURE_WALLET_WITHDRAW
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Total value of all coins being exchanged (matching the denomination keys),
@@ -949,7 +949,7 @@ struct TALER_AccountSetupRequestSignaturePS
* Purpose must be #TALER_SIGNATURE_WALLET_ACCOUNT_SETUP.
* Used with an EdDSA signature of a `struct TALER_ReservePublicKeyP`.
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Balance threshold the wallet is about to cross.
@@ -1014,7 +1014,7 @@ struct TALER_ReserveHistoryRequestPS
/**
* Purpose is #TALER_SIGNATURE_WALLET_RESERVE_HISTORY
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Which entries to exclude. Only return above this offset.
@@ -1075,7 +1075,7 @@ struct TALER_CoinHistoryRequestPS
/**
* Purpose is #TALER_SIGNATURE_WALLET_COIN_HISTORY
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Which entries to exclude. Only return above this offset.
@@ -1135,7 +1135,7 @@ struct TALER_PurseCreatePS
/**
* Purpose is #TALER_SIGNATURE_WALLET_PURSE_CREATE
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Time when the purse will expire if still unmerged or unpaid.
@@ -1235,7 +1235,7 @@ struct TALER_PurseDeletePS
/**
* Purpose is #TALER_SIGNATURE_WALLET_PURSE_DELETE
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
};
@@ -1282,7 +1282,7 @@ TALER_wallet_purse_status_sign (
const struct TALER_PurseContractPrivateKeyP *purse_priv,
struct TALER_PurseContractSignatureP *purse_sig)
{
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose = {
+ struct GNUNET_CRYPTO_SignaturePurpose purpose = {
.size = htonl (sizeof (purpose)),
.purpose = htonl (TALER_SIGNATURE_WALLET_PURSE_STATUS)
};
@@ -1299,7 +1299,7 @@ TALER_wallet_purse_status_verify (
const struct TALER_PurseContractPublicKeyP *purse_pub,
const struct TALER_PurseContractSignatureP *purse_sig)
{
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose = {
+ struct GNUNET_CRYPTO_SignaturePurpose purpose = {
.size = htonl (sizeof (purpose)),
.purpose = htonl (TALER_SIGNATURE_WALLET_PURSE_STATUS)
};
@@ -1322,7 +1322,7 @@ struct TALER_PurseDepositPS
/**
* Purpose is #TALER_SIGNATURE_WALLET_PURSE_DEPOSIT
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Amount (with deposit fee) to be deposited into the purse.
@@ -1425,7 +1425,7 @@ struct TALER_PurseMergePS
/**
* Purpose is #TALER_SIGNATURE_WALLET_PURSE_MERGE
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Time when the purse is merged into the reserve.
@@ -1518,7 +1518,7 @@ struct TALER_AccountMergePS
/**
* Purpose is #TALER_SIGNATURE_WALLET_ACCOUNT_MERGE
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Time when the purse will expire if still unmerged or unpaid.
@@ -1648,7 +1648,7 @@ struct TALER_ReserveOpenPS
/**
* Purpose is #TALER_SIGNATURE_WALLET_RESERVE_OPEN
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Amount to be paid from the reserve balance to open
@@ -1742,7 +1742,7 @@ struct TALER_ReserveOpenDepositPS
/**
* Purpose is #TALER_SIGNATURE_WALLET_RESERVE_OPEN_DEPOSIT
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Which reserve's opening signature should be paid for?
@@ -1816,7 +1816,7 @@ struct TALER_ReserveClosePS
/**
* Purpose is #TALER_SIGNATURE_WALLET_RESERVE_CLOSE
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* When was the request created.
@@ -1890,7 +1890,7 @@ struct TALER_ReserveAttestRequestPS
/**
* Purpose is #TALER_SIGNATURE_WALLET_ATTEST_REQUEST
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* When was the request created.
@@ -1963,7 +1963,7 @@ struct TALER_PurseContractPS
/**
* Purpose is #TALER_SIGNATURE_WALLET_PURSE_ECONTRACT
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash over the encrypted contract.
@@ -2054,7 +2054,7 @@ struct TALER_TokenUseRequestPS
/**
* Purpose is #TALER_SIGNATURE_WALLET_TOKEN_USE
*/
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_SignaturePurpose purpose;
/**
* Hash over the contract for which this token is used.
