From 86e15a0b59bb6f745e34b160009a123f646b6b51 Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Wed, 6 Sep 2017 11:28:02 +0200
Subject: [PATCH] Changed --enable-openssl-hash default

---
 configure    | 35 +++++++++++------------------------
 configure.in | 35 +++++++++++------------------------
 2 files changed, 22 insertions(+), 48 deletions(-)

diff --git a/configure b/configure
index f8ebd0815e..64682905f6 100755
--- a/configure
+++ b/configure
@@ -1714,7 +1714,7 @@ Optional Features:
   --enable-devpoll        use /dev/poll when available [default=yes]
   --enable-threads        enable multithreading
   --enable-native-pkcs11  use native PKCS11 for all crypto [default=no]
-  --enable-openssl-hash   use OpenSSL for hash functions [default=no]
+  --enable-openssl-hash   use OpenSSL for hash functions [default=yes]
   --enable-openssl-version-check
                           check OpenSSL version [default=yes]
   --enable-largefile	  64-bit file support
@@ -15867,7 +15867,7 @@ fi
 if test "${enable_openssl_hash+set}" = set; then :
   enableval=$enable_openssl_hash; want_openssl_hash="$enableval"
 else
-  want_openssl_hash="checkcc"
+  want_openssl_hash="whenossl"
 fi
 
 
@@ -16640,13 +16640,6 @@ case $with_cc_alg in
 	sha1)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: sha1" >&5
 $as_echo "sha1" >&6; }
-		if test "X$CRYPTO" = "X-DOPENSSL"
-		then
-			if test "checkcc" = "$want_openssl_hash"
-			then
-				want_openssl_hash="yes"
-			fi
-		fi
 
 $as_echo "#define HMAC_SHA1_CC 1" >>confdefs.h
 
@@ -16654,13 +16647,6 @@ $as_echo "#define HMAC_SHA1_CC 1" >>confdefs.h
 	sha256)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: sha256" >&5
 $as_echo "sha256" >&6; }
-		if test "X$CRYPTO" = "X-DOPENSSL"
-		then
-			if test "checkcc" = "$want_openssl_hash"
-			then
-				want_openssl_hash="yes"
-			fi
-		fi
 
 $as_echo "#define HMAC_SHA256_CC 1" >>confdefs.h
 
@@ -16668,19 +16654,11 @@ $as_echo "#define HMAC_SHA256_CC 1" >>confdefs.h
 	aes)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: aes" >&5
 $as_echo "aes" >&6; }
-		if test "yes" != "$with_aes"
-		then
-			as_fn_error $? "\"Client Cookie wants to use unavailable AES\"" "$LINENO" 5;
-		fi
 
 $as_echo "#define AES_CC 1" >>confdefs.h
 
 		;;
 esac
-if test "checkcc" = "$want_openssl_hash"
-then
-	want_openssl_hash="no"
-fi
 
 #
 # Use OpenSSL for hash functions
@@ -16689,6 +16667,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for using OpenSSL for hash functions" >&5
 $as_echo_n "checking for using OpenSSL for hash functions... " >&6; }
 ISC_PLATFORM_OPENSSLHASH="#undef ISC_PLATFORM_OPENSSLHASH"
+if test "whenossl" = "$want_openssl_hash"
+then
+	if test "$CRYPTO" = "-DOPENSSL"
+	then
+		want_openssl_hash="yes"
+	else
+		want_openssl_hash="no"
+	fi
+fi
 case $want_openssl_hash in
 	yes)
 		if test "$CRYPTO" != "-DOPENSSL"
diff --git a/configure.in b/configure.in
index 4d422998cf..5bb34f6b32 100644
--- a/configure.in
+++ b/configure.in
@@ -1475,8 +1475,8 @@ AC_ARG_WITH(aes, [  --with-aes              Crypto AES],
 # was --enable-openssl-hash specified?
 #
 AC_ARG_ENABLE(openssl-hash,
-	[  --enable-openssl-hash   use OpenSSL for hash functions [[default=no]]],
-	want_openssl_hash="$enableval", want_openssl_hash="checkcc")
+	[  --enable-openssl-hash   use OpenSSL for hash functions [[default=yes]]],
+	want_openssl_hash="$enableval", want_openssl_hash="whenossl")
 
 #
 # Client Cookie algorithm choice
@@ -2064,42 +2064,20 @@ fi
 case $with_cc_alg in
 	sha1)
 		AC_MSG_RESULT(sha1)
-		if test "X$CRYPTO" = "X-DOPENSSL"
-		then
-			if test "checkcc" = "$want_openssl_hash"
-			then
-				want_openssl_hash="yes"
-			fi
-		fi
 		AC_DEFINE(HMAC_SHA1_CC, 1,
 			  [Use HMAC-SHA1 for Client Cookie generation])
 		;;
 	sha256)
 		AC_MSG_RESULT(sha256)
-		if test "X$CRYPTO" = "X-DOPENSSL"
-		then
-			if test "checkcc" = "$want_openssl_hash"
-			then
-				want_openssl_hash="yes"
-			fi
-		fi
 		AC_DEFINE(HMAC_SHA256_CC, 1,
 			  [Use HMAC-SHA256 for Client Cookie generation])
 		;;
 	aes)
 		AC_MSG_RESULT(aes)
-		if test "yes" != "$with_aes"
-		then
-			AC_MSG_ERROR("Client Cookie wants to use unavailable AES");
-		fi
 		AC_DEFINE(AES_CC, 1,
 			  [Use AES for Client Cookie generation])
 		;;
 esac
-if test "checkcc" = "$want_openssl_hash"
-then
-	want_openssl_hash="no"
-fi
 
 #
 # Use OpenSSL for hash functions
@@ -2107,6 +2085,15 @@ fi
 
 AC_MSG_CHECKING(for using OpenSSL for hash functions)
 ISC_PLATFORM_OPENSSLHASH="#undef ISC_PLATFORM_OPENSSLHASH"
+if test "whenossl" = "$want_openssl_hash"
+then
+	if test "$CRYPTO" = "-DOPENSSL"
+	then
+		want_openssl_hash="yes"
+	else
+		want_openssl_hash="no"
+	fi
+fi
 case $want_openssl_hash in
 	yes)
 		if test "$CRYPTO" != "-DOPENSSL"