From 9a05781ab37470e5b2cb22d6992c00b2913075e7 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 27 Apr 2022 00:00:15 +0200 Subject: -fix derivation, logging --- src/util/age_restriction.c | 4 ++-- src/util/test_age_restriction.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/util/age_restriction.c b/src/util/age_restriction.c index 65c1574b3..0ee020ebd 100644 --- a/src/util/age_restriction.c +++ b/src/util/age_restriction.c @@ -201,8 +201,8 @@ TALER_age_commitment_derive ( { GNUNET_CRYPTO_edx25519_public_key_derive ( &orig->commitment.keys[i].pub, - &salt, - sizeof(salt), + salt, + sizeof(*salt), &newacp->commitment.keys[i].pub); } diff --git a/src/util/test_age_restriction.c b/src/util/test_age_restriction.c index 847ab4e98..9e799ce9a 100644 --- a/src/util/test_age_restriction.c +++ b/src/util/test_age_restriction.c @@ -199,13 +199,21 @@ test_attestation (void) age_group, min_group); + GNUNET_break (GNUNET_OK == ret); + if (min_group <= age_group && GNUNET_OK != ret) + { + GNUNET_break (0); ret = GNUNET_SYSERR; + } if (min_group > age_group && GNUNET_NO != ret) + { + GNUNET_break (0); ret = GNUNET_SYSERR; + } if (min_group > age_group) continue; @@ -224,14 +232,20 @@ test_attestation (void) min_group); if (GNUNET_OK != ret) + { + GNUNET_break (0); break; + } } TALER_age_commitment_proof_free (&acp[i]); } if (GNUNET_SYSERR == ret) + { + GNUNET_break (0); return ret; + } } return GNUNET_OK; } @@ -243,10 +257,16 @@ main (int argc, { (void) argc; (void) argv; + GNUNET_log_setup ("test-age-restriction", + "INFO", + NULL); if (GNUNET_OK != test_groups ()) return 1; if (GNUNET_OK != test_attestation ()) + { + GNUNET_break (0); return 2; + } return 0; } -- cgit v1.2.3