diff options
author | Werner Koch <[email protected]> | 2016-06-13 09:24:09 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2016-06-13 09:24:09 +0000 |
commit | 61e7fd68c05ed185728e9da45f7a44a2323065ad (patch) | |
tree | b15ce50d5fd51ea6833f0620e51df5ae8bbd7bc4 /g10/mainproc.c | |
parent | gpg: Try Signer's User ID sub-packet with --auto-key-retrieve. (diff) | |
download | gnupg-61e7fd68c05ed185728e9da45f7a44a2323065ad.tar.gz gnupg-61e7fd68c05ed185728e9da45f7a44a2323065ad.zip |
gpg: New option --disable-signer-uid, create Signer's UID sub-packet.
* g10/gpg.c (oDisableSignerUID): New.
(opts): New option '--disable-signer-uid'.
(main): Set option.
* g10/options.h (opt): Add field flags.disable_signer_uid.
* g10/sign.c: Include mbox-util.h.
(mk_notation_policy_etc): Embed the signer's uid.
* g10/mainproc.c (check_sig_and_print): Do not use WKD for auto key
retrieval if --disable-signer-uid is used.
--
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/mainproc.c')
-rw-r--r-- | g10/mainproc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index 7033de7dd..453d1b07b 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1823,6 +1823,7 @@ check_sig_and_print (CTX c, kbnode_t node) * key from the WKD. */ if (gpg_err_code (rc) == GPG_ERR_NO_PUBKEY && (opt.keyserver_options.options & KEYSERVER_AUTO_KEY_RETRIEVE) + && !opt.flags.disable_signer_uid && akl_has_wkd_method () && sig->signers_uid) { |