From f13263d045be6972cd016a0e9b869c2935de09c2 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 7 Apr 2010 17:46:32 +0000
Subject: [PATCH] ECC-GOST may not be 11, moved to experimental again, and not
 default on

git-svn-id: file:///svn/unbound/trunk@2066 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 configure    | 8 ++++----
 configure.ac | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 8f6be0bf7..3f4de6240 100755
--- a/configure
+++ b/configure
@@ -1585,7 +1585,7 @@ Optional Features:
   --disable-rpath         disable hardcoded rpath (default=enabled)
   --disable-largefile     omit support for large files
   --disable-sha2          Disable SHA256 and SHA512 RRSIG support
-  --disable-gost          Disable GOST support
+  --enable-gost           Enable GOST support, experimental
   --enable-static-exe     enable to compile executables statically against
                           event, ldns libs, for debug purposes
   --enable-lock-checks    enable to check lock and unlock calls, for debug
@@ -19995,9 +19995,7 @@ if test "${enable_gost+set}" = set; then
 fi
 
 case "$enable_gost" in
-	no)
-	;;
-	yes|*)
+	yes)
 	{ $as_echo "$as_me:$LINENO: checking for EVP_PKEY_set_type_str" >&5
 $as_echo_n "checking for EVP_PKEY_set_type_str... " >&6; }
 if test "${ac_cv_func_EVP_PKEY_set_type_str+set}" = set; then
@@ -20097,6 +20095,8 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 	;;
+	no|*)
+	;;
 esac
 
 # check for libevent
diff --git a/configure.ac b/configure.ac
index 836dc7924..6ca9c2b43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -418,14 +418,14 @@ case "$enable_sha2" in
 	;;
 esac
 
-AC_ARG_ENABLE(gost, AC_HELP_STRING([--disable-gost], [Disable GOST support]))
+AC_ARG_ENABLE(gost, AC_HELP_STRING([--enable-gost], [Enable GOST support, experimental]))
 case "$enable_gost" in
-	no)
-	;;
-	yes|*)
+	yes)
 	AC_CHECK_FUNC(EVP_PKEY_set_type_str, [:],[AC_MSG_ERROR([OpenSSL >= 1.0.0 is needed for GOST support, upgrade openssl or rerun with --disable-gost])])
 	AC_DEFINE([USE_GOST], [1], [Define this to enable GOST support.])
 	;;
+	no|*)
+	;;
 esac
 
 # check for libevent
-- 
2.47.2