Merge pull request #8895 from AlexLanzano/disable-md5

Disable MD5 by default
This commit is contained in:
David Garske
2025-06-27 08:45:28 -07:00
committed by GitHub

View File

@@ -1323,6 +1323,7 @@ then
test "$enable_blake2s" = "" && enable_blake2s=yes
test "$enable_md2" = "" && enable_md2=yes
test "$enable_md4" = "" && enable_md4=yes
test "$enable_md5" = "" && enable_md5=yes
test "$enable_anon" = "" && enable_anon=yes
test "$enable_ssh" = "" && test "$enable_hmac" != "no" && enable_ssh=yes
@@ -4862,8 +4863,6 @@ then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_NO_TLS12 -DNO_OLD_TLS"
fi
# STACK SIZE info for testwolfcrypt and examples
AC_ARG_ENABLE([stacksize],
[AS_HELP_STRING([--enable-stacksize],[Enable stack size info on examples (default: disabled)])],
@@ -5476,11 +5475,24 @@ AC_ARG_ENABLE([arc4],
# MD5
AC_ARG_ENABLE([md5],
[AS_HELP_STRING([--enable-md5],[Enable MD5 (default: enabled)])],
[AS_HELP_STRING([--enable-md5],[Enable MD5 (default: disabled)])],
[ ENABLED_MD5=$enableval ],
[ ENABLED_MD5=yes ]
[ ENABLED_MD5=no ]
)
# Options that require MD5
if test "$ENABLED_WPAS" = "yes" || test "$ENABLED_HAPROXY" = "yes" || \
test "$ENABLED_KRB" = "yes" || test "$ENABLED_NETSNMP" = "yes" || \
test "$ENABLED_NGINX" = "yes" || test "$ENABLED_OPENSSH" = "yes" || \
test "$ENABLED_OPENSSLEXTRA" = "yes" || test "$ENABLED_OPENVPN" = "yes" || \
test "$ENABLED_TLSV10" = "yes" || test "$ENABLED_OLD_TLS" = "yes" || \
test "$ENABLED_FORTRESS" = "yes" || test "$ENABLED_LIGHTY" = "yes" || \
test "$ENABLED_DES3" = "yes" || test "$ENABLED_BUMP" = "yes" || \
test "$ENABLED_OPENSSLALL" = "yes"
then
ENABLED_MD5=yes
fi
# SHA
AC_ARG_ENABLE([sha],
[AS_HELP_STRING([--enable-sha],[Enable SHA (default: enabled)])],
@@ -7472,6 +7484,7 @@ then
if test "x$ENABLED_OPENSSLEXTRA" = "xno"
then
ENABLED_MD5="yes"
ENABLED_OPENSSLEXTRA="yes"
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_EXTRA"
fi
@@ -7830,6 +7843,7 @@ then
then
ENABLED_OPENSSLALL="yes"
ENABLED_OPENSSLEXTRA="yes"
ENABLED_MD5="yes"
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_EXTRA -DOPENSSL_ALL"
fi
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ASIO -DASIO_USE_WOLFSSL -DWOLFSSL_KEY_GEN"
@@ -8037,6 +8051,11 @@ then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_KEY_GEN"
fi
if test "x$ENABLED_MD5" = "xno"
then
ENABLED_MD5="yes"
fi
AM_CFLAGS="$AM_CFLAGS -DHAVE_STUNNEL -DWOLFSSL_ALWAYS_VERIFY_CB"
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ALWAYS_KEEP_SNI -DHAVE_EX_DATA"
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SIGNER_DER_CERT"
@@ -9236,6 +9255,8 @@ then
# Use the smaller object size implementation
ENABLED_AESGCM=yes
fi
ENABLED_MD5=yes
fi
if test "$ENABLED_MCAPI" = "yes" && test "$ENABLED_SHA512" = "no"
@@ -10191,7 +10212,7 @@ fi
if test "$ENABLED_OPENSSLEXTRA" = "yes"
then
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_EXTRA"
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_EXTRA"
fi
if test "$ENABLED_OPENSSLEXTRA" = "x509small"