From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Sat, 10 Jul 2010 08:13:19 +0000 (+0000)
Subject:        - GOST enabled if SSL is recent and ldns has GOST enabled too.
X-Git-Tag: release-1.4.6rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=006633368510d55959f74112c96dd0949abb36d1;p=thirdparty%2Funbound.git

   - GOST enabled if SSL is recent and ldns has GOST enabled too.
       - ldns tarball updated.


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

diff --git a/configure b/configure
index 9027c57c0..21a60dee3 100755
--- a/configure
+++ b/configure
@@ -15327,7 +15327,16 @@ $as_echo "#define USE_GOST 1" >>confdefs.h
 	;;
 	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 :
+
+	  use_gost="yes"
+
+$as_echo "#define USE_GOST 1" >>confdefs.h
+
+fi
+
+	;;
 esac
 
 # check for libevent
diff --git a/configure.ac b/configure.ac
index c321a0bce..e72e28817 100644
--- a/configure.ac
+++ b/configure.ac
@@ -448,10 +448,9 @@ case "$enable_gost" in
 	no)
 	;;
 	*) dnl default
-dnl   Disabled-by-default, RFC not ready.
-dnl	AC_CHECK_FUNC(EVP_PKEY_set_type_str, [
-dnl	  use_gost="yes"
-dnl	  AC_DEFINE([USE_GOST], [1], [Define this to enable GOST support.])])
+	AC_CHECK_FUNC(EVP_PKEY_set_type_str, [
+	  use_gost="yes"
+	  AC_DEFINE([USE_GOST], [1], [Define this to enable GOST support.])])
 	;;
 esac
 
diff --git a/doc/Changelog b/doc/Changelog
index 4ecb2ab55..3056fc841 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+10 July 2010: Wouter
+	- GOST enabled if SSL is recent and ldns has GOST enabled too.
+	- ldns tarball updated.
+
 9 July 2010: Wouter
 	- iana portlist updated.
 	- Fix validation of qtype DNSKEY when a key-cache entry exists but
diff --git a/doc/README b/doc/README
index d044307d5..1cef9b2ba 100644
--- a/doc/README
+++ b/doc/README
@@ -69,8 +69,8 @@ This software is under BSD license, see LICENSE for details.
   	Compile the python module that processes responses in the server.
   * --disable-sha2
   	Disable support for RSASHA256 and RSASHA512 crypto.
-  * --enable-gost
-  	Enable draft support for GOST crypto.
+  * --disable-gost
+  	Disable support for GOST crypto, RFC 5933.
 
 * 'make test' attempts to run a series of tests, depending on the support
   programs that are installed.
diff --git a/ldns-src.tar.gz b/ldns-src.tar.gz
index 173d26379..1285ea403 100644
Binary files a/ldns-src.tar.gz and b/ldns-src.tar.gz differ