security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

common,gpg,sm: Move the compliance option parser.

Browse source 
* common/compliance.c (gnupg_parse_compliance_option): New function.
* common/compliance.h (struct gnupg_compliance_option): New type.
(gnupg_parse_compliance_option): New prototype.
* g10/gpg.c (parse_compliance_option): Remove function.
(compliance_options): New variable.
(main): Adapt callsite.
* sm/gpgsm.c (main): Use the new common function.
* sm/gpgsm.h (opt): New field 'compliance'.

GnuPG-bug-id: 3191
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2017-06-07 11:50:54 +02:00
parent 027ce4ba37
commit 842d233d40
No known key found for this signature in database
GPG key ID: DD1A52F9DA8C9020
5 changed files with 71 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

37
g10/gpg.c
View file

@ -2073,11 +2073,8 @@ parse_tofu_policy (const char *policystr)
}
/* Parse the value of --compliance. */
static int
parse_compliance_option (const char *string)
{
struct { const char *keyword; enum cmd_and_opt_values option; } list[] = {
static struct gnupg_compliance_option compliance_options[] =
{
{ "gnupg", oGnuPG },
{ "openpgp", oOpenPGP },
{ "rfc4880bis", oRFC4880bis },
@ -2088,26 +2085,6 @@ parse_compliance_option (const char *string)
{ "pgp8", oPGP8 },
{ "de-vs", oDE_VS }
};
int i;
if (!ascii_strcasecmp (string, "help"))
{
log_info (_("valid values for option '%s':\n"), "--compliance");
for (i=0; i < DIM (list); i++)
log_info (" %s\n", list[i].keyword);
g10_exit (1);
}
for (i=0; i < DIM (list); i++)
if (!ascii_strcasecmp (string, list[i].keyword))
return list[i].option;
log_error (_("invalid value for option '%s'\n"), "--compliance");
if (!opt.quiet)
log_info (_("(use \"help\" to list choices)\n"));
g10_exit (1);
}
/* Helper to set compliance related options. This is a separate
@ -2862,7 +2839,15 @@ main (int argc, char **argv)
break;
case oCompliance:
set_compliance_option (parse_compliance_option (pargs.r.ret_str));
{
int compliance = gnupg_parse_compliance_option (pargs.r.ret_str,
compliance_options,
DIM (compliance_options),
opt.quiet);
if (compliance < 0)
g10_exit (1);
set_compliance_option (compliance);
}
break;
case oOpenPGP:
case oRFC2440: