diff options
| author | Werner Koch <[email protected]> | 2021-05-26 12:28:26 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2021-06-16 10:03:13 +0000 |
| commit | bebc71d2291e93afb76792c5e210836857103c36 (patch) | |
| tree | 93de670211b693b510304bd28df71cb27803ddce /sm/gpgsm.h | |
| parent | dirmngr: Support pseudo URI scheme "opaque". (diff) | |
| download | gnupg-bebc71d2291e93afb76792c5e210836857103c36.tar.gz gnupg-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 <[email protected]>
Ported-from: 9f586700ec4ceac97fd47cd799878a8847342ffa
Diffstat (limited to 'sm/gpgsm.h')
| -rw-r--r-- | sm/gpgsm.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sm/gpgsm.h b/sm/gpgsm.h index 7c27c586e..acf8caeed 100644 --- a/sm/gpgsm.h +++ b/sm/gpgsm.h @@ -45,19 +45,6 @@ #define MAX_DIGEST_LEN 64 /* Fits for SHA-512 */ -struct keyserver_spec -{ - struct keyserver_spec *next; - - char *host; - int port; - char *user; - char *pass; - char *base; - unsigned int use_ldaps:1; -}; - - /* A large struct named "opt" to keep global flags. */ EXTERN_UNLESS_MAIN_MODULE struct @@ -155,7 +142,7 @@ struct the integrity of the software at runtime. */ - struct keyserver_spec *keyserver; + strlist_t keyserver; /* A list of certificate extension OIDs which are ignored so that one can claim that a critical extension has been handled. One |