Skip to content

Commit 8b61cd6

Browse files
authored
Merge pull request #8895 from AlexLanzano/disable-md5
Disable MD5 by default
2 parents 295d906 + 9ae2214 commit 8b61cd6

File tree

1 file changed

+26
-5
lines changed

1 file changed

+26
-5
lines changed

configure.ac

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,6 +1323,7 @@ then
13231323
test "$enable_blake2s" = "" && enable_blake2s=yes
13241324
test "$enable_md2" = "" && enable_md2=yes
13251325
test "$enable_md4" = "" && enable_md4=yes
1326+
test "$enable_md5" = "" && enable_md5=yes
13261327
test "$enable_anon" = "" && enable_anon=yes
13271328
test "$enable_ssh" = "" && test "$enable_hmac" != "no" && enable_ssh=yes
13281329

@@ -4862,8 +4863,6 @@ then
48624863
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_NO_TLS12 -DNO_OLD_TLS"
48634864
fi
48644865

4865-
4866-
48674866
# STACK SIZE info for testwolfcrypt and examples
48684867
AC_ARG_ENABLE([stacksize],
48694868
[AS_HELP_STRING([--enable-stacksize],[Enable stack size info on examples (default: disabled)])],
@@ -5476,11 +5475,24 @@ AC_ARG_ENABLE([arc4],
54765475

54775476
# MD5
54785477
AC_ARG_ENABLE([md5],
5479-
[AS_HELP_STRING([--enable-md5],[Enable MD5 (default: enabled)])],
5478+
[AS_HELP_STRING([--enable-md5],[Enable MD5 (default: disabled)])],
54805479
[ ENABLED_MD5=$enableval ],
5481-
[ ENABLED_MD5=yes ]
5480+
[ ENABLED_MD5=no ]
54825481
)
54835482

5483+
# Options that require MD5
5484+
if test "$ENABLED_WPAS" = "yes" || test "$ENABLED_HAPROXY" = "yes" || \
5485+
test "$ENABLED_KRB" = "yes" || test "$ENABLED_NETSNMP" = "yes" || \
5486+
test "$ENABLED_NGINX" = "yes" || test "$ENABLED_OPENSSH" = "yes" || \
5487+
test "$ENABLED_OPENSSLEXTRA" = "yes" || test "$ENABLED_OPENVPN" = "yes" || \
5488+
test "$ENABLED_TLSV10" = "yes" || test "$ENABLED_OLD_TLS" = "yes" || \
5489+
test "$ENABLED_FORTRESS" = "yes" || test "$ENABLED_LIGHTY" = "yes" || \
5490+
test "$ENABLED_DES3" = "yes" || test "$ENABLED_BUMP" = "yes" || \
5491+
test "$ENABLED_OPENSSLALL" = "yes"
5492+
then
5493+
ENABLED_MD5=yes
5494+
fi
5495+
54845496
# SHA
54855497
AC_ARG_ENABLE([sha],
54865498
[AS_HELP_STRING([--enable-sha],[Enable SHA (default: enabled)])],
@@ -7472,6 +7484,7 @@ then
74727484
74737485
if test "x$ENABLED_OPENSSLEXTRA" = "xno"
74747486
then
7487+
ENABLED_MD5="yes"
74757488
ENABLED_OPENSSLEXTRA="yes"
74767489
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_EXTRA"
74777490
fi
@@ -7830,6 +7843,7 @@ then
78307843
then
78317844
ENABLED_OPENSSLALL="yes"
78327845
ENABLED_OPENSSLEXTRA="yes"
7846+
ENABLED_MD5="yes"
78337847
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_EXTRA -DOPENSSL_ALL"
78347848
fi
78357849
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ASIO -DASIO_USE_WOLFSSL -DWOLFSSL_KEY_GEN"
@@ -8037,6 +8051,11 @@ then
80378051
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_KEY_GEN"
80388052
fi
80398053
8054+
if test "x$ENABLED_MD5" = "xno"
8055+
then
8056+
ENABLED_MD5="yes"
8057+
fi
8058+
80408059
AM_CFLAGS="$AM_CFLAGS -DHAVE_STUNNEL -DWOLFSSL_ALWAYS_VERIFY_CB"
80418060
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ALWAYS_KEEP_SNI -DHAVE_EX_DATA"
80428061
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SIGNER_DER_CERT"
@@ -9236,6 +9255,8 @@ then
92369255
# Use the smaller object size implementation
92379256
ENABLED_AESGCM=yes
92389257
fi
9258+
9259+
ENABLED_MD5=yes
92399260
fi
92409261
92419262
if test "$ENABLED_MCAPI" = "yes" && test "$ENABLED_SHA512" = "no"
@@ -10191,7 +10212,7 @@ fi
1019110212
1019210213
if test "$ENABLED_OPENSSLEXTRA" = "yes"
1019310214
then
10194-
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_EXTRA"
10215+
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_EXTRA"
1019510216
fi
1019610217
1019710218
if test "$ENABLED_OPENSSLEXTRA" = "x509small"

0 commit comments

Comments
 (0)