upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-01-18 12:42:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix detection of gost support in ldns (reported by Chris Smith).

Browse source 
git-svn-id: file:///svn/unbound/trunk@2103 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2010-04-28 19:50:34 +00:00
parent 2adfe6bdba
commit 0a6ad89984
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure vendored
View file

@ -19928,6 +19928,7 @@ if test "${enable_gost+set}" = set; then
enableval=$enable_gost;
fi
use_gost="no"
case "$enable_gost" in
yes)
{ $as_echo "$as_me:$LINENO: checking for EVP_PKEY_set_type_str" >&5
@ -20023,6 +20024,7 @@ $as_echo "$as_me: error: OpenSSL 1.0.0 is needed for GOST support" >&2;}
{ (exit 1); exit 1; }; }
fi
use_gost="yes"
cat >>confdefs.h <<\_ACEOF
#define USE_GOST 1
@ -20118,6 +20120,7 @@ fi
$as_echo "$ac_cv_func_EVP_PKEY_set_type_str" >&6; }
if test "x$ac_cv_func_EVP_PKEY_set_type_str" = x""yes; then
use_gost="yes"
cat >>confdefs.h <<\_ACEOF
#define USE_GOST 1
@ -23729,7 +23732,8 @@ fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldns_b32_ntop_extended_hex" >&5
$as_echo "$ac_cv_func_ldns_b32_ntop_extended_hex" >&6; }
{ $as_echo "$as_me:$LINENO: checking for ldns_key_EVP_load_gost_id" >&5
if test x$use_gost = xyes; then
{ $as_echo "$as_me:$LINENO: checking for ldns_key_EVP_load_gost_id" >&5
$as_echo_n "checking for ldns_key_EVP_load_gost_id... " >&6; }
if test "${ac_cv_func_ldns_key_EVP_load_gost_id+set}" = set; then
$as_echo_n "(cached) " >&6
@ -23815,6 +23819,9 @@ fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldns_key_EVP_load_gost_id" >&5
$as_echo "$ac_cv_func_ldns_key_EVP_load_gost_id" >&6; }
else
ac_cv_func_ldns_key_EVP_load_gost_id="yes"
fi
for ac_header in ldns/ldns.h
do

9
configure.ac
View file

@ -419,15 +419,18 @@ case "$enable_sha2" in
esac
AC_ARG_ENABLE(gost, AC_HELP_STRING([--enable-gost], [Enable GOST support, experimental]))
use_gost="no"
case "$enable_gost" in
yes)
AC_CHECK_FUNC(EVP_PKEY_set_type_str, [:],[AC_MSG_ERROR([OpenSSL 1.0.0 is 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
@ -627,7 +630,11 @@ if test "$use_ldns_builtin" = "no"; then
AC_CHECK_LIB(ldns, ldns_buffer_copy)
AC_CHECK_FUNC(ldns_key_buf2rsa_raw)
AC_CHECK_FUNC(ldns_b32_ntop_extended_hex)
AC_CHECK_FUNC(ldns_key_EVP_load_gost_id)
if test x$use_gost = xyes; then
AC_CHECK_FUNC(ldns_key_EVP_load_gost_id)
else
ac_cv_func_ldns_key_EVP_load_gost_id="yes"
fi
AC_CHECK_HEADERS([ldns/ldns.h],,, [AC_INCLUDES_DEFAULT])
if test $ac_cv_lib_ldns_ldns_buffer_copy = yes \
-a $ac_cv_func_ldns_key_buf2rsa_raw = yes \

1
doc/Changelog
View file

@ -1,6 +1,7 @@
28 April 2010: Wouter
- ldns tarball updated and GOST support is detected and then enabled.
- iana portlist updated.
- Fix detection of gost support in ldns (reported by Chris Smith).
27 April 2010: Wouter
- unbound-control get_option domain-insecure shows config file items.