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

diff --git a/configure b/configure
index 8f6be0bf7f8aa5adc691466cd55a1123cd5b7384..3f4de6240e42f731f887840cb447c5a2618ab635 100755 (executable)
--- 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 836dc7924f2ea9048f7b806eb674e897f886084f..6ca9c2b43046dbcc5c87d58c650515ce2d8f22a3 100644 (file)
--- 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