diff --git a/configure b/configure
index 9cc9799ad3..f06e4e33a0 100755
--- a/configure
+++ b/configure
@@ -15620,6 +15620,21 @@ DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS"
 # Use OpenSSL for hash functions and/or aes
 #
 
+saved_libs="$LIBS"
+LIBS="$LIBS $DNS_CRYPTO_LIBS"
+for ac_func in AES_encrypt
+do :
+  ac_fn_c_check_func "$LINENO" "AES_encrypt" "ac_cv_func_AES_encrypt"
+if test "x$ac_cv_func_AES_encrypt" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AES_ENCRYPT 1
+_ACEOF
+
+fi
+done
+
+LIBS="$saved_libs"
+
 { $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; }
 # Check whether --enable-openssl-hash was given.
@@ -15666,21 +15681,6 @@ $as_echo "#define HMAC_SHA256_SIT 1" >>confdefs.h
 
 		;;
 	auto)
-		saved_libs="$LIBS"
-		LIBS="$LIBS $DNS_CRYPTO_LIBS"
-		for ac_func in AES_encrypt
-do :
-  ac_fn_c_check_func "$LINENO" "AES_encrypt" "ac_cv_func_AES_encrypt"
-if test "x$ac_cv_func_AES_encrypt" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_AES_ENCRYPT 1
-_ACEOF
-
-fi
-done
-
-		LIBS="$saved_libs"
-
 		if test "$ac_cv_func_AES_encrypt" = "yes"
 		then
 			with_sit_alg="aes"
@@ -15690,7 +15690,10 @@ $as_echo "#define AES_SIT 1" >>confdefs.h
 
 		else
 			with_sit_alg="sha256"
-			want_openssl_hash="yes"
+			if test "$CRYPTO" = "-DOPENSSL"
+			then
+				want_openssl_hash="yes"
+			fi
 
 $as_echo "#define HMAC_SHA256_SIT 1" >>confdefs.h
 
diff --git a/configure.in b/configure.in
index b0522d13ba..f0a6ce9b0f 100644
--- a/configure.in
+++ b/configure.in
@@ -1520,6 +1520,11 @@ DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS"
 # Use OpenSSL for hash functions and/or aes
 #
 
+saved_libs="$LIBS"
+LIBS="$LIBS $DNS_CRYPTO_LIBS"
+AC_CHECK_FUNCS(AES_encrypt)
+LIBS="$saved_libs"
+
 AC_MSG_CHECKING(for using OpenSSL for hash functions)
 AC_ARG_ENABLE(openssl-hash,
 	[  --enable-openssl-hash   use OpenSSL for hash functions [[default=no]]],
@@ -1550,11 +1555,6 @@ case $with_sit_alg in
 			  [Use HMAC-SHA256 for Source Identity Token generation])
 		;;
 	auto)
-		saved_libs="$LIBS"
-		LIBS="$LIBS $DNS_CRYPTO_LIBS"
-		AC_CHECK_FUNCS(AES_encrypt)
-		LIBS="$saved_libs"
-		
 		if test "$ac_cv_func_AES_encrypt" = "yes"
 		then
 			with_sit_alg="aes"
@@ -1563,7 +1563,10 @@ case $with_sit_alg in
 				 [Use AES for Source Identity Token generation])
 		else
 			with_sit_alg="sha256"
-			want_openssl_hash="yes"
+			if test "$CRYPTO" = "-DOPENSSL"
+			then
+				want_openssl_hash="yes"
+			fi
 			AC_DEFINE(HMAC_SHA256_SIT, 1,
 		         [Use HMAC-SHA256 for Source Identity Token generation])
 		fi