diff options
author | Werner Koch <[email protected]> | 2018-05-29 10:42:44 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2018-05-29 10:42:52 +0000 |
commit | 253e8bdd9014cbe6dc06adce9d9dd2f8f4b31709 (patch) | |
tree | ce2d7b23b0025145cfdf722d27a7501b81f9b0b7 /g10/cipher-cfb.c | |
parent | gpg: Fix detection of the AEAD feature flag. (diff) | |
download | gnupg-253e8bdd9014cbe6dc06adce9d9dd2f8f4b31709.tar.gz gnupg-253e8bdd9014cbe6dc06adce9d9dd2f8f4b31709.zip |
gpg: Remove MDC options
* g10/gpg.c: Tuen options --force-mdc, --no-force-mdc, --disable-mdc
and --no-disable-mdc into NOPs.
* g10/encrypt.c (use_mdc): Simplify. MDC is now almost always used.
(use_aead): Ignore MDC options. Print warning for missing MDC feature
flags.
* g10/pkclist.c (warn_missing_mdc_from_pklist): Rename to ...
(warn_missing_aead_from_pklist): this and adjust.
--
The MDC is now always used except with --rfc2440 which will lead to a
a big fat warning.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/cipher-cfb.c')
-rw-r--r-- | g10/cipher-cfb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/cipher-cfb.c b/g10/cipher-cfb.c index 48927c558..3ba8eb738 100644 --- a/g10/cipher-cfb.c +++ b/g10/cipher-cfb.c @@ -33,6 +33,7 @@ #include "packet.h" #include "options.h" #include "main.h" +#include "../common/i18n.h" #include "../common/status.h" @@ -66,8 +67,9 @@ write_header (cipher_filter_context_t *cfx, iobuf_t a) } else { - log_info ("WARNING: " - "encrypting without integrity protection is dangerous\n"); + log_info (_("WARNING: " + "encrypting without integrity protection is dangerous\n")); + log_info (_("Hint: Do not use option %s\n"), "--rfc2440"); } write_status_printf (STATUS_BEGIN_ENCRYPTION, "%d %d", |