-rename variable

This commit is contained in:
Özgür Kesim 2022-03-28 12:34:14 +02:00
parent ccf2d69dfb
commit 30985c0975
Signed by: oec
GPG Key ID: 3D76A56D79EDD9D7

View File

@ -171,25 +171,25 @@ enum GNUNET_GenericReturnValue
TALER_age_commitment_derive ( TALER_age_commitment_derive (
const struct TALER_AgeCommitmentProof *orig, const struct TALER_AgeCommitmentProof *orig,
const uint64_t salt, const uint64_t salt,
struct TALER_AgeCommitmentProof *new) struct TALER_AgeCommitmentProof *newacp)
{ {
GNUNET_assert (NULL != new); GNUNET_assert (NULL != newacp);
GNUNET_assert (orig->proof.num <= GNUNET_assert (orig->proof.num <=
orig->commitment.num); orig->commitment.num);
GNUNET_assert (orig->commitment.num == GNUNET_assert (orig->commitment.num ==
__builtin_popcount (orig->commitment.mask.bits) - 1); __builtin_popcount (orig->commitment.mask.bits) - 1);
new->commitment.mask = orig->commitment.mask; newacp->commitment.mask = orig->commitment.mask;
new->commitment.num = orig->commitment.num; newacp->commitment.num = orig->commitment.num;
new->commitment.keys = GNUNET_new_array ( newacp->commitment.keys = GNUNET_new_array (
new->commitment.num, newacp->commitment.num,
struct TALER_AgeCommitmentPublicKeyP); struct TALER_AgeCommitmentPublicKeyP);
new->proof.num = orig->proof.num; newacp->proof.num = orig->proof.num;
new->proof.keys = NULL; newacp->proof.keys = NULL;
if (0 != new->proof.num) if (0 != newacp->proof.num)
new->proof.keys = GNUNET_new_array ( newacp->proof.keys = GNUNET_new_array (
new->proof.num, newacp->proof.num,
struct TALER_AgeCommitmentPrivateKeyP); struct TALER_AgeCommitmentPrivateKeyP);
#ifndef AGE_RESTRICTION_WITH_ECDSA #ifndef AGE_RESTRICTION_WITH_ECDSA
@ -200,7 +200,7 @@ TALER_age_commitment_derive (
&orig->commitment.keys[i].pub, &orig->commitment.keys[i].pub,
&salt, &salt,
sizeof(salt), sizeof(salt),
&new->commitment.keys[i].pub); &newacp->commitment.keys[i].pub);
} }
/* 2. Derive the private keys */ /* 2. Derive the private keys */
@ -210,7 +210,7 @@ TALER_age_commitment_derive (
&orig->proof.keys[i].priv, &orig->proof.keys[i].priv,
&salt, &salt,
sizeof(salt), sizeof(salt),
&new->proof.keys[i].priv); &newacp->proof.keys[i].priv);
} }
#else #else
char label[sizeof(uint64_t) + 1] = {0}; char label[sizeof(uint64_t) + 1] = {0};
@ -227,7 +227,7 @@ TALER_age_commitment_derive (
&orig->commitment.keys[i].pub, &orig->commitment.keys[i].pub,
label, label,
"age commitment derive", "age commitment derive",
&new->commitment.keys[i].pub); &newacp->commitment.keys[i].pub);
} }
/* 2. Derive the private keys */ /* 2. Derive the private keys */
@ -238,7 +238,7 @@ TALER_age_commitment_derive (
&orig->proof.keys[i].priv, &orig->proof.keys[i].priv,
label, label,
"age commitment derive"); "age commitment derive");
new->proof.keys[i].priv = *priv; newacp->proof.keys[i].priv = *priv;
GNUNET_free (priv); GNUNET_free (priv);
} }
#endif #endif
@ -352,9 +352,9 @@ TALER_age_commitment_verify (
}; };
#ifndef AGE_RESTRICTION_WITH_ECDSA #ifndef AGE_RESTRICTION_WITH_ECDSA
#define verify(a,b,c,d) GNUNET_CRYPTO_edx25519_verify (a,b,c,d) #define verify(a,b,c,d) GNUNET_CRYPTO_edx25519_verify ((a),(b),(c),(d))
#else #else
#define verify(a,b,c,d) GNUNET_CRYPTO_ecdsa_verify (a,b,c,d) #define verify(a,b,c,d) GNUNET_CRYPTO_ecdsa_verify ((a),(b),(c),(d))
#endif #endif
return verify (TALER_SIGNATURE_WALLET_AGE_ATTESTATION, return verify (TALER_SIGNATURE_WALLET_AGE_ATTESTATION,
&at, &at,