taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-use uint32_t instead of uint8_t + padding for the age

Browse Source
This commit is contained in:
Özgür Kesim 2022-04-26 11:23:27 +02:00
parent f24fc18564
commit a92d3aae7b
Signed by: oec
GPG Key ID: 3D76A56D79EDD9D7
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/util/age_restriction.c
View File

@ -267,8 +267,9 @@ struct TALER_AgeAttestationPS
{ {
/** /**
* Purpose must be #TALER_SIGNATURE_WALLET_AGE_ATTESTATION. * Purpose must be #TALER_SIGNATURE_WALLET_AGE_ATTESTATION.
* (no GNUNET_PACKED here because the struct is already packed)
*/ */
struct GNUNET_CRYPTO_EccSignaturePurpose purpose GNUNET_PACKED; struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
/** /**
* Age mask that defines the underlying age groups * Age mask that defines the underlying age groups
@ -276,17 +277,10 @@ struct TALER_AgeAttestationPS
struct TALER_AgeMaskNBO mask GNUNET_PACKED; struct TALER_AgeMaskNBO mask GNUNET_PACKED;
/** /**
* The particular age that this attestation is for * The particular age that this attestation is for.
* We use uint32_t here for alignment.
*/ */
uint8_t age; uint32_t age GNUNET_PACKED;
/**
* Pad to a total size of 16 bytes.
*
* (Strangly, the compiler leaves padding after the age
* field even with GNUNET_PACKED / GNUNET_NETWORK_STRUCT_BEGIN.
*/
uint8_t padding[3];
}; };
GNUNET_NETWORK_STRUCT_END GNUNET_NETWORK_STRUCT_END
@ -326,8 +320,7 @@ TALER_age_commitment_attest (
.purpose.size = htonl (sizeof(at)), .purpose.size = htonl (sizeof(at)),
.purpose.purpose = htonl (TALER_SIGNATURE_WALLET_AGE_ATTESTATION), .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_AGE_ATTESTATION),
.mask.bits_nbo = htonl (cp->commitment.mask.bits), .mask.bits_nbo = htonl (cp->commitment.mask.bits),
.age = age, .age = htonl (age),
.padding = { 0 },
}; };
#ifndef AGE_RESTRICTION_WITH_ECDSA #ifndef AGE_RESTRICTION_WITH_ECDSA
@ -375,8 +368,7 @@ TALER_age_commitment_verify (
.purpose.size = htonl (sizeof(at)), .purpose.size = htonl (sizeof(at)),
.purpose.purpose = htonl (TALER_SIGNATURE_WALLET_AGE_ATTESTATION), .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_AGE_ATTESTATION),
.mask.bits_nbo = htonl (comm->mask.bits), .mask.bits_nbo = htonl (comm->mask.bits),
.age = age, .age = htonl (age),
.padding = { 0 },
}; };
#ifndef AGE_RESTRICTION_WITH_ECDSA #ifndef AGE_RESTRICTION_WITH_ECDSA