diff options
| author | Werner Koch <wk@gnupg.org> | 2021-05-26 14:28:26 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2021-06-16 12:03:13 +0200 |
| commit | bebc71d2291e93afb76792c5e210836857103c36 (patch) | |
| tree | 93de670211b693b510304bd28df71cb27803ddce /g10/keyserver-internal.h | |
| parent | dirmngr: Support pseudo URI scheme "opaque". (diff) | |
| download | gnupg2-bebc71d2291e93afb76792c5e210836857103c36.tar.xz gnupg2-bebc71d2291e93afb76792c5e210836857103c36.zip | |
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 <wk@gnupg.org>
Ported-from: 9f586700ec4ceac97fd47cd799878a8847342ffa
Diffstat (limited to 'g10/keyserver-internal.h')
| -rw-r--r-- | g10/keyserver-internal.h | 1 |
1 files changed, 0 insertions, 1 deletions
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 <time.h> -#include "../common/keyserver.h" #include "../common/iobuf.h" #include "../common/types.h" |