diff options
| author | Werner Koch <[email protected]> | 2014-03-17 16:54:36 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-03-17 17:14:23 +0000 |
| commit | f90cfe6b66269de0154d810c5cee1fe9a5af475c (patch) | |
| tree | 8029968d62c1aa04655c4e942cb5d0b08972a5bb /g10/gpg.c | |
| parent | gpg: Make --auto-key-locate work again with keyservers. (diff) | |
| download | gnupg-f90cfe6b66269de0154d810c5cee1fe9a5af475c.tar.gz gnupg-f90cfe6b66269de0154d810c5cee1fe9a5af475c.zip | |
gpg: Reject signatures made with MD5.
* g10/gpg.c: Add option --allow-weak-digest-algos.
(main): Set option also in PGP2 mode.
* g10/options.h (struct opt): Add flags.allow_weak_digest_algos.
* g10/sig-check.c (do_check): Reject MD5 signatures.
* tests/openpgp/defs.inc: Add allow_weak_digest_algos to gpg.conf.
Diffstat (limited to 'g10/gpg.c')
| -rw-r--r-- | g10/gpg.c | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -374,6 +374,7 @@ enum cmd_and_opt_values oDisableDSA2, oAllowMultipleMessages, oNoAllowMultipleMessages, + oAllowWeakDigestAlgos, oFakedSystemTime, oNoop @@ -768,6 +769,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_n (oDisableDSA2, "disable-dsa2", "@"), ARGPARSE_s_n (oAllowMultipleMessages, "allow-multiple-messages", "@"), ARGPARSE_s_n (oNoAllowMultipleMessages, "no-allow-multiple-messages", "@"), + ARGPARSE_s_n (oAllowWeakDigestAlgos, "allow-weak-digest-algos", "@"), /* These two are aliases to help users of the PGP command line product use gpg with minimal pain. Many commands are common @@ -3066,6 +3068,10 @@ main (int argc, char **argv) opt.flags.allow_multiple_messages=0; break; + case oAllowWeakDigestAlgos: + opt.flags.allow_weak_digest_algos = 1; + break; + case oFakedSystemTime: { time_t faked_time = isotime2epoch (pargs.r.ret_str); @@ -3280,6 +3286,7 @@ main (int argc, char **argv) opt.pgp2_workarounds = 1; opt.ask_sig_expire = 0; opt.ask_cert_expire = 0; + opt.flags.allow_weak_digest_algos = 1; xfree(def_digest_string); def_digest_string = xstrdup("md5"); xfree(s2k_digest_string); |