commit b50ce0c4cf7197c0db63ed63efbb0641cda725e7
parent 5398fc060e8f617c07f5f42b1f51abf327a5ce2c
Author: Christian Grothoff <christian@grothoff.org>
Date: Mon, 9 Dec 2024 12:26:06 +0100
rename fest: remove 'P' suffixes from non-packable structures
Diffstat:
5 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
@@ -2381,7 +2381,7 @@ TALER_CRYPTO_contract_decrypt_for_deposit (
/**
* Public key used to verify (blind) signature of issued coins.
*/
-struct TALER_TokenIssuePublicKeyP
+struct TALER_TokenIssuePublicKey
{
/**
* RSA or CS blind sign public key.
@@ -2406,7 +2406,7 @@ struct TALER_TokenIssuePublicKeyHashP
* Private key used to issue tokens by sign blinded
* token public keys (provided by wallet).
*/
-struct TALER_TokenIssuePrivateKeyP
+struct TALER_TokenIssuePrivateKey
{
/**
* RSA or CS blind sign private key.
@@ -2418,7 +2418,7 @@ struct TALER_TokenIssuePrivateKeyP
/**
* Unblinded signature created using merchants token issue private key.
*/
-struct TALER_TokenIssueSignatureP
+struct TALER_TokenIssueSignature
{
struct GNUNET_CRYPTO_UnblindedSignature *signature;
};
@@ -2426,9 +2426,8 @@ struct TALER_TokenIssueSignatureP
/**
* Blinded signature created using merchants token issue private key.
- * TODO: Rename to TALER_BlindedTokenIssueSignatureP
*/
-struct TALER_TokenIssueBlindSignatureP
+struct TALER_BlindedTokenIssueSignature
{
struct GNUNET_CRYPTO_BlindedSignature *signature;
};
@@ -2436,7 +2435,7 @@ struct TALER_TokenIssueBlindSignatureP
/**
* The public key of a token. An EdDSA public key generated by the wallet
- * and blindly signed by the merchant using the @struct TALER_TokenIssuePrivateKeyP.
+ * and blindly signed by the merchant using the @struct TALER_TokenIssuePrivateKey.
*/
struct TALER_TokenUsePublicKeyP
{
@@ -2518,7 +2517,7 @@ struct TALER_TokenEnvelope
* @param[in] issue_sig signature to free
*/
void
-TALER_token_issue_sig_free (struct TALER_TokenIssueSignatureP *issue_sig);
+TALER_token_issue_sig_free (struct TALER_TokenIssueSignature *issue_sig);
/**
@@ -2527,7 +2526,8 @@ TALER_token_issue_sig_free (struct TALER_TokenIssueSignatureP *issue_sig);
* @param[in] issue_sig signature to free
*/
void
-TALER_blinded_issue_sig_free (struct TALER_TokenIssueBlindSignatureP *issue_sig)
+TALER_blinded_issue_sig_free (struct TALER_BlindedTokenIssueSignature *issue_sig
+ )
;
@@ -2603,9 +2603,9 @@ TALER_token_blind_input_copy (struct TALER_TokenUseMerchantValues *bi_dst,
* @return #GNUNET_OK on success
*/
enum GNUNET_GenericReturnValue
-TALER_token_issue_sign (const struct TALER_TokenIssuePrivateKeyP *issue_priv,
+TALER_token_issue_sign (const struct TALER_TokenIssuePrivateKey *issue_priv,
const struct TALER_TokenEnvelope *envelope,
- struct TALER_TokenIssueBlindSignatureP *issue_sig);
+ struct TALER_BlindedTokenIssueSignature *issue_sig);
/**
@@ -2618,8 +2618,8 @@ TALER_token_issue_sign (const struct TALER_TokenIssuePrivateKeyP *issue_priv,
*/
enum GNUNET_GenericReturnValue
TALER_token_issue_verify (const struct TALER_TokenUsePublicKeyP *use_pub,
- const struct TALER_TokenIssuePublicKeyP *issue_pub,
- const struct TALER_TokenIssueSignatureP *ub_sig);
+ const struct TALER_TokenIssuePublicKey *issue_pub,
+ const struct TALER_TokenIssueSignature *ub_sig);
/**
* Unblind blinded signature.
@@ -2634,12 +2634,12 @@ TALER_token_issue_verify (const struct TALER_TokenUsePublicKeyP *use_pub,
*/
enum GNUNET_GenericReturnValue
TALER_token_issue_sig_unblind (
- struct TALER_TokenIssueSignatureP *issue_sig,
- const struct TALER_TokenIssueBlindSignatureP *blinded_sig,
+ struct TALER_TokenIssueSignature *issue_sig,
+ const struct TALER_BlindedTokenIssueSignature *blinded_sig,
const union GNUNET_CRYPTO_BlindingSecretP *secret,
const struct TALER_TokenUsePublicKeyHashP *use_pub_hash,
const struct TALER_TokenUseMerchantValues *alg_values,
- const struct TALER_TokenIssuePublicKeyP *issue_pub);
+ const struct TALER_TokenIssuePublicKey *issue_pub);
/* **************** AML officer signatures **************** */
diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
@@ -138,7 +138,7 @@ TALER_JSON_pack_blinded_planchet (
struct GNUNET_JSON_PackSpec
TALER_JSON_pack_token_issue_sig (
const char *name,
- const struct TALER_TokenIssueSignatureP *sig);
+ const struct TALER_TokenIssueSignature *sig);
/**
@@ -662,7 +662,7 @@ TALER_JSON_spec_i18n_str (
struct GNUNET_JSON_Specification
TALER_JSON_spec_token_issue_sig (
const char *field,
- struct TALER_TokenIssueSignatureP *sig);
+ struct TALER_TokenIssueSignature *sig);
/**
@@ -676,7 +676,7 @@ TALER_JSON_spec_token_issue_sig (
struct GNUNET_JSON_Specification
TALER_JSON_spec_blinded_token_issue_sig (
const char *field,
- struct TALER_TokenIssueBlindSignatureP *sig);
+ struct TALER_BlindedTokenIssueSignature *sig);
/**
* Generate line in parser specification for a
diff --git a/src/json/json_helper.c b/src/json/json_helper.c
@@ -534,7 +534,7 @@ TALER_JSON_spec_age_commitment (const char *name,
struct GNUNET_JSON_Specification
TALER_JSON_spec_token_issue_sig (const char *field,
- struct TALER_TokenIssueSignatureP *sig)
+ struct TALER_TokenIssueSignature *sig)
{
sig->signature = NULL;
return GNUNET_JSON_spec_unblinded_signature (field,
@@ -545,7 +545,7 @@ TALER_JSON_spec_token_issue_sig (const char *field,
struct GNUNET_JSON_Specification
TALER_JSON_spec_blinded_token_issue_sig (
const char *field,
- struct TALER_TokenIssueBlindSignatureP *sig)
+ struct TALER_BlindedTokenIssueSignature *sig)
{
sig->signature = NULL;
return GNUNET_JSON_spec_blinded_signature (field,
diff --git a/src/json/json_pack.c b/src/json/json_pack.c
@@ -199,7 +199,7 @@ TALER_JSON_pack_denom_sig (
struct GNUNET_JSON_PackSpec
TALER_JSON_pack_token_issue_sig (
const char *name,
- const struct TALER_TokenIssueSignatureP *sig)
+ const struct TALER_TokenIssueSignature *sig)
{
struct GNUNET_JSON_PackSpec ps = {
.field_name = name,
diff --git a/src/util/tokens.c b/src/util/tokens.c
@@ -23,7 +23,7 @@
void
-TALER_token_issue_sig_free (struct TALER_TokenIssueSignatureP *issue_sig)
+TALER_token_issue_sig_free (struct TALER_TokenIssueSignature *issue_sig)
{
if (NULL != issue_sig->signature)
{
@@ -35,7 +35,7 @@ TALER_token_issue_sig_free (struct TALER_TokenIssueSignatureP *issue_sig)
void
TALER_blinded_issue_sig_free (
- struct TALER_TokenIssueBlindSignatureP *issue_sig)
+ struct TALER_BlindedTokenIssueSignature *issue_sig)
{
if (NULL != issue_sig->signature)
{
@@ -175,9 +175,9 @@ TALER_token_blind_input_copy (struct TALER_TokenUseMerchantValues *bi_dst,
enum GNUNET_GenericReturnValue
-TALER_token_issue_sign (const struct TALER_TokenIssuePrivateKeyP *issue_priv,
+TALER_token_issue_sign (const struct TALER_TokenIssuePrivateKey *issue_priv,
const struct TALER_TokenEnvelope *envelope,
- struct TALER_TokenIssueBlindSignatureP *issue_sig)
+ struct TALER_BlindedTokenIssueSignature *issue_sig)
{
issue_sig->signature
= GNUNET_CRYPTO_blind_sign (issue_priv->private_key,
@@ -191,8 +191,8 @@ TALER_token_issue_sign (const struct TALER_TokenIssuePrivateKeyP *issue_priv,
enum GNUNET_GenericReturnValue
TALER_token_issue_verify (const struct TALER_TokenUsePublicKeyP *use_pub,
- const struct TALER_TokenIssuePublicKeyP *issue_pub,
- const struct TALER_TokenIssueSignatureP *ub_sig)
+ const struct TALER_TokenIssuePublicKey *issue_pub,
+ const struct TALER_TokenIssueSignature *ub_sig)
{
struct GNUNET_HashCode h_use_pub;
@@ -215,12 +215,12 @@ TALER_token_issue_verify (const struct TALER_TokenUsePublicKeyP *use_pub,
enum GNUNET_GenericReturnValue
TALER_token_issue_sig_unblind (
- struct TALER_TokenIssueSignatureP *issue_sig,
- const struct TALER_TokenIssueBlindSignatureP *blinded_sig,
+ struct TALER_TokenIssueSignature *issue_sig,
+ const struct TALER_BlindedTokenIssueSignature *blinded_sig,
const union GNUNET_CRYPTO_BlindingSecretP *secret,
const struct TALER_TokenUsePublicKeyHashP *use_pub_hash,
const struct TALER_TokenUseMerchantValues *alg_values,
- const struct TALER_TokenIssuePublicKeyP *issue_pub)
+ const struct TALER_TokenIssuePublicKey *issue_pub)
{
issue_sig->signature
= GNUNET_CRYPTO_blind_sig_unblind (blinded_sig->signature,
