From 253e8bdd9014cbe6dc06adce9d9dd2f8f4b31709 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 29 May 2018 12:42:44 +0200 Subject: 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 --- g10/keydb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/keydb.h') diff --git a/g10/keydb.h b/g10/keydb.h index c65af0204..bd156a6a3 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -236,7 +236,7 @@ int select_algo_from_prefs( PK_LIST pk_list, int preftype, int request, const union pref_hint *hint); int select_mdc_from_pklist (PK_LIST pk_list); aead_algo_t select_aead_from_pklist (pk_list_t pk_list); -void warn_missing_mdc_from_pklist (PK_LIST pk_list); +void warn_missing_aead_from_pklist (PK_LIST pk_list); void warn_missing_aes_from_pklist (PK_LIST pk_list); /*-- skclist.c --*/ -- cgit v1.2.3