From cb1548bc5f207978f6ba287040eaea25c34b5786 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 28 Aug 2019 16:00:01 +0100 Subject: [PATCH] Fix no-des Don't refer to cipher functions in the providers that have been compiled out. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9719) --- providers/default/defltprov.c | 2 ++ providers/fips/fipsprov.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/providers/default/defltprov.c b/providers/default/defltprov.c index 2498d068df..c481171a78 100644 --- a/providers/default/defltprov.c +++ b/providers/default/defltprov.c @@ -173,6 +173,7 @@ static const OSSL_ALGORITHM deflt_ciphers[] = { { "CAMELLIA-192-CTR", "default=yes", camellia192ctr_functions }, { "CAMELLIA-128-CTR", "default=yes", camellia128ctr_functions }, #endif /* OPENSSL_NO_CAMELLIA */ +#ifndef OPENSSL_NO_DES { "DES-EDE3", "default=yes", tdes_ede3_ecb_functions }, { "DES-EDE3-CBC", "default=yes", tdes_ede3_cbc_functions }, { "DES-EDE3-OFB", "default=yes", tdes_ede3_ofb_functions }, @@ -185,6 +186,7 @@ static const OSSL_ALGORITHM deflt_ciphers[] = { { "DES-EDE-CFB", "default=yes", tdes_ede2_cfb_functions }, { "DESX-CBC", "default=yes", tdes_desx_cbc_functions }, { "id-smime-alg-CMS3DESwrap", "default=yes", tdes_wrap_cbc_functions }, +#endif /* OPENSSL_NO_DES */ { NULL, NULL, NULL } }; diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index 8e68a6c843..9a7193bb4f 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -324,8 +324,10 @@ static const OSSL_ALGORITHM fips_ciphers[] = { { "id-aes256-CCM", "fips=yes", aes256ccm_functions }, { "id-aes192-CCM", "fips=yes", aes192ccm_functions }, { "id-aes128-CCM", "fips=yes", aes128ccm_functions }, +#ifndef OPENSSL_NO_DES { "DES-EDE3", "fips=yes", tdes_ede3_ecb_functions }, { "DES-EDE3-CBC", "fips=yes", tdes_ede3_cbc_functions }, +#endif /* OPENSSL_NO_DES */ { NULL, NULL, NULL } }; -- 2.25.1