From: Schanzenbach, Martin Date: Fri, 2 Dec 2016 12:50:43 +0000 (+0100) Subject: - change record data name X-Git-Tag: gnunet-0.11.0rc0~24^2~139 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=45c17975732ef486a7ef4c64fb7161c89275bf05;p=oweals%2Fgnunet.git - change record data name --- 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, { case GNUNET_GNSRECORD_TYPE_CREDENTIAL: { - struct GNUNET_CREDENTIAL_AttributeRecordData cred; + struct GNUNET_CREDENTIAL_CredentialRecordData cred; char *cred_str; char *subject_pkey; char *issuer_pkey; uint32_t cf; // Credential flags - if (data_size < sizeof (struct GNUNET_CREDENTIAL_AttributeRecordData)) + if (data_size < sizeof (struct GNUNET_CREDENTIAL_CredentialRecordData)) return NULL; /* malformed */ memcpy (&cred, data, @@ -111,7 +111,7 @@ credential_string_to_value (void *cls, { case GNUNET_GNSRECORD_TYPE_CREDENTIAL: { - struct GNUNET_CREDENTIAL_AttributeRecordData *cred; + struct GNUNET_CREDENTIAL_CredentialRecordData *cred; unsigned int cf; // credential flags size_t enclen = (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)) * 8; @@ -134,7 +134,7 @@ credential_string_to_value (void *cls, s); return GNUNET_SYSERR; } - *data_size = sizeof (struct GNUNET_CREDENTIAL_AttributeRecordData) + strlen (name) + 1; + *data_size = sizeof (struct GNUNET_CREDENTIAL_CredentialRecordData) + strlen (name) + 1; *data = cred = GNUNET_malloc (*data_size); GNUNET_CRYPTO_ecdsa_public_key_from_string (subject_pkey, 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 { GNUNET_NETWORK_STRUCT_BEGIN /** - * The attribute record + * The credential record */ -struct GNUNET_CREDENTIAL_AttributeRecordData { +struct GNUNET_CREDENTIAL_CredentialRecordData { /** * Public key of the subject this credential was issued to @@ -112,7 +112,7 @@ struct GNUNET_CREDENTIAL_AttributeRecordData { /** * The attribute delegation record */ -struct GNUNET_CREDENTIAL_AttributeDelegationRecordData { +struct GNUNET_CREDENTIAL_AttributeRecordData { /** * Public key of the subject this attribute was delegated to @@ -121,6 +121,7 @@ struct GNUNET_CREDENTIAL_AttributeDelegationRecordData { /** * Followed by the attribute that was delegated to as string + * May be empty */ };