summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2022-04-27 00:00:15 +0200
committerFlorian Dold <florian@dold.me>2022-04-27 00:00:15 +0200
commit9a05781ab37470e5b2cb22d6992c00b2913075e7 (patch)
tree7496131ef9623317945062425205475f624f05a6 /src/util
parent17a00ef22dadd10c97fea188c75a8aaeb1e64442 (diff)
downloadexchange-9a05781ab37470e5b2cb22d6992c00b2913075e7.tar.gz
exchange-9a05781ab37470e5b2cb22d6992c00b2913075e7.tar.bz2
exchange-9a05781ab37470e5b2cb22d6992c00b2913075e7.zip
-fix derivation, logging
Diffstat (limited to 'src/util')
-rw-r--r--src/util/age_restriction.c4
-rw-r--r--src/util/test_age_restriction.c20
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;
}