diff options
-rw-r--r-- | src/credential/plugin_gnsrecord_credential.c | 8 | ||||
-rw-r--r-- | src/include/gnunet_credential_service.h | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/credential/plugin_gnsrecord_credential.c b/src/credential/plugin_gnsrecord_credential.c index cc645468d..480dc4c62 100644 --- a/src/credential/plugin_gnsrecord_credential.c +++ b/src/credential/plugin_gnsrecord_credential.c | |||
@@ -53,12 +53,12 @@ credential_value_to_string (void *cls, | |||
53 | { | 53 | { |
54 | case GNUNET_GNSRECORD_TYPE_CREDENTIAL: | 54 | case GNUNET_GNSRECORD_TYPE_CREDENTIAL: |
55 | { | 55 | { |
56 | struct GNUNET_CREDENTIAL_AttributeRecordData cred; | 56 | struct GNUNET_CREDENTIAL_CredentialRecordData cred; |
57 | char *cred_str; | 57 | char *cred_str; |
58 | char *subject_pkey; | 58 | char *subject_pkey; |
59 | char *issuer_pkey; | 59 | char *issuer_pkey; |
60 | uint32_t cf; // Credential flags | 60 | uint32_t cf; // Credential flags |
61 | if (data_size < sizeof (struct GNUNET_CREDENTIAL_AttributeRecordData)) | 61 | if (data_size < sizeof (struct GNUNET_CREDENTIAL_CredentialRecordData)) |
62 | return NULL; /* malformed */ | 62 | return NULL; /* malformed */ |
63 | memcpy (&cred, | 63 | memcpy (&cred, |
64 | data, | 64 | data, |
@@ -111,7 +111,7 @@ credential_string_to_value (void *cls, | |||
111 | { | 111 | { |
112 | case GNUNET_GNSRECORD_TYPE_CREDENTIAL: | 112 | case GNUNET_GNSRECORD_TYPE_CREDENTIAL: |
113 | { | 113 | { |
114 | struct GNUNET_CREDENTIAL_AttributeRecordData *cred; | 114 | struct GNUNET_CREDENTIAL_CredentialRecordData *cred; |
115 | unsigned int cf; // credential flags | 115 | unsigned int cf; // credential flags |
116 | 116 | ||
117 | size_t enclen = (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)) * 8; | 117 | size_t enclen = (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)) * 8; |
@@ -134,7 +134,7 @@ credential_string_to_value (void *cls, | |||
134 | s); | 134 | s); |
135 | return GNUNET_SYSERR; | 135 | return GNUNET_SYSERR; |
136 | } | 136 | } |
137 | *data_size = sizeof (struct GNUNET_CREDENTIAL_AttributeRecordData) + strlen (name) + 1; | 137 | *data_size = sizeof (struct GNUNET_CREDENTIAL_CredentialRecordData) + strlen (name) + 1; |
138 | *data = cred = GNUNET_malloc (*data_size); | 138 | *data = cred = GNUNET_malloc (*data_size); |
139 | GNUNET_CRYPTO_ecdsa_public_key_from_string (subject_pkey, | 139 | GNUNET_CRYPTO_ecdsa_public_key_from_string (subject_pkey, |
140 | strlen (subject_pkey), | 140 | strlen (subject_pkey), |
diff --git a/src/include/gnunet_credential_service.h b/src/include/gnunet_credential_service.h index a5dc49cfb..5675cd990 100644 --- a/src/include/gnunet_credential_service.h +++ b/src/include/gnunet_credential_service.h | |||
@@ -74,9 +74,9 @@ enum GNUNET_CREDENTIAL_CredentialFlags { | |||
74 | 74 | ||
75 | GNUNET_NETWORK_STRUCT_BEGIN | 75 | GNUNET_NETWORK_STRUCT_BEGIN |
76 | /** | 76 | /** |
77 | * The attribute record | 77 | * The credential record |
78 | */ | 78 | */ |
79 | struct GNUNET_CREDENTIAL_AttributeRecordData { | 79 | struct GNUNET_CREDENTIAL_CredentialRecordData { |
80 | 80 | ||
81 | /** | 81 | /** |
82 | * Public key of the subject this credential was issued to | 82 | * Public key of the subject this credential was issued to |
@@ -112,7 +112,7 @@ struct GNUNET_CREDENTIAL_AttributeRecordData { | |||
112 | /** | 112 | /** |
113 | * The attribute delegation record | 113 | * The attribute delegation record |
114 | */ | 114 | */ |
115 | struct GNUNET_CREDENTIAL_AttributeDelegationRecordData { | 115 | struct GNUNET_CREDENTIAL_AttributeRecordData { |
116 | 116 | ||
117 | /** | 117 | /** |
118 | * Public key of the subject this attribute was delegated to | 118 | * Public key of the subject this attribute was delegated to |
@@ -121,6 +121,7 @@ struct GNUNET_CREDENTIAL_AttributeDelegationRecordData { | |||
121 | 121 | ||
122 | /** | 122 | /** |
123 | * Followed by the attribute that was delegated to as string | 123 | * Followed by the attribute that was delegated to as string |
124 | * May be empty | ||
124 | */ | 125 | */ |
125 | }; | 126 | }; |
126 | 127 | ||