summaryrefslogtreecommitdiffstats
path: root/g10/options.h
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2015-10-23 23:46:57 +0200
committerWerner Koch <wk@gnupg.org>2015-10-26 16:56:56 +0100
commit91015d021b3dcbe21ad0e580a4f34c523abf9e72 (patch)
treeb01eb463119fa01aacb6a191e2cbbbe9521c951c /g10/options.h
parentw32: Make it build again if Tofu support is not available. (diff)
downloadgnupg2-91015d021b3dcbe21ad0e580a4f34c523abf9e72.tar.xz
gnupg2-91015d021b3dcbe21ad0e580a4f34c523abf9e72.zip
gpg: Ensure all weak digest rejection notices are shown
* g10/main.h: Add rejection_shown flag to each weakhash struct * g10/misc.c (print_digest_algo_note, additional_weak_digest): Do not treat MD5 separately; (print_digest_rejected_note): Use weakhash.rejection_shown instead of static shown. * g10/options.h (opt): Change from additional_weak_digests to weak_digests. * g10/sig-check.c: Do not treat MD5 separately. * g10/gpg.c (main): Explicitly set MD5 as weak. * g10/gpgv.c (main): Explicitly set MD5 as weak. -- Previously, only one weak digest rejection message was shown, of whichever was the first type encountered. This meant that if "gpg --weak-digest SHA224" encountered both an MD5 digest and a SHA224 digest, it would only show the user that the MD5 digest was rejected. In order to let the user know which algorithms were rejected, we needed to move the "shown" flag into a per-weak-algorithm location. Given this additional complication, it made no sense to continue to treat MD5 specially, so it is added as a default weak algorithm in the same opt.weak_digests data structure as any other. Signed-Off-By: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Diffstat (limited to 'g10/options.h')
-rw-r--r--g10/options.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/options.h b/g10/options.h
index 0c674e6a5..4c7a5db9e 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -169,7 +169,7 @@ struct
prefitem_t *personal_cipher_prefs;
prefitem_t *personal_digest_prefs;
prefitem_t *personal_compress_prefs;
- struct weakhash *additional_weak_digests;
+ struct weakhash *weak_digests;
int no_perm_warn;
int no_mdc_warn;
char *temp_dir;