security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

wks: Add new policy flag protocol-version

Browse Source 
* 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 <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-09-12 18:05:00 +02:00
parent 8b5a2474f2
commit 332c9eaa2a
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/gpg-wks.h
View File

@ -63,6 +63,7 @@ struct policy_flags_s
unsigned int mailbox_only : 1; unsigned int mailbox_only : 1;
unsigned int dane_only : 1; unsigned int dane_only : 1;
unsigned int auth_submit : 1; unsigned int auth_submit : 1;
unsigned int protocol_version; /* The supported WKS_DRAFT_VERION or 0 */
unsigned int max_pending; /* Seconds to wait for a confirmation. */ unsigned int max_pending; /* Seconds to wait for a confirmation. */
}; };
typedef struct policy_flags_s *policy_flags_t; typedef struct policy_flags_s *policy_flags_t;

14
tools/wks-util.c
View File

@ -316,7 +316,8 @@ wks_parse_policy (policy_flags_t flags, estream_t stream, int ignore_unknown)
TOK_MAILBOX_ONLY, TOK_MAILBOX_ONLY,
TOK_DANE_ONLY, TOK_DANE_ONLY,
TOK_AUTH_SUBMIT, TOK_AUTH_SUBMIT,
TOK_MAX_PENDING TOK_MAX_PENDING,
TOK_PROTOCOL_VERSION
}; };
static struct { static struct {
const char *name; 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 }, { "mailbox-only", TOK_MAILBOX_ONLY },
{ "dane-only", TOK_DANE_ONLY }, { "dane-only", TOK_DANE_ONLY },
{ "auth-submit", TOK_AUTH_SUBMIT }, { "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; gpg_error_t err = 0;
int lnr = 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. */ * and decide whether to allow other units. */
flags->max_pending = atoi (value); flags->max_pending = atoi (value);
break; break;
case TOK_PROTOCOL_VERSION:
if (!value)
{
err = gpg_error (GPG_ERR_SYNTAX);
goto leave;
}
flags->protocol_version = atoi (value);
break;
} }
} }