Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
BIND
Commits
8eb4eca3
Commit
8eb4eca3
authored
Jan 08, 2007
by
Mark Andrews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2127. [port] Improved OpenSSL 0.9.8 support. [RT #16563]
parent
30522747
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
72 additions
and
501 deletions
+72
-501
CHANGES
CHANGES
+2
-0
config.h.in
config.h.in
+1
-10
configure
configure
+31
-326
configure.in
configure.in
+1
-11
lib/dns/openssldh_link.c
lib/dns/openssldh_link.c
+19
-75
lib/dns/openssldsa_link.c
lib/dns/openssldsa_link.c
+18
-79
No files found.
CHANGES
View file @
8eb4eca3
2127. [port] Improved OpenSSL 0.9.8 support. [RT #16563]
2126. [bug] Serialise validation of type ANY responses. [RT #16555]
2125. [bug] dns_zone_getzeronosoattl() REQUIRE failure if DLZ
...
...
config.h.in
View file @
8eb4eca3
...
...
@@ -16,7 +16,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: config.h.in,v 1.8
6
200
6/1
2/
2
2 0
1:46:18
marka Exp $ */
/* $Id: config.h.in,v 1.8
8
200
7/0
2/
1
2 0
0:50:01
marka Exp $ */
/*! \file */
...
...
@@ -157,15 +157,9 @@ int sigwait(const unsigned int *set, int *sig);
/* Define if you cannot bind() before connect() for TCP sockets. */
#undef BROKEN_TCP_BIND_BEFORE_CONNECT
/* Define if libcrypto has DH_generate_parameters */
#undef HAVE_DH_GENERATE_PARAMETERS
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define if libcrypto has DSA_generate_parameters */
#undef HAVE_DSA_GENERATE_PARAMETERS
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
...
...
@@ -214,9 +208,6 @@ int sigwait(const unsigned int *set, int *sig);
/* Define to 1 if you have the <net/if6.h> header file. */
#undef HAVE_NET_IF6_H
/* Define if libcrypto has RSA_generate_key */
#undef HAVE_RSA_GENERATE_KEY
/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
...
...
configure
View file @
8eb4eca3
#! /bin/sh
# Copyright (C) 2004-200
6
Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004-200
7
Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1996-2003 Internet Software Consortium.
#
# Permission to use, copy, modify, and distribute this software for any
...
...
@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
#
# $Id: configure,v 1.41
2
200
6/12/22 01:46:19
marka Exp $
# $Id: configure,v 1.41
3
200
7/01/08 01:53:30
marka Exp $
#
# Portions Copyright (C) 1996-2001 Nominum, Inc.
#
...
...
@@ -29,7 +29,7 @@
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# From configure.in Revision: 1.42
4
.
# From configure.in Revision: 1.42
5
.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
...
...
@@ -5095,301 +5095,6 @@ fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
echo "$as_me:$LINENO: checking for DH_generate_parameters" >&5
echo $ECHO_N "checking for DH_generate_parameters... $ECHO_C" >&6
if test "${ac_cv_func_DH_generate_parameters+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define DH_generate_parameters to an innocuous variant, in case <limits.h> declares DH_generate_parameters.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define DH_generate_parameters innocuous_DH_generate_parameters
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char DH_generate_parameters (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef DH_generate_parameters
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
{
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char DH_generate_parameters ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_DH_generate_parameters) || defined (__stub___DH_generate_parameters)
choke me
#else
char (*f) () = DH_generate_parameters;
#endif
#ifdef __cplusplus
}
#endif
int
main ()
{
return f != DH_generate_parameters;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_DH_generate_parameters=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_DH_generate_parameters=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_DH_generate_parameters" >&5
echo "${ECHO_T}$ac_cv_func_DH_generate_parameters" >&6
if test $ac_cv_func_DH_generate_parameters = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_DH_GENERATE_PARAMETERS 1
_ACEOF
fi
echo "$as_me:$LINENO: checking for RSA_generate_key" >&5
echo $ECHO_N "checking for RSA_generate_key... $ECHO_C" >&6
if test "${ac_cv_func_RSA_generate_key+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define RSA_generate_key to an innocuous variant, in case <limits.h> declares RSA_generate_key.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define RSA_generate_key innocuous_RSA_generate_key
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char RSA_generate_key (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef RSA_generate_key
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
{
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char RSA_generate_key ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_RSA_generate_key) || defined (__stub___RSA_generate_key)
choke me
#else
char (*f) () = RSA_generate_key;
#endif
#ifdef __cplusplus
}
#endif
int
main ()
{
return f != RSA_generate_key;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_RSA_generate_key=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_RSA_generate_key=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_RSA_generate_key" >&5
echo "${ECHO_T}$ac_cv_func_RSA_generate_key" >&6
if test $ac_cv_func_RSA_generate_key = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_RSA_GENERATE_KEY 1
_ACEOF
fi
echo "$as_me:$LINENO: checking for DSA_generate_parameters" >&5
echo $ECHO_N "checking for DSA_generate_parameters... $ECHO_C" >&6
if test "${ac_cv_func_DSA_generate_parameters+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define DSA_generate_parameters to an innocuous variant, in case <limits.h> declares DSA_generate_parameters.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define DSA_generate_parameters innocuous_DSA_generate_parameters
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char DSA_generate_parameters (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef DSA_generate_parameters
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
{
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char DSA_generate_parameters ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_DSA_generate_parameters) || defined (__stub___DSA_generate_parameters)
choke me
#else
char (*f) () = DSA_generate_parameters;
#endif
#ifdef __cplusplus
}
#endif
int
main ()
{
return f != DSA_generate_parameters;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_DSA_generate_parameters=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_DSA_generate_parameters=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_DSA_generate_parameters" >&5
echo "${ECHO_T}$ac_cv_func_DSA_generate_parameters" >&6
if test $ac_cv_func_DSA_generate_parameters = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_DSA_GENERATE_PARAMETERS 1
_ACEOF
fi
# Check whether --enable-openssl-version-check or --disable-openssl-version-check was given.
if test "${enable_openssl_version_check+set}" = set; then
enableval="$enable_openssl_version_check"
...
...
@@ -9232,7 +8937,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line
9235
"configure"' > conftest.$ac_ext
echo '#line
8940
"configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
...
...
@@ -10229,7 +9934,7 @@ fi
# Provide some information about the compiler.
echo "$as_me:
10232
:" \
echo "$as_me:
9937
:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
...
...
@@ -11290,11 +10995,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:1
1293
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1
0998
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:11
297
: \$? = $ac_status" >&5
echo "$as_me:11
002
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
...
...
@@ -11533,11 +11238,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:11
536
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:11
241
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:11
540
: \$? = $ac_status" >&5
echo "$as_me:11
245
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
...
...
@@ -11593,11 +11298,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:11
596
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:11
301
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:11
600
: \$? = $ac_status" >&5
echo "$as_me:11
305
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
...
...
@@ -13778,7 +13483,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 13
781
"configure"
#line 13
486
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
@@ -13876,7 +13581,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 13
879
"configure"
#line 13
584
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
@@ -16073,11 +15778,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:1
6076
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1
5781
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:1
6080
: \$? = $ac_status" >&5
echo "$as_me:1
5785
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
...
...
@@ -16133,11 +15838,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:1
6136
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1
5841
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:1
6140
: \$? = $ac_status" >&5
echo "$as_me:1
5845
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
...
...
@@ -17494,7 +17199,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 17
497
"configure"
#line 17
202
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
@@ -17592,7 +17297,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 17
595
"configure"
#line 17
300
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
@@ -18429,11 +18134,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:18
432
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:18
137
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:18
436
: \$? = $ac_status" >&5
echo "$as_me:18
141
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
...
...
@@ -18489,11 +18194,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:18
492
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:18
197
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:18
496
: \$? = $ac_status" >&5
echo "$as_me:18
201
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
...
...
@@ -20528,11 +20233,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:20
531
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:20
236
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:20
535
: \$? = $ac_status" >&5
echo "$as_me:20
240
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
...
...
@@ -20771,11 +20476,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:20
774
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:20
479
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:20
778
: \$? = $ac_status" >&5
echo "$as_me:20
483
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
...
...
@@ -20831,11 +20536,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:20
834
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:20
539
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:20
838
: \$? = $ac_status" >&5
echo "$as_me:20
543
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
...
...
@@ -23016,7 +22721,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 2
3019
"configure"
#line 2
2724
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
@@ -23114,7 +22819,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 2
3117
"configure"
#line 2
2822
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
configure.in
View file @
8eb4eca3
...
...
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.42
4
$)
AC_REVISION($Revision: 1.42
5
$)
AC_INIT(lib/dns/name.c)
AC_PREREQ(2.59)
...
...
@@ -475,16 +475,6 @@ shared library configuration (e.g., LD_LIBRARY_PATH).)],
[AC_MSG_RESULT(assuming it does work on target platform)]
)
AC_CHECK_FUNC(DH_generate_parameters,
AC_DEFINE(HAVE_DH_GENERATE_PARAMETERS, 1,
[Define if libcrypto has DH_generate_parameters]))
AC_CHECK_FUNC(RSA_generate_key,
AC_DEFINE(HAVE_RSA_GENERATE_KEY, 1,
[Define if libcrypto has RSA_generate_key]))
AC_CHECK_FUNC(DSA_generate_parameters,
AC_DEFINE(HAVE_DSA_GENERATE_PARAMETERS, 1,
[Define if libcrypto has DSA_generate_parameters]))
AC_ARG_ENABLE(openssl-version-check,
[AC_HELP_STRING([--enable-openssl-version-check],
[Check OpenSSL Version @<:@default=yes@:>@])])
...
...
lib/dns/openssldh_link.c
View file @
8eb4eca3
...
...
@@ -18,7 +18,7 @@
/*
* Principal Author: Brian Wellington
* $Id: openssldh_link.c,v 1.
7
200
6/12
/0
4
01:52:
46
marka Exp $
* $Id: openssldh_link.c,v 1.
8
200
7/01
/0
8
01:52:
27
marka Exp $
*/
#ifdef OPENSSL
...
...
@@ -136,81 +136,11 @@ openssldh_paramcompare(const dst_key_t *key1, const dst_key_t *key2) {
return
(
ISC_TRUE
);
}
#ifndef HAVE_DH_GENERATE_PARAMETERS
/* ====================================================================
* Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. All advertising materials mentioning features or use of this
* software must display the following acknowledgment:
* "This product includes software developed by the OpenSSL Project
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
*
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
* endorse or promote products derived from this software without
* prior written permission. For written permission, please contact
* openssl-core@openssl.org.
*
* 5. Products derived from this software may not be called "OpenSSL"
* nor may "OpenSSL" appear in their names without prior written
* permission of the OpenSSL Project.
*
* 6. Redistributions of any form whatsoever must retain the following
* acknowledgment:
* "This product includes software developed by the OpenSSL Project
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
*
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
* ====================================================================
*
* This product includes cryptographic software written by Eric Young
* (eay@cryptsoft.com). This product includes software written by Tim
* Hudson (tjh@cryptsoft.com).
*
*/
static
DH
*
DH_generate_parameters
(
int
prime_len
,
int
generator
,
void
(
*
callback
)(
int
,
int
,
void
*
),
void
*
cb_arg
)
{
BN_GENCB
cb
;