diff options
author | Werner Koch <[email protected]> | 2017-09-12 16:05:00 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2017-09-12 16:05:00 +0000 |
commit | 332c9eaa2a3c7cae90b389cdaa2c149c5595fb4d (patch) | |
tree | 82538c24fdccb7a5fcace2e1898cacd3f91b778d /tools/wks-util.c | |
parent | gpg: Fix "Fix key generation with only an email part". (diff) | |
download | gnupg-332c9eaa2a3c7cae90b389cdaa2c149c5595fb4d.tar.gz gnupg-332c9eaa2a3c7cae90b389cdaa2c149c5595fb4d.zip |
wks: Add new policy flag protocol-version
* tools/gpg-wks.h (policy_flags_s): Add field protocol_version.
* tools/wks-util.c (wks_parse_policy): Add new policy flag.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
-rw-r--r-- | tools/wks-util.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tools/wks-util.c b/tools/wks-util.c index 46ad5c27b..45237b2b4 100644 --- a/tools/wks-util.c +++ b/tools/wks-util.c @@ -316,7 +316,8 @@ wks_parse_policy (policy_flags_t flags, estream_t stream, int ignore_unknown) TOK_MAILBOX_ONLY, TOK_DANE_ONLY, TOK_AUTH_SUBMIT, - TOK_MAX_PENDING + TOK_MAX_PENDING, + TOK_PROTOCOL_VERSION }; static struct { const char *name; @@ -325,7 +326,8 @@ wks_parse_policy (policy_flags_t flags, estream_t stream, int ignore_unknown) { "mailbox-only", TOK_MAILBOX_ONLY }, { "dane-only", TOK_DANE_ONLY }, { "auth-submit", TOK_AUTH_SUBMIT }, - { "max-pending", TOK_MAX_PENDING } + { "max-pending", TOK_MAX_PENDING }, + { "protocol-version", TOK_PROTOCOL_VERSION } }; gpg_error_t err = 0; int lnr = 0; @@ -400,6 +402,14 @@ wks_parse_policy (policy_flags_t flags, estream_t stream, int ignore_unknown) * and decide whether to allow other units. */ flags->max_pending = atoi (value); break; + case TOK_PROTOCOL_VERSION: + if (!value) + { + err = gpg_error (GPG_ERR_SYNTAX); + goto leave; + } + flags->protocol_version = atoi (value); + break; } } |