aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2017-10-07 13:21:21 +0200
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2017-10-07 13:21:21 +0200
commit0729d3ff0b209fe2da270d98c967ad0acbdd49cb (patch)
tree9e1a88d21c12b5a6ec929f7f7f003d6f281b69a4 /src
parent6fce29c2dc4360da38f326c172ee2170f1688e36 (diff)
downloadgnunet-0729d3ff0b209fe2da270d98c967ad0acbdd49cb.tar.gz
gnunet-0729d3ff0b209fe2da270d98c967ad0acbdd49cb.zip
-fix records
Diffstat (limited to 'src')
-rw-r--r--src/identity-provider/plugin_gnsrecord_identity_provider.c9
-rwxr-xr-xsrc/identity-provider/test_idp_attribute.sh1
2 files changed, 8 insertions, 2 deletions
diff --git a/src/identity-provider/plugin_gnsrecord_identity_provider.c b/src/identity-provider/plugin_gnsrecord_identity_provider.c
index cee0a9506..ad5a95dc7 100644
--- a/src/identity-provider/plugin_gnsrecord_identity_provider.c
+++ b/src/identity-provider/plugin_gnsrecord_identity_provider.c
@@ -54,12 +54,13 @@ value_to_string (void *cls,
54 switch (type) 54 switch (type)
55 { 55 {
56 case GNUNET_GNSRECORD_TYPE_ID_ATTR: 56 case GNUNET_GNSRECORD_TYPE_ID_ATTR:
57 case GNUNET_GNSRECORD_TYPE_ID_TOKEN: 57 return GNUNET_STRINGS_data_to_string_alloc (data, data_size);
58 case GNUNET_GNSRECORD_TYPE_ID_TOKEN: //DEPRECATED
58 return GNUNET_strndup (data, data_size); 59 return GNUNET_strndup (data, data_size);
59 case GNUNET_GNSRECORD_TYPE_ABE_KEY: 60 case GNUNET_GNSRECORD_TYPE_ABE_KEY:
60 case GNUNET_GNSRECORD_TYPE_ABE_MASTER: 61 case GNUNET_GNSRECORD_TYPE_ABE_MASTER:
61 return GNUNET_STRINGS_data_to_string_alloc (data, data_size); 62 return GNUNET_STRINGS_data_to_string_alloc (data, data_size);
62 case GNUNET_GNSRECORD_TYPE_ID_TOKEN_METADATA: 63 case GNUNET_GNSRECORD_TYPE_ID_TOKEN_METADATA: //DEPRECATED
63 ecdhe_privkey = data; 64 ecdhe_privkey = data;
64 audience_pubkey = data+sizeof (struct GNUNET_CRYPTO_EcdhePrivateKey); 65 audience_pubkey = data+sizeof (struct GNUNET_CRYPTO_EcdhePrivateKey);
65 scopes = (char*) audience_pubkey+(sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)); 66 scopes = (char*) audience_pubkey+(sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey));
@@ -109,6 +110,10 @@ string_to_value (void *cls,
109 switch (type) 110 switch (type)
110 { 111 {
111 case GNUNET_GNSRECORD_TYPE_ID_ATTR: 112 case GNUNET_GNSRECORD_TYPE_ID_ATTR:
113 return GNUNET_STRINGS_string_to_data (s,
114 strlen (s),
115 *data,
116 *data_size);
112 case GNUNET_GNSRECORD_TYPE_ID_TOKEN: 117 case GNUNET_GNSRECORD_TYPE_ID_TOKEN:
113 *data = GNUNET_strdup (s); 118 *data = GNUNET_strdup (s);
114 *data_size = strlen (s); 119 *data_size = strlen (s);
diff --git a/src/identity-provider/test_idp_attribute.sh b/src/identity-provider/test_idp_attribute.sh
index 433dfa3c4..6c357128f 100755
--- a/src/identity-provider/test_idp_attribute.sh
+++ b/src/identity-provider/test_idp_attribute.sh
@@ -29,4 +29,5 @@ gnunet-identity -C rpego -c test_idp.conf
29TEST_KEY=$(gnunet-identity -d -c test_idp.conf | grep testego | awk '{print $3}') 29TEST_KEY=$(gnunet-identity -d -c test_idp.conf | grep testego | awk '{print $3}')
30gnunet-idp -e testego -a email -V john@doe.gnu -c test_idp.conf 30gnunet-idp -e testego -a email -V john@doe.gnu -c test_idp.conf
31gnunet-idp -e testego -a name -V John -c test_idp.conf 31gnunet-idp -e testego -a name -V John -c test_idp.conf
32gnunet-namestore -D -z testego -D -c test_idp.conf
32gnunet-arm -e -c test_idp.conf 33gnunet-arm -e -c test_idp.conf