From bebc71d2291e93afb76792c5e210836857103c36 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 26 May 2021 14:28:26 +0200 Subject: gpg,sm: Simplify keyserver spec parsing. * common/keyserver.h: Remove. * sm/gpgsm.h (struct keyserver_spec): Remove. (opt): Change keyserver to a strlist_t. * sm/gpgsm.c (keyserver_list_free): Remove. (parse_keyserver_line): Remove. (main): Store keyserver in an strlist. * sm/call-dirmngr.c (prepare_dirmngr): Adjust for the strlist. Avoid an ambiguity in dirmngr by adding a prefix if needed. * g10/options.h (struct keyserver_spec): Move definition from keyserver.h to here. Remove most fields. * g10/keyserver.c (free_keyserver_spec): Adjust. (cmp_keyserver_spec): Adjust. (parse_keyserver_uri): Simplify. (keyidlist): Remove fakev3 arg which does not make any sense because we don't even support v3 keys. -- We now rely on the dirmngr to parse the keyserver specs. Thus a bad specification will not be caught immediately. However, even before that dirmngr had stricter tests. Signed-off-by: Werner Koch Ported-from: 9f586700ec4ceac97fd47cd799878a8847342ffa --- g10/keyserver-internal.h | 1 - 1 file changed, 1 deletion(-) (limited to 'g10/keyserver-internal.h') diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h index 66d56d8de..c93ca43bb 100644 --- a/g10/keyserver-internal.h +++ b/g10/keyserver-internal.h @@ -21,7 +21,6 @@ #define _KEYSERVER_INTERNAL_H_ #include -#include "../common/keyserver.h" #include "../common/iobuf.h" #include "../common/types.h" -- cgit v1.2.3