From 93d805352ff0b4f650fecc052558554b5f6bfcc0 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Fri, 10 Sep 2021 12:17:11 -0600 Subject: [PATCH] move setting of ENABLED_MD5 --- configure.ac | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 40cef38d6..a979a1da0 100644 --- a/configure.ac +++ b/configure.ac @@ -6340,6 +6340,14 @@ then ENABLED_CERTS=yes fi +if test "$ENABLED_MD5" = "yes" +then + # turn off MD5 if leanpsk or leantls on + if test "$ENABLED_LEANPSK" = "yes" || test "$ENABLED_LEANTLS" = "yes" + then + ENABLED_MD5=no + fi +fi ################################################################################ # Check for build-type conflicts # @@ -6463,13 +6471,6 @@ AS_IF([test "x$ENABLED_AESCTR" = "xyes" && test "x$ENABLED_FORTRESS" != "xyes"], if test "$ENABLED_MD5" = "no" then AM_CFLAGS="$AM_CFLAGS -DNO_MD5 -DNO_OLD_TLS" -else - # turn off MD5 if leanpsk or leantls on - if test "$ENABLED_LEANPSK" = "yes" || test "$ENABLED_LEANTLS" = "yes" - then - AM_CFLAGS="$AM_CFLAGS -DNO_MD5 -DNO_OLD_TLS" - ENABLED_MD5=no - fi fi if test "$ENABLED_OPENSSLEXTRA" = "yes" && test "x$ENABLED_OPENSSLCOEXIST" = "xno"