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/gpg.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/gpg.c')
| -rw-r--r-- | g10/gpg.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -396,6 +396,7 @@ enum cmd_and_opt_values oWeakDigest, oUnwrap, oOnlySignTextIDs, + oDisableSignerUID, oNoop }; @@ -550,6 +551,8 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_n (oDisableMDC, "disable-mdc", "@"), ARGPARSE_s_n (oNoDisableMDC, "no-disable-mdc", "@"), + ARGPARSE_s_n (oDisableSignerUID, "disable-signer-uid", "@"), + ARGPARSE_s_n (oDryRun, "dry-run", N_("do not make any changes")), ARGPARSE_s_n (oInteractive, "interactive", N_("prompt before overwriting")), @@ -2799,6 +2802,9 @@ main (int argc, char **argv) case oNoForceMDC: opt.force_mdc = 0; break; case oDisableMDC: opt.disable_mdc = 1; break; case oNoDisableMDC: opt.disable_mdc = 0; break; + + case oDisableSignerUID: opt.flags.disable_signer_uid = 1; break; + case oS2KMode: opt.s2k_mode = pargs.r.ret_int; break; case oS2KDigest: s2k_digest_string = xstrdup(pargs.r.ret_str); break; case oS2KCipher: s2k_cipher_string = xstrdup(pargs.r.ret_str); break; |