diff options
author | Christian Grothoff <christian@grothoff.org> | 2022-04-12 22:01:10 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2022-04-12 22:01:10 +0200 |
commit | 4a6b457b0b6c8ac4d2c89c66f98cb7120139d1d6 (patch) | |
tree | 15540f3f049c6db852b65a8a8549da3c35576106 /src/cli | |
parent | 257c5a12043fd6a05ce2bf8aaa19fcf90eb10a78 (diff) | |
download | anastasis-4a6b457b0b6c8ac4d2c89c66f98cb7120139d1d6.tar.gz anastasis-4a6b457b0b6c8ac4d2c89c66f98cb7120139d1d6.tar.bz2 anastasis-4a6b457b0b6c8ac4d2c89c66f98cb7120139d1d6.zip |
output short hash in cli discovery to enable duplicate detection by user
Diffstat (limited to 'src/cli')
-rw-r--r-- | src/cli/anastasis-cli-discover.c | 5 | ||||
-rwxr-xr-x | src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh | 2 | ||||
-rwxr-xr-x | src/cli/test_anastasis_reducer_recovery_no_pay.sh | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/cli/anastasis-cli-discover.c b/src/cli/anastasis-cli-discover.c index a7edcf1..2731ee8 100644 --- a/src/cli/anastasis-cli-discover.c +++ b/src/cli/anastasis-cli-discover.c @@ -104,12 +104,13 @@ print_policy_cb (void *cls, return; } fprintf (stdout, - "%s %u %u : \"%s\" \"%s\"\n", + "%s %u %u : \"%s\" \"%s\" (%s)\n", provider_url, (unsigned int) version, (unsigned int) attribute_mask, GNUNET_TIME_timestamp2s (server_time), - secret_name); + secret_name, + GNUNET_h2s (hcpd)); } diff --git a/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh b/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh index 398fc43..e0db85e 100755 --- a/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh +++ b/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh @@ -428,7 +428,7 @@ anastasis-reducer -a '{"provider_url" : "http://localhost:8086/" }' add_provider echo " OK" echo -n "Selecting secret to recover" -anastasis-reducer -a '{"version": 0, "mask": 0, "provider_url" : "http://localhost:8086/" }' next < $R1FILE > $R2FILE +anastasis-reducer -a '{"mask": 0, "providers" : [ { "version": 0, "url" : "http://localhost:8086/" } ] }' select_version < $R1FILE > $R2FILE STATE=`jq -r -e .recovery_state < $R2FILE` if test "$STATE" != "CHALLENGE_SELECTING" diff --git a/src/cli/test_anastasis_reducer_recovery_no_pay.sh b/src/cli/test_anastasis_reducer_recovery_no_pay.sh index 6a1ed0f..8082b29 100755 --- a/src/cli/test_anastasis_reducer_recovery_no_pay.sh +++ b/src/cli/test_anastasis_reducer_recovery_no_pay.sh @@ -220,7 +220,7 @@ anastasis-reducer -a '{"provider_url" : "http://localhost:8086/" }' add_provider echo " OK" echo -n "Selecting secret to recover" -anastasis-reducer -a '{"version": 0, "mask": 0, "provider_url" : "http://localhost:8086/" }' next < $R1FILE > $R2FILE +anastasis-reducer -a '{"mask": 0, "providers" : [ { "version": 0, "url" : "http://localhost:8086/" } ] }' select_version < $R1FILE > $R2FILE STATE=`jq -r -e .recovery_state < $R2FILE` if test "$STATE" != "CHALLENGE_SELECTING" |