GOST disabled-by-default, also ldns tarball update with same change.

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

diff --git a/configure b/configure
index 94df4fba229258ffe1be4804f5c5137d125d761d..ce8221d66e14e9d63d3f870c025d31483eb32bfa 100755 (executable)
--- a/configure
+++ b/configure
@@ -15223,16 +15223,7 @@ $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 6aad73dac5196f3821d9fec5cfd54573c96c7191..33768a842c720cc7721a2196b8664b176c85d38d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -429,9 +429,10 @@ case "$enable_gost" in
        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.])])
+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.])])
        ;;
 esac
 

diff --git a/doc/Changelog b/doc/Changelog
index ffde9240bd8f5e0ef982bc74fba4760b4e3db6a4..08f184c74f66e21fd45dc5fa99808865f0131d41 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 2 June 2010: Wouter
        - Fix compile warning if compiled without threads.
        - updated ldns-tarball with current ldns svn (pre 1.6.5).
+       - GOST disabled-by-default, the algorithm number is allocated but the
+         RFC is still has to pass AUTH48 at the IETF.
 
 1 June 2010: Wouter
        - Ignore Z flag in incoming messages too.

diff --git a/ldns-src.tar.gz b/ldns-src.tar.gz
index 241f027e14de327842ac86b844eee6c49a868099..c36d810fd0ece1049c573c5198c1f07c86f316f3 100644 (file)
Binary files a/ldns-src.tar.gz and b/ldns-src.tar.gz differ