From eb8ca760c1ab5036e71e698ab1357d4bd1f3487a Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Sun, 28 Feb 2021 11:15:55 +0100 Subject: GANA: Use GANA generated header for GNS record types. Update handbook --- src/include/Makefile.am | 1 + src/include/gnu_name_system_record_types.h | 129 +++++++++++++++++++++++++++++ src/include/gnunet_gnsrecord_lib.h | 104 +---------------------- src/reclaim/plugin_gnsrecord_reclaim.c | 3 - 4 files changed, 132 insertions(+), 105 deletions(-) create mode 100644 src/include/gnu_name_system_record_types.h (limited to 'src') diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 5569c87ed..a4d7b985d 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -53,6 +53,7 @@ gnunetinclude_HEADERS = \ gnunet_gnsrecord_lib.h \ gnunet_gnsrecord_json_lib.h \ gnunet_gnsrecord_plugin.h \ + gnu_name_system_record_types.h \ gnunet_hello_lib.h \ gnunet_helper_lib.h \ gnunet_identity_service.h \ diff --git a/src/include/gnu_name_system_record_types.h b/src/include/gnu_name_system_record_types.h new file mode 100644 index 000000000..1af49c6e4 --- /dev/null +++ b/src/include/gnu_name_system_record_types.h @@ -0,0 +1,129 @@ +/* + This file is part of GNUnet + Copyright (C) 2012-2020 GNUnet e.V. + + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + + SPDX-License-Identifier: AGPL3.0-or-later + */ +#ifndef GNU_NAME_SYSTEM_RECORD_TYPES_H +#define GNU_NAME_SYSTEM_RECORD_TYPES_H + +#ifdef __cplusplus +extern "C" { +#if 0 /* keep Emacsens' auto-indent happy */ +} +#endif +#endif + + +/** + * GNS zone transfer + */ +#define GNUNET_GNSRECORD_TYPE_PKEY 65536 + +/** + * GNS nick names + */ +#define GNUNET_GNSRECORD_TYPE_NICK 65537 + +/** + * legacy hostnames + */ +#define GNUNET_GNSRECORD_TYPE_LEHO 65538 + +/** + * VPN resolution + */ +#define GNUNET_GNSRECORD_TYPE_VPN 65539 + +/** + * Delegation to DNS + */ +#define GNUNET_GNSRECORD_TYPE_GNS2DNS 65540 + +/** + * Boxed records (see TLSA/SRV handling in GNS) + */ +#define GNUNET_GNSRECORD_TYPE_BOX 65541 + +/** + * social place for SecuShare + */ +#define GNUNET_GNSRECORD_TYPE_PLACE 65542 + +/** + * Endpoint for conversation + */ +#define GNUNET_GNSRECORD_TYPE_PHONE 65543 + +/** + * identity attribute + */ +#define GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE 65544 + +/** + * local ticket reference + */ +#define GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET 65545 + +/** + * For ABD policies + */ +#define GNUNET_GNSRECORD_TYPE_DELEGATE 65548 + +/** + * For ABD reverse lookups + */ +#define GNUNET_GNSRECORD_TYPE_ATTRIBUTE 65549 + +/** + * for reclaim records + */ +#define GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF 65550 + +/** + * For reclaim OIDC client names. + */ +#define GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT 65552 + +/** + * Used reclaimID OIDC client redirect URIs. + */ +#define GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT 65553 + +/** + * Record type for an attribute attestation (e.g. JWT). + */ +#define GNUNET_GNSRECORD_TYPE_RECLAIM_CREDENTIAL 65554 + +/** + * Record type for a presentation of a credential. + */ +#define GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION 65555 + +/** + * Record type for EDKEY zone delegations. + */ +#define GNUNET_GNSRECORD_TYPE_EDKEY 65556 + + +#if 0 /* keep Emacsens' auto-indent happy */ +{ +#endif +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h index 0bf2ceed7..aff56146e 100644 --- a/src/include/gnunet_gnsrecord_lib.h +++ b/src/include/gnunet_gnsrecord_lib.h @@ -55,109 +55,9 @@ extern "C" { #define GNUNET_GNSRECORD_TYPE_ANY 0 /** - * Record type for GNS zone transfer ("PKEY"). + * Include the record types generated from GANA */ -#define GNUNET_GNSRECORD_TYPE_PKEY GNUNET_IDENTITY_TYPE_ECDSA - -/** - * Record type for GNS nick names ("NICK"). - */ -#define GNUNET_GNSRECORD_TYPE_NICK 65537 - -/** - * Record type for GNS legacy hostnames ("LEHO"). - */ -#define GNUNET_GNSRECORD_TYPE_LEHO 65538 - -/** - * Record type for VPN resolution - */ -#define GNUNET_GNSRECORD_TYPE_VPN 65539 - -/** - * Record type for delegation to DNS. - */ -#define GNUNET_GNSRECORD_TYPE_GNS2DNS 65540 - -/** - * Record type for a boxed record (see TLSA/SRV handling in GNS). - */ -#define GNUNET_GNSRECORD_TYPE_BOX 65541 - -/** - * Record type for a social place. - */ -#define GNUNET_GNSRECORD_TYPE_PLACE 65542 - -/** - * Record type for a phone (of CONVERSATION). - */ -#define GNUNET_GNSRECORD_TYPE_PHONE 65543 - -/** - * Record type for identity attributes (of RECLAIM). - */ -#define GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE 65544 - -/** - * Record type for local ticket references - */ -#define GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET 65545 - -/** - * 65546 reserved - */ - -/** - * 65547 deleted, free to use - */ - -/** - * Record type for policies - */ -#define GNUNET_GNSRECORD_TYPE_DELEGATE 65548 - -/** - * Record type for reverse lookups - */ -#define GNUNET_GNSRECORD_TYPE_ATTRIBUTE 65549 - -/** - * Record type for reclaim records - */ -#define GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF 65550 - -/** - * Record type for RECLAIM master - */ -#define GNUNET_GNSRECORD_TYPE_RECLAIM_MASTER 65551 - -/** - * Record type for reclaim OIDC clients - */ -#define GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT 65552 - -/** - * Record type for reclaim OIDC redirect URIs - */ -#define GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT 65553 - -/** - * Record type for an attribute attestation - */ -#define GNUNET_GNSRECORD_TYPE_RECLAIM_CREDENTIAL 65554 - -/** - * Record type for a presentation of a credential (used - * in a ticket record set) - */ -#define GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION 65555 - -/** - * Record type for EDKEY delegations. - */ -#define GNUNET_GNSRECORD_TYPE_EDKEY GNUNET_IDENTITY_TYPE_EDDSA - +#include "gnu_name_system_record_types.h" /** * Flags that can be set for a record. diff --git a/src/reclaim/plugin_gnsrecord_reclaim.c b/src/reclaim/plugin_gnsrecord_reclaim.c index 60c49fd6a..9e4f0a5c4 100644 --- a/src/reclaim/plugin_gnsrecord_reclaim.c +++ b/src/reclaim/plugin_gnsrecord_reclaim.c @@ -50,7 +50,6 @@ value_to_string (void *cls, uint32_t type, const void *data, size_t data_size) case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE: case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF: case GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET: - case GNUNET_GNSRECORD_TYPE_RECLAIM_MASTER: case GNUNET_GNSRECORD_TYPE_RECLAIM_CREDENTIAL: case GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION: return GNUNET_STRINGS_data_to_string_alloc (data, data_size); @@ -87,7 +86,6 @@ string_to_value (void *cls, uint32_t type, const char *s, void **data, return GNUNET_OK; case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE: case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF: - case GNUNET_GNSRECORD_TYPE_RECLAIM_MASTER: case GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET: case GNUNET_GNSRECORD_TYPE_RECLAIM_CREDENTIAL: case GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION: @@ -112,7 +110,6 @@ static struct { "RECLAIM_ATTRIBUTE_REF", GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF }, { "RECLAIM_CREDENTIAL", GNUNET_GNSRECORD_TYPE_RECLAIM_CREDENTIAL }, { "RECLAIM_PRESENTATION", GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION }, - { "RECLAIM_MASTER", GNUNET_GNSRECORD_TYPE_RECLAIM_MASTER }, { "RECLAIM_OIDC_CLIENT", GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT }, { "RECLAIM_OIDC_REDIRECT", GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT }, { "RECLAIM_TICKET", GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET }, -- cgit v1.2.3