summaryrefslogtreecommitdiffstats
path: root/providers/default/defltprov.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2019-08-28 17:00:01 +0200
committerMatt Caswell <matt@openssl.org>2019-08-29 12:04:04 +0200
commitcb1548bc5f207978f6ba287040eaea25c34b5786 (patch)
tree09346851369f338dc870a295ed402303997f9d95 /providers/default/defltprov.c
parentUpdate fuzz README.md (diff)
downloadopenssl-cb1548bc5f207978f6ba287040eaea25c34b5786.tar.xz
openssl-cb1548bc5f207978f6ba287040eaea25c34b5786.zip
Fix no-des
Don't refer to cipher functions in the providers that have been compiled out. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9719)
Diffstat (limited to 'providers/default/defltprov.c')
-rw-r--r--providers/default/defltprov.c2
1 files changed, 2 insertions, 0 deletions
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 }
};