diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-04-24 17:50:33 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-04-24 17:50:33 +0200 |
commit | 80a88ff17fd8e37f0ce27fe6a5d6c5dfa1dcfdf7 (patch) | |
tree | ad6607e3c1f939cce2f70d4dd4c64e572250ce37 /src/credential | |
parent | 324650a2a05cd38c896162dd8dd7aebd3ddfd25f (diff) | |
download | gnunet-80a88ff17fd8e37f0ce27fe6a5d6c5dfa1dcfdf7.tar.gz gnunet-80a88ff17fd8e37f0ce27fe6a5d6c5dfa1dcfdf7.zip |
-fix
Diffstat (limited to 'src/credential')
-rw-r--r-- | src/credential/gnunet-service-credential.c | 4 | ||||
-rwxr-xr-x | src/credential/test_credential_verify_and.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/credential/gnunet-service-credential.c b/src/credential/gnunet-service-credential.c index 3178b133e..be75e485e 100644 --- a/src/credential/gnunet-service-credential.c +++ b/src/credential/gnunet-service-credential.c | |||
@@ -961,13 +961,13 @@ handle_verify (void *cls, | |||
961 | for (i=0;i<credentials_count;i++) { | 961 | for (i=0;i<credentials_count;i++) { |
962 | cr_entry = GNUNET_new (struct CredentialRecordEntry); | 962 | cr_entry = GNUNET_new (struct CredentialRecordEntry); |
963 | cr_entry->credential = GNUNET_malloc (sizeof (struct GNUNET_CREDENTIAL_Credential) + | 963 | cr_entry->credential = GNUNET_malloc (sizeof (struct GNUNET_CREDENTIAL_Credential) + |
964 | strlen (credentials[i].issuer_attribute) + 1); | 964 | credentials[i].issuer_attribute_len); |
965 | GNUNET_memcpy (cr_entry->credential, | 965 | GNUNET_memcpy (cr_entry->credential, |
966 | &credentials[i], | 966 | &credentials[i], |
967 | sizeof (struct GNUNET_CREDENTIAL_Credential)); | 967 | sizeof (struct GNUNET_CREDENTIAL_Credential)); |
968 | GNUNET_memcpy (&cr_entry->credential[1], | 968 | GNUNET_memcpy (&cr_entry->credential[1], |
969 | credentials[i].issuer_attribute, | 969 | credentials[i].issuer_attribute, |
970 | strlen (credentials[i].issuer_attribute)); | 970 | credentials[i].issuer_attribute_len); |
971 | cr_entry->credential->issuer_attribute = (char*)&cr_entry->credential[1]; | 971 | cr_entry->credential->issuer_attribute = (char*)&cr_entry->credential[1]; |
972 | GNUNET_CONTAINER_DLL_insert_tail (vrh->cred_chain_head, | 972 | GNUNET_CONTAINER_DLL_insert_tail (vrh->cred_chain_head, |
973 | vrh->cred_chain_tail, | 973 | vrh->cred_chain_tail, |
diff --git a/src/credential/test_credential_verify_and.sh b/src/credential/test_credential_verify_and.sh index 833d36f95..9d5c1962e 100755 --- a/src/credential/test_credential_verify_and.sh +++ b/src/credential/test_credential_verify_and.sh | |||
@@ -54,14 +54,14 @@ gnunet-namestore -p -z gnunet -a -n $MEMBER_ATTR -t ATTR -V "$GNUNET_KEY $DEVELO | |||
54 | CRED1=`$DO_TIMEOUT gnunet-credential --issue --ego=gnunet --subject=$ALICE_KEY --attribute=$DEV_ATTR --ttl=5m -c test_credential_lookup.conf` | 54 | CRED1=`$DO_TIMEOUT gnunet-credential --issue --ego=gnunet --subject=$ALICE_KEY --attribute=$DEV_ATTR --ttl=5m -c test_credential_lookup.conf` |
55 | # (5) GNUnet issues Alice the credential "user" | 55 | # (5) GNUnet issues Alice the credential "user" |
56 | CRED2=`$DO_TIMEOUT gnunet-credential --issue --ego=gnunet --subject=$ALICE_KEY --attribute=$USER_ATTR --ttl=5m -c test_credential_lookup.conf` | 56 | CRED2=`$DO_TIMEOUT gnunet-credential --issue --ego=gnunet --subject=$ALICE_KEY --attribute=$USER_ATTR --ttl=5m -c test_credential_lookup.conf` |
57 | |||
58 | |||
59 | # Alice stores the credential under "mygnunetcreds" | 57 | # Alice stores the credential under "mygnunetcreds" |
60 | gnunet-namestore -p -z alice -a -n $TEST_CREDENTIAL -t CRED -V "$CRED1" -e 5m -c test_credential_lookup.conf | 58 | gnunet-namestore -p -z alice -a -n $TEST_CREDENTIAL -t CRED -V "$CRED1" -e 5m -c test_credential_lookup.conf |
61 | gnunet-namestore -p -z alice -a -n $TEST_CREDENTIAL -t CRED -V "$CRED2" -e 5m -c test_credential_lookup.conf | 59 | gnunet-namestore -p -z alice -a -n $TEST_CREDENTIAL -t CRED -V "$CRED2" -e 5m -c test_credential_lookup.conf |
62 | 60 | ||
61 | CREDS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$SERVICE_KEY --attribute=$USER_ATTR --ego=alice -c test_credential_lookup.conf | paste -d, -s` | ||
62 | |||
63 | #TODO2 Add -z swich like in gnunet-gns | 63 | #TODO2 Add -z swich like in gnunet-gns |
64 | RES_CRED=`gnunet-credential --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR --subject=$ALICE_KEY --credential=$TEST_CREDENTIAL -c test_credential_lookup.conf` | 64 | RES_CRED=`gnunet-credential --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR --subject=$ALICE_KEY --credential="$CREDS" -c test_credential_lookup.conf` |
65 | 65 | ||
66 | 66 | ||
67 | #TODO cleanup properly | 67 | #TODO cleanup properly |