From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 1 Nov 2010 11:24:07 +0000 (+0000)
Subject: GOST code enabled by default (RFC 5933)
X-Git-Tag: release-1.4.7rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93ffd446086cf4d8d3f1b07a0daaff58e6f56b4d;p=thirdparty%2Funbound.git

GOST code enabled by default (RFC 5933)


git-svn-id: file:///svn/unbound/trunk@2323 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/configure b/configure
index 4929af358..ebad525be 100755
--- a/configure
+++ b/configure
@@ -1542,7 +1542,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
-  --enable-gost           Enable GOST support, experimental
+  --disable-gost          Disable GOST support
   --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
@@ -15306,7 +15306,9 @@ fi
 
 use_gost="no"
 case "$enable_gost" in
-	yes)
+	no)
+	;;
+	*)
 	ac_fn_c_check_func "$LINENO" "EVP_PKEY_set_type_str" "ac_cv_func_EVP_PKEY_set_type_str"
 if test "x$ac_cv_func_EVP_PKEY_set_type_str" = x""yes; then :
   :
@@ -15314,22 +15316,17 @@ else
   as_fn_error "OpenSSL 1.0.0 is needed for GOST support" "$LINENO" 5
 fi
 
-	use_gost="yes"
-
-$as_echo "#define USE_GOST 1" >>confdefs.h
+        ac_fn_c_check_func "$LINENO" "EC_KEY_new" "ac_cv_func_EC_KEY_new"
+if test "x$ac_cv_func_EC_KEY_new" = x""yes; then :
 
-	;;
-	no)
-	;;
-	*) 	ac_fn_c_check_func "$LINENO" "EVP_PKEY_set_type_str" "ac_cv_func_EVP_PKEY_set_type_str"
-if test "x$ac_cv_func_EVP_PKEY_set_type_str" = x""yes; then :
+else
+  as_fn_error "OpenSSL does not support ECC, needed for GOST support" "$LINENO" 5
+fi
 
-	  use_gost="yes"
+	use_gost="yes"
 
 $as_echo "#define USE_GOST 1" >>confdefs.h
 
-fi
-
 	;;
 esac
 
diff --git a/configure.ac b/configure.ac
index d3e5d17df..ca74669c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -462,21 +462,17 @@ case "$enable_sha2" in
 	;;
 esac
 
-AC_ARG_ENABLE(gost, AC_HELP_STRING([--enable-gost], [Enable GOST support, experimental]))
+AC_ARG_ENABLE(gost, AC_HELP_STRING([--disable-gost], [Disable GOST support]))
 use_gost="no"
 case "$enable_gost" in
-	yes)
+	no)
+	;;
+	*)
 	AC_CHECK_FUNC(EVP_PKEY_set_type_str, [:],[AC_MSG_ERROR([OpenSSL 1.0.0 is needed for GOST support])])
+        AC_CHECK_FUNC(EC_KEY_new, [], [AC_MSG_ERROR([OpenSSL does not support ECC, needed for GOST support])])
 	use_gost="yes"
 	AC_DEFINE([USE_GOST], [1], [Define this to enable GOST support.])
 	;;
-	no)
-	;;
-	*) dnl default
-	AC_CHECK_FUNC(EVP_PKEY_set_type_str, [
-	  use_gost="yes"
-	  AC_DEFINE([USE_GOST], [1], [Define this to enable GOST support.])])
-	;;
 esac
 
 # check for libevent
diff --git a/doc/Changelog b/doc/Changelog
index 17901e0b6..199d7a4ee 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+1 November 2010: Wouter
+	- GOST code enabled by default (RFC 5933).
+
 27 October 2010: Wouter
 	- Fix uninit value in dump_infra print.
 	- Fix validation failure for parent and child on same server with an