Skip to content

Commit 495324d

Browse files
committed
Add the md5 dependency to options that require it
1 parent 07f7672 commit 495324d

1 file changed

Lines changed: 15 additions & 2 deletions

File tree

configure.ac

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4817,7 +4817,6 @@ fi
48174817
if test "$ENABLED_TLSV10" = "yes"
48184818
then
48194819
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ALLOW_TLSV10"
4820-
enable_md5=yes
48214820
fi
48224821

48234822

@@ -5481,6 +5480,16 @@ AC_ARG_ENABLE([md5],
54815480
[ 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+
then
5490+
ENABLED_MD5=yes
5491+
fi
5492+
54845493
# SHA
54855494
AC_ARG_ENABLE([sha],
54865495
[AS_HELP_STRING([--enable-sha],[Enable SHA (default: enabled)])],
@@ -8034,6 +8043,11 @@ then
80348043
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_KEY_GEN"
80358044
fi
80368045
8046+
if test "x$ENABLED_MD5" = "xno"
8047+
then
8048+
ENABLED_MD5="yes"
8049+
fi
8050+
80378051
AM_CFLAGS="$AM_CFLAGS -DHAVE_STUNNEL -DWOLFSSL_ALWAYS_VERIFY_CB"
80388052
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ALWAYS_KEEP_SNI -DHAVE_EX_DATA"
80398053
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SIGNER_DER_CERT"
@@ -10188,7 +10202,6 @@ fi
1018810202
1018910203
if test "$ENABLED_OPENSSLEXTRA" = "yes"
1019010204
then
10191-
enable_md5=yes
1019210205
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_EXTRA"
1019310206
fi
1019410207

0 commit comments

Comments
 (0)