aboutsummaryrefslogtreecommitdiffstats
path: root/g10/gpg.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-07-24 19:07:03 +0000
committerWerner Koch <[email protected]>2017-07-24 19:10:58 +0000
commit87b5421ca84bbea68217c9ed771ee8c0a98a4d0c (patch)
tree07df766cc85680c315c81f953079f2bd30139e65 /g10/gpg.c
parentgpg: Store key origin info for new keys from a keyserver (diff)
downloadgnupg-87b5421ca84bbea68217c9ed771ee8c0a98a4d0c.tar.gz
gnupg-87b5421ca84bbea68217c9ed771ee8c0a98a4d0c.zip
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) <aImport>: 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 <[email protected]>
Diffstat (limited to '')
-rw-r--r--g10/gpg.c2
1 files changed, 1 insertions, 1 deletions
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