From 87b5421ca84bbea68217c9ed771ee8c0a98a4d0c Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 24 Jul 2017 21:07:03 +0200 Subject: gpg: Extend --key-origin to take an optional URL arg. * g10/getkey.c (parse_key_origin): Parse appended URL. * g10/options.h (struct opt): Add field 'key_origin_url'. * g10/gpg.c (main) : Pass that option to import_keys. * g10/import.c (apply_meta_data): Extend for file and url. * g10/keyserver.c (keyserver_fetch): Pass the url to import_keys_es_stream. -- Example: gpg --key-origin url,myscheme://bla --import FILE Signed-off-by: Werner Koch --- g10/gpg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/gpg.c') diff --git a/g10/gpg.c b/g10/gpg.c index 7495e179d..52b6089e9 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -4515,7 +4515,7 @@ main (int argc, char **argv) opt.import_options |= IMPORT_FAST; /* fall through */ case aImport: import_keys (ctrl, argc? argv:NULL, argc, NULL, - opt.import_options, opt.key_origin, NULL); + opt.import_options, opt.key_origin, opt.key_origin_url); break; /* TODO: There are a number of command that use this same -- cgit v1.2.3