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

fix age attestation signature padding and endianess

Browse Source
This commit is contained in:
Florian Dold 2022-04-26 01:28:36 +02:00
parent 505989a507
commit 38fcca16c8
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/util/age_restriction.c
View File

@ -250,6 +250,16 @@ TALER_age_commitment_derive (
} }
GNUNET_NETWORK_STRUCT_BEGIN
/**
* Age group mask in network byte order.
*/
struct TALER_AgeMaskNBO
{
uint32_t bits_nbo;
};
/** /**
* Used for attestation of a particular age * Used for attestation of a particular age
*/ */
@ -263,14 +273,24 @@ struct TALER_AgeAttestationPS
/** /**
* Age mask that defines the underlying age groups * Age mask that defines the underlying age groups
*/ */
struct TALER_AgeMask mask; struct TALER_AgeMaskNBO mask;
/** /**
* The particular age that this attestation is for * The particular age that this attestation is for
*/ */
uint8_t age; uint8_t age;
/**
* 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
enum GNUNET_GenericReturnValue enum GNUNET_GenericReturnValue
TALER_age_commitment_attest ( TALER_age_commitment_attest (
@ -305,8 +325,9 @@ TALER_age_commitment_attest (
struct TALER_AgeAttestationPS at = { struct TALER_AgeAttestationPS at = {
.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 = cp->commitment.mask, .mask.bits_nbo = GNUNET_htonll (cp->commitment.mask.bits),
.age = age .age = age,
.padding = { 0 },
}; };
#ifndef AGE_RESTRICTION_WITH_ECDSA #ifndef AGE_RESTRICTION_WITH_ECDSA
@ -344,14 +365,18 @@ TALER_age_commitment_verify (
return GNUNET_OK; return GNUNET_OK;
if (group > comm->num) if (group > comm->num)
{
GNUNET_break_op (0);
return GNUNET_NO; return GNUNET_NO;
}
{ {
struct TALER_AgeAttestationPS at = { struct TALER_AgeAttestationPS at = {
.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 = comm->mask, .mask.bits_nbo = GNUNET_htonll (comm->mask.bits),
.age = age, .age = age,
.padding = { 0 },
}; };
#ifndef AGE_RESTRICTION_WITH_ECDSA #ifndef AGE_RESTRICTION_WITH_ECDSA