From fa1155e89ebb4b16ee95549b8ab72672df3a0c54 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 13 Jul 2017 17:28:32 +0200 Subject: gpg: New option --key-origin. * g10/keydb.h (KEYORG_): Rename to KEYORG_. * g10/packet.h (PKT_user_id): Rename field keysrc to keyorg. Adjust users. (PKT_public_key): Ditto. (PKT_ring_trust): Ditto. * g10/options.h (struct opt): Add field key_origin. * g10/getkey.c (parse_key_origin): New. * g10/gpg.c (oKeyOrigin): New. (opts): Add "keys-origin". (main): Set option. Signed-off-by: Werner Koch --- g10/gpg.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'g10/gpg.c') diff --git a/g10/gpg.c b/g10/gpg.c index 3e153736a..38eeddf21 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -419,6 +419,7 @@ enum cmd_and_opt_values oOnlySignTextIDs, oDisableSignerUID, oSender, + oKeyOrigin, oNoop }; @@ -615,6 +616,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_s (oKeyServer, "keyserver", "@"), ARGPARSE_s_s (oKeyServerOptions, "keyserver-options", "@"), + ARGPARSE_s_s (oKeyOrigin, "key-origin", "@"), ARGPARSE_s_s (oImportOptions, "import-options", "@"), ARGPARSE_s_s (oImportFilter, "import-filter", "@"), ARGPARSE_s_s (oExportOptions, "export-options", "@"), @@ -2845,10 +2847,10 @@ main (int argc, char **argv) case oCompliance: { - int compliance = gnupg_parse_compliance_option (pargs.r.ret_str, - compliance_options, - DIM (compliance_options), - opt.quiet); + 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); @@ -3462,6 +3464,12 @@ main (int argc, char **argv) release_akl(); break; + case oKeyOrigin: + if(!parse_key_origin (pargs.r.ret_str)) + log_error (_("invalid argument for option \"%.50s\"\n"), + "--key-origin"); + break; + case oEnableLargeRSA: #if SECMEM_BUFFER_SIZE >= 65536 opt.flags.large_rsa=1; -- cgit v1.2.3