diff options
author | Werner Koch <[email protected]> | 2014-08-12 08:36:30 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2014-08-14 09:28:11 +0000 |
commit | ae29b52119aa419989b773b2d6abb6e287dfc81b (patch) | |
tree | b651d2b63dfd0fd2d5b85d5be4ac2ad2b94fe0c4 /g10/sig-check.c | |
parent | gpg: Remove options --pgp2 and --rfc1991. (diff) | |
download | gnupg-ae29b52119aa419989b773b2d6abb6e287dfc81b.tar.gz gnupg-ae29b52119aa419989b773b2d6abb6e287dfc81b.zip |
gpg: Disable an MD5 workaround for pgp2 by default.
* g10/sig-check.c (do_check): Move some code to ...
* g10/misc.c (print_md5_rejected_note): new function.
* g10/mainproc.c (proc_tree, proc_plaintext): Enable MD5 workaround
only if option --allow-weak-digest-algos is used.
Diffstat (limited to 'g10/sig-check.c')
-rw-r--r-- | g10/sig-check.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/g10/sig-check.c b/g10/sig-check.c index 0cbb7f2cc..ad2ab5c39 100644 --- a/g10/sig-check.c +++ b/g10/sig-check.c @@ -269,16 +269,7 @@ do_check( PKT_public_key *pk, PKT_signature *sig, gcry_md_hd_t digest, if (sig->digest_algo == GCRY_MD_MD5 && !opt.flags.allow_weak_digest_algos) { - static int shown; - - if (!shown) - { - log_info - (_("Note: signatures using the %s algorithm are rejected\n"), - "MD5"); - shown = 1; - } - + print_md5_rejected_note (); return GPG_ERR_DIGEST_ALGO; } |