aboutsummaryrefslogtreecommitdiffstats
path: root/g10/options.h
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-07-13 15:28:32 +0000
committerWerner Koch <[email protected]>2017-07-13 16:29:01 +0000
commitfa1155e89ebb4b16ee95549b8ab72672df3a0c54 (patch)
tree515f2f5684c032772406b27e4ea94a91c87e766a /g10/options.h
parentdoc: Document gnupg version requirement for gpg-preset-passphrase. (diff)
downloadgnupg-fa1155e89ebb4b16ee95549b8ab72672df3a0c54.tar.gz
gnupg-fa1155e89ebb4b16ee95549b8ab72672df3a0c54.zip
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 <[email protected]>
Diffstat (limited to 'g10/options.h')
-rw-r--r--g10/options.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/g10/options.h b/g10/options.h
index 98417d7df..5bb506e52 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -263,6 +263,9 @@ struct
struct akl *next;
} *auto_key_locate;
+ /* The value of --key-origin. See parse_key_origin(). */
+ int key_origin;
+
int passphrase_repeat;
int pinentry_mode;