diff options
author | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2018-04-10 11:56:42 +0200 |
---|---|---|
committer | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2018-04-10 11:56:42 +0200 |
commit | 3eae3e43d6f94449cb89998a676e6696438cc604 (patch) | |
tree | 8f05d037d0ed53c7b706affbecb2c4ec74e4e6a4 /src/identity-provider | |
parent | 114d46af6abd4982861b7e215a7f5b24246b2cc0 (diff) | |
download | gnunet-3eae3e43d6f94449cb89998a676e6696438cc604.tar.gz gnunet-3eae3e43d6f94449cb89998a676e6696438cc604.zip |
fix some tests
Diffstat (limited to 'src/identity-provider')
-rw-r--r-- | src/identity-provider/gnunet-idp.c | 7 | ||||
-rwxr-xr-x | src/identity-provider/test_idp_revoke.sh | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/identity-provider/gnunet-idp.c b/src/identity-provider/gnunet-idp.c index 95e9f398d..1f1036d44 100644 --- a/src/identity-provider/gnunet-idp.c +++ b/src/identity-provider/gnunet-idp.c | |||
@@ -445,7 +445,10 @@ main(int argc, char *const argv[]) | |||
445 | 445 | ||
446 | GNUNET_GETOPT_OPTION_END | 446 | GNUNET_GETOPT_OPTION_END |
447 | }; | 447 | }; |
448 | return (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "ct", | 448 | if (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "ct", |
449 | "ct", options, | 449 | "ct", options, |
450 | &run, NULL)); | 450 | &run, NULL)) |
451 | return 0; | ||
452 | else | ||
453 | return 1; | ||
451 | } | 454 | } |
diff --git a/src/identity-provider/test_idp_revoke.sh b/src/identity-provider/test_idp_revoke.sh index d5c2c3f77..6943fcf4f 100755 --- a/src/identity-provider/test_idp_revoke.sh +++ b/src/identity-provider/test_idp_revoke.sh | |||
@@ -31,17 +31,18 @@ ALICE_KEY=$(gnunet-identity -d -c test_idp.conf | grep alice | awk '{print $3}') | |||
31 | BOB_KEY=$(gnunet-identity -d -c test_idp.conf | grep bob | awk '{print $3}') | 31 | BOB_KEY=$(gnunet-identity -d -c test_idp.conf | grep bob | awk '{print $3}') |
32 | EVE_KEY=$(gnunet-identity -d -c test_idp.conf | grep eve | awk '{print $3}') | 32 | EVE_KEY=$(gnunet-identity -d -c test_idp.conf | grep eve | awk '{print $3}') |
33 | 33 | ||
34 | gnunet-idp -e alice -a email -V john@doe.gnu -c test_idp.conf | 34 | gnunet-idp -e alice -E 1s -a email -V john@doe.gnu -c test_idp.conf |
35 | gnunet-idp -e alice -a name -V John -c test_idp.conf | 35 | gnunet-idp -e alice -E 1s -a name -V John -c test_idp.conf |
36 | TICKET_BOB=$(gnunet-idp -e alice -i "email,name" -r $BOB_KEY -c test_idp.conf | awk '{print $1}') | 36 | TICKET_BOB=$(gnunet-idp -e alice -i "email,name" -r $BOB_KEY -c test_idp.conf | awk '{print $1}') |
37 | #gnunet-idp -e bob -C $TICKET_BOB -c test_idp.conf | 37 | #gnunet-idp -e bob -C $TICKET_BOB -c test_idp.conf |
38 | TICKET_EVE=$(gnunet-idp -e alice -i "email" -r $EVE_KEY -c test_idp.conf | awk '{print $1}') | 38 | TICKET_EVE=$(gnunet-idp -e alice -i "email" -r $EVE_KEY -c test_idp.conf | awk '{print $1}') |
39 | 39 | ||
40 | |||
41 | #echo "Consuming $TICKET" | 40 | #echo "Consuming $TICKET" |
42 | #gnunet-idp -e eve -C $TICKET_EVE -c test_idp.conf | 41 | #gnunet-idp -e eve -C $TICKET_EVE -c test_idp.conf |
43 | gnunet-idp -e alice -R $TICKET_EVE -c test_idp.conf | 42 | gnunet-idp -e alice -R $TICKET_EVE -c test_idp.conf |
44 | 43 | ||
44 | sleep 2 | ||
45 | |||
45 | gnunet-idp -e eve -C $TICKET_EVE -c test_idp.conf > /dev/null 2>&1 | 46 | gnunet-idp -e eve -C $TICKET_EVE -c test_idp.conf > /dev/null 2>&1 |
46 | if test $? == 0 | 47 | if test $? == 0 |
47 | then | 48 | then |