From e915367e40b579d18ac13c9c58c15fec614d9890 Mon Sep 17 00:00:00 2001 From: Michael Graff Date: Thu, 20 Apr 2000 01:13:21 +0000 Subject: [PATCH] rename openssl functions and exported data to have a dst_ prefix. --- configure | 335 +++++++++--------- configure.in | 14 +- lib/dns/sec/Makefile.in | 2 +- lib/dns/sec/dst/Makefile.in | 2 +- lib/dns/sec/dst/dst_internal.h | 2 + lib/dns/sec/dst/hmac_link.c | 12 +- lib/dns/sec/dst/opensslmd5_link.c | 12 +- lib/dns/sec/openssl/Makefile.in | 2 +- lib/dns/sec/openssl/bn_add.c | 1 + lib/dns/sec/openssl/bn_asm.c | 3 + lib/dns/sec/openssl/bn_ctx.c | 1 + lib/dns/sec/openssl/bn_div.c | 1 + lib/dns/sec/openssl/bn_err.c | 1 + lib/dns/sec/openssl/bn_exp.c | 1 + lib/dns/sec/openssl/bn_exp2.c | 1 + lib/dns/sec/openssl/bn_gcd.c | 1 + lib/dns/sec/openssl/bn_lib.c | 1 + lib/dns/sec/openssl/bn_mont.c | 1 + lib/dns/sec/openssl/bn_mul.c | 1 + lib/dns/sec/openssl/bn_prime.c | 1 + lib/dns/sec/openssl/bn_print.c | 1 + lib/dns/sec/openssl/bn_rand.c | 1 + lib/dns/sec/openssl/bn_recp.c | 1 + lib/dns/sec/openssl/bn_shift.c | 1 + lib/dns/sec/openssl/bn_sqr.c | 1 + lib/dns/sec/openssl/bn_word.c | 1 + lib/dns/sec/openssl/buffer.c | 1 + lib/dns/sec/openssl/cryptlib.c | 1 + lib/dns/sec/openssl/dh_err.c | 1 + lib/dns/sec/openssl/dh_gen.c | 1 + lib/dns/sec/openssl/dh_key.c | 1 + lib/dns/sec/openssl/dh_lib.c | 1 + lib/dns/sec/openssl/dsa_asn1.c | 1 + lib/dns/sec/openssl/dsa_err.c | 1 + lib/dns/sec/openssl/dsa_gen.c | 1 + lib/dns/sec/openssl/dsa_key.c | 1 + lib/dns/sec/openssl/dsa_lib.c | 1 + lib/dns/sec/openssl/dsa_ossl.c | 1 + lib/dns/sec/openssl/dsa_sign.c | 1 + lib/dns/sec/openssl/dsa_vrf.c | 1 + lib/dns/sec/openssl/err.c | 1 + lib/dns/sec/openssl/ex_data.c | 1 + .../sec/openssl/include/openssl/Makefile.in | 2 + lib/dns/sec/openssl/lhash.c | 1 + lib/dns/sec/openssl/md5_dgst.c | 9 +- lib/dns/sec/openssl/md_rand.c | 1 + lib/dns/sec/openssl/mem.c | 1 + lib/dns/sec/openssl/mem_dbg.c | 1 + lib/dns/sec/openssl/rand_lib.c | 1 + lib/dns/sec/openssl/sha1_one.c | 1 + lib/dns/sec/openssl/sha1dgst.c | 1 + lib/dns/sec/openssl/stack.c | 1 + lib/dns/sec/openssl/th-lock.c | 1 + util/copyrights | 1 + 54 files changed, 254 insertions(+), 184 deletions(-) diff --git a/configure b/configure index f98cc487b4..8b62fca5dc 100755 --- a/configure +++ b/configure @@ -1003,6 +1003,19 @@ if test "X$CC" = "X" ; then esac fi +# +# If the user didn't specify where openssl is, and we didn't find or it +# is imcompatible with our code, use our internal one. +# XXXMLG Implement this check! +# +echo $ac_n "checking compatible OpenSSL library""... $ac_c" 1>&6 +echo "configure:1013: checking compatible OpenSSL library" >&5 +DST_PRIVATEOPENSSL='-DDST_USE_PRIVATE_OPENSSL' +dst_privateopenssl='openssl' +echo "$ac_t""using private library" 1>&6 + + + # # NetBSD has two alternative pthreads implementations. Make the # user choose one by saying --with-mit-pthreads or --with-ptl2 @@ -1012,7 +1025,7 @@ case "$host" in *-netbsd*) CC="gcc" echo $ac_n "checking which thread library to use""... $ac_c" 1>&6 -echo "configure:1016: checking which thread library to use" >&5 +echo "configure:1029: checking which thread library to use" >&5 # Check whether --with-mit-pthreads or --without-mit-pthreads was given. if test "${with_mit_pthreads+set}" = set; then @@ -1084,7 +1097,7 @@ esac # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1088: checking for $ac_word" >&5 +echo "configure:1101: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1114,7 +1127,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1118: checking for $ac_word" >&5 +echo "configure:1131: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1165,7 +1178,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1169: checking for $ac_word" >&5 +echo "configure:1182: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1197,7 +1210,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1201: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1214: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1208,12 +1221,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1212 "configure" +#line 1225 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1239,12 +1252,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1243: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1256: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1248: checking whether we are using GNU C" >&5 +echo "configure:1261: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1253,7 +1266,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1272,7 +1285,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1276: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1289: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1308,7 +1321,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1312: checking for $ac_word" >&5 +echo "configure:1325: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1340,7 +1353,7 @@ test -n "$YACC" || YACC="yacc" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1344: checking how to run the C preprocessor" >&5 +echo "configure:1357: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1355,13 +1368,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1372,13 +1385,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1389,13 +1402,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1420,12 +1433,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1424: checking for ANSI C header files" >&5 +echo "configure:1437: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1433,7 +1446,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1450,7 +1463,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1468,7 +1481,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1489,7 +1502,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1500,7 +1513,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1527,17 +1540,17 @@ for ac_hdr in fcntl.h sys/time.h unistd.h sys/sockio.h netinet6/in6.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1531: checking for $ac_hdr" >&5 +echo "configure:1544: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1587,12 +1600,12 @@ esac echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1591: checking for working const" >&5 +echo "configure:1604: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1662,21 +1675,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1666: checking for inline" >&5 +echo "configure:1679: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1702,12 +1715,12 @@ EOF esac echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1706: checking for size_t" >&5 +echo "configure:1719: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1735,12 +1748,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1739: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1752: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1749,7 +1762,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1771,7 +1784,7 @@ fi echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:1775: checking for pthread_create in -lpthread" >&5 +echo "configure:1788: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1779,7 +1792,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1816,7 +1829,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:1820: checking for __pthread_create in -lpthread" >&5 +echo "configure:1833: checking for __pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'__pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1824,7 +1837,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1863,7 +1876,7 @@ else fi echo $ac_n "checking for __pthread_create_system in -lpthread""... $ac_c" 1>&6 -echo "configure:1867: checking for __pthread_create_system in -lpthread" >&5 +echo "configure:1880: checking for __pthread_create_system in -lpthread" >&5 ac_lib_var=`echo pthread'_'__pthread_create_system | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1871,7 +1884,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1917,7 +1930,7 @@ fi # We'd like to use sigwait() too # echo $ac_n "checking for sigwait in -lc""... $ac_c" 1>&6 -echo "configure:1921: checking for sigwait in -lc" >&5 +echo "configure:1934: checking for sigwait in -lc" >&5 ac_lib_var=`echo c'_'sigwait | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1925,7 +1938,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1958,7 +1971,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sigwait in -lpthread""... $ac_c" 1>&6 -echo "configure:1962: checking for sigwait in -lpthread" >&5 +echo "configure:1975: checking for sigwait in -lpthread" >&5 ac_lib_var=`echo pthread'_'sigwait | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1966,7 +1979,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1999,7 +2012,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for _Psigwait in -lpthread""... $ac_c" 1>&6 -echo "configure:2003: checking for _Psigwait in -lpthread" >&5 +echo "configure:2016: checking for _Psigwait in -lpthread" >&5 ac_lib_var=`echo pthread'_'_Psigwait | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2007,7 +2020,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2056,7 +2069,7 @@ case "$host" in # *-freebsd*) echo $ac_n "checking for sigwait in -lc_r""... $ac_c" 1>&6 -echo "configure:2060: checking for sigwait in -lc_r" >&5 +echo "configure:2073: checking for sigwait in -lc_r" >&5 ac_lib_var=`echo c_r'_'sigwait | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2064,7 +2077,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2133,12 +2146,12 @@ esac # NLS # echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:2137: checking for catgets" >&5 +echo "configure:2150: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -2199,7 +2212,7 @@ case "$host" in ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2203: checking for socket in -lsocket" >&5 +echo "configure:2216: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2207,7 +2220,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2246,7 +2259,7 @@ else fi echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6 -echo "configure:2250: checking for inet_ntoa in -lnsl" >&5 +echo "configure:2263: checking for inet_ntoa in -lnsl" >&5 ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2254,7 +2267,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2349,9 +2362,9 @@ esac # Look for a 4.4BSD-style sa_len member in struct sockaddr. # echo $ac_n "checking for sa_len in struct sockaddr""... $ac_c" 1>&6 -echo "configure:2353: checking for sa_len in struct sockaddr" >&5 +echo "configure:2366: checking for sa_len in struct sockaddr" >&5 cat > conftest.$ac_ext < @@ -2360,7 +2373,7 @@ int main() { struct sockaddr sa; sa.sa_len = 0; return (0); ; return 0; } EOF -if { (eval echo configure:2364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_PLATFORM_HAVESALEN="#define ISC_PLATFORM_HAVESALEN 1" @@ -2381,9 +2394,9 @@ rm -f conftest* # Look for a 4.4BSD or 4.3BSD struct msghdr # echo $ac_n "checking for struct msghdr flavor""... $ac_c" 1>&6 -echo "configure:2385: checking for struct msghdr flavor" >&5 +echo "configure:2398: checking for struct msghdr flavor" >&5 cat > conftest.$ac_ext < @@ -2392,7 +2405,7 @@ int main() { struct msghdr msg; msg.msg_flags = 0; return (0); ; return 0; } EOF -if { (eval echo configure:2396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""4.4BSD" 1>&6 ISC_PLATFORM_MSGHDRFLAVOR="#define ISC_NET_BSD44MSGHDR 1" @@ -2410,9 +2423,9 @@ rm -f conftest* # Look for in_port_t. # echo $ac_n "checking for type in_port_t""... $ac_c" 1>&6 -echo "configure:2414: checking for type in_port_t" >&5 +echo "configure:2427: checking for type in_port_t" >&5 cat > conftest.$ac_ext < @@ -2421,7 +2434,7 @@ int main() { in_port_t port = 25; return (0); ; return 0; } EOF -if { (eval echo configure:2425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_PLATFORM_NEEDPORTT="#undef ISC_PLATFORM_NEEDPORTT" @@ -2439,9 +2452,9 @@ rm -f conftest* # Check for addrinfo # echo $ac_n "checking for struct addrinfo""... $ac_c" 1>&6 -echo "configure:2443: checking for struct addrinfo" >&5 +echo "configure:2456: checking for struct addrinfo" >&5 cat > conftest.$ac_ext < @@ -2449,7 +2462,7 @@ int main() { struct addrinfo a; return (0); ; return 0; } EOF -if { (eval echo configure:2453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_NEEDADDRINFO="#undef ISC_LWRES_NEEDADDRINFO" @@ -2464,9 +2477,9 @@ rm -f conftest* echo $ac_n "checking for int sethostent""... $ac_c" 1>&6 -echo "configure:2468: checking for int sethostent" >&5 +echo "configure:2481: checking for int sethostent" >&5 cat > conftest.$ac_ext < @@ -2474,7 +2487,7 @@ int main() { int i = sethostent(0); return(0); ; return 0; } EOF -if { (eval echo configure:2478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_SETHOSTENTINT="#define ISC_LWRES_SETHOSTENTINT 1" @@ -2489,9 +2502,9 @@ rm -f conftest* echo $ac_n "checking for int endhostent""... $ac_c" 1>&6 -echo "configure:2493: checking for int endhostent" >&5 +echo "configure:2506: checking for int endhostent" >&5 cat > conftest.$ac_ext < @@ -2499,7 +2512,7 @@ int main() { int i = endhostent(); return(0); ; return 0; } EOF -if { (eval echo configure:2503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_ENDHOSTENTINT="#define ISC_LWRES_ENDHOSTENTINT 1" @@ -2514,9 +2527,9 @@ rm -f conftest* echo $ac_n "checking for getnetbyaddr(in_addr_t, ...)""... $ac_c" 1>&6 -echo "configure:2518: checking for getnetbyaddr(in_addr_t, ...)" >&5 +echo "configure:2531: checking for getnetbyaddr(in_addr_t, ...)" >&5 cat > conftest.$ac_ext < @@ -2525,7 +2538,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_GETNETBYADDRINADDR="#define ISC_LWRES_GETNETBYADDRINADDR 1" @@ -2540,9 +2553,9 @@ rm -f conftest* echo $ac_n "checking for int setnetent""... $ac_c" 1>&6 -echo "configure:2544: checking for int setnetent" >&5 +echo "configure:2557: checking for int setnetent" >&5 cat > conftest.$ac_ext < @@ -2550,7 +2563,7 @@ int main() { int i = setnetent(0); return(0); ; return 0; } EOF -if { (eval echo configure:2554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_SETNETENTINT="#define ISC_LWRES_SETNETENTINT 1" @@ -2565,9 +2578,9 @@ rm -f conftest* echo $ac_n "checking for int endnetent""... $ac_c" 1>&6 -echo "configure:2569: checking for int endnetent" >&5 +echo "configure:2582: checking for int endnetent" >&5 cat > conftest.$ac_ext < @@ -2575,7 +2588,7 @@ int main() { int i = endnetent(); return(0); ; return 0; } EOF -if { (eval echo configure:2579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_ENDNETENTINT="#define ISC_LWRES_ENDNETENTINT 1" @@ -2590,9 +2603,9 @@ rm -f conftest* echo $ac_n "checking for gethostbyadd(const void *, size_t, ...)""... $ac_c" 1>&6 -echo "configure:2594: checking for gethostbyadd(const void *, size_t, ...)" >&5 +echo "configure:2607: checking for gethostbyadd(const void *, size_t, ...)" >&5 cat > conftest.$ac_ext < @@ -2601,7 +2614,7 @@ int main() { return(0); ; return 0; } EOF -if { (eval echo configure:2605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_GETHOSTBYADDRVOID="#define ISC_LWRES_GETHOSTBYADDRVOID 1" @@ -2616,9 +2629,9 @@ rm -f conftest* echo $ac_n "checking for h_errno in netdb.h""... $ac_c" 1>&6 -echo "configure:2620: checking for h_errno in netdb.h" >&5 +echo "configure:2633: checking for h_errno in netdb.h" >&5 cat > conftest.$ac_ext < @@ -2626,7 +2639,7 @@ int main() { h_errno = 1; return(0); ; return 0; } EOF -if { (eval echo configure:2630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_NEEDHERRNO="#undef ISC_LWRES_NEEDHERRNO" @@ -2641,12 +2654,12 @@ rm -f conftest* echo $ac_n "checking for getipnodebyname""... $ac_c" 1>&6 -echo "configure:2645: checking for getipnodebyname" >&5 +echo "configure:2658: checking for getipnodebyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_getipnodebyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getipnodebyname=yes" else @@ -2690,12 +2703,12 @@ ISC_LWRES_GETIPNODEPROTO="#define ISC_LWRES_GETIPNODEPROTO 1" fi echo $ac_n "checking for getnameinfo""... $ac_c" 1>&6 -echo "configure:2694: checking for getnameinfo" >&5 +echo "configure:2707: checking for getnameinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getnameinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getnameinfo=yes" else @@ -2739,12 +2752,12 @@ ISC_LWRES_GETNAMEINFOPROTO="#define ISC_LWRES_GETNAMEINFOPROTO 1" fi echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:2743: checking for getaddrinfo" >&5 +echo "configure:2756: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getaddrinfo=yes" else @@ -2795,9 +2808,9 @@ fi # Look for a sysctl call to get the list of network interfaces. # echo $ac_n "checking for interface list sysctl""... $ac_c" 1>&6 -echo "configure:2799: checking for interface list sysctl" >&5 +echo "configure:2812: checking for interface list sysctl" >&5 cat > conftest.$ac_ext < @@ -2907,7 +2920,7 @@ else fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:2911: checking build system type" >&5 +echo "configure:2924: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -2936,7 +2949,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:2940: checking for ld used by GCC" >&5 +echo "configure:2953: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -2960,10 +2973,10 @@ echo "configure:2940: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:2964: checking for GNU ld" >&5 +echo "configure:2977: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:2967: checking for non-GNU ld" >&5 +echo "configure:2980: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2999,7 +3012,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:3003: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:3016: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3015,7 +3028,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:3019: checking for BSD-compatible nm" >&5 +echo "configure:3032: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3052,7 +3065,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:3056: checking whether ln -s works" >&5 +echo "configure:3069: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3096,8 +3109,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3100 "configure"' > conftest.$ac_ext - if { (eval echo configure:3101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 3113 "configure"' > conftest.$ac_ext + if { (eval echo configure:3114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -3118,19 +3131,19 @@ case "$host" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:3122: checking whether the C compiler needs -belf" >&5 +echo "configure:3135: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -3267,9 +3280,9 @@ fi case "$enable_ipv6" in yes|''|autodetect) echo $ac_n "checking for IPv6 structures""... $ac_c" 1>&6 -echo "configure:3271: checking for IPv6 structures" >&5 +echo "configure:3284: checking for IPv6 structures" >&5 cat > conftest.$ac_ext < @@ -3279,7 +3292,7 @@ int main() { struct sockaddr_in6 sin6; return (0); ; return 0; } EOF -if { (eval echo configure:3283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 found_ipv6=yes @@ -3302,9 +3315,9 @@ case "$found_ipv6" in ISC_PLATFORM_HAVEIPV6="#define ISC_PLATFORM_HAVEIPV6 1" LWRES_PLATFORM_HAVEIPV6="#define LWRES_PLATFORM_HAVEIPV6 1" echo $ac_n "checking for in6addr_any""... $ac_c" 1>&6 -echo "configure:3306: checking for in6addr_any" >&5 +echo "configure:3319: checking for in6addr_any" >&5 cat > conftest.$ac_ext < @@ -3314,7 +3327,7 @@ int main() { struct in6_addr in6; in6 = in6addr_any; return (0); ; return 0; } EOF -if { (eval echo configure:3318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_PLATFORM_NEEDIN6ADDRANY="#undef ISC_PLATFORM_NEEDIN6ADDRANY" @@ -3350,7 +3363,7 @@ esac # IPv6 support provided via Kame # echo $ac_n "checking for Kame IPv6 support""... $ac_c" 1>&6 -echo "configure:3354: checking for Kame IPv6 support" >&5 +echo "configure:3367: checking for Kame IPv6 support" >&5 # Check whether --with-kame or --without-kame was given. if test "${with_kame+set}" = set; then withval="$with_kame" @@ -3397,12 +3410,12 @@ esac # the files. # echo $ac_n "checking for inet_ntop""... $ac_c" 1>&6 -echo "configure:3401: checking for inet_ntop" >&5 +echo "configure:3414: checking for inet_ntop" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_ntop'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_ntop=yes" else @@ -3449,12 +3462,12 @@ ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_ntop.$O" fi echo $ac_n "checking for inet_pton""... $ac_c" 1>&6 -echo "configure:3453: checking for inet_pton" >&5 +echo "configure:3466: checking for inet_pton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_pton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_pton=yes" else @@ -3501,12 +3514,12 @@ ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_pton.$O" fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:3505: checking for inet_aton" >&5 +echo "configure:3518: checking for inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_aton=yes" else @@ -3553,12 +3566,12 @@ ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_aton.$O" fi echo $ac_n "checking for strsep""... $ac_c" 1>&6 -echo "configure:3557: checking for strsep" >&5 +echo "configure:3570: checking for strsep" >&5 if eval "test \"`echo '$''{'ac_cv_func_strsep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strsep=yes" else @@ -3604,12 +3617,12 @@ ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS strsep.$O" fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:3608: checking for vsnprintf" >&5 +echo "configure:3621: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -3662,17 +3675,17 @@ fi echo $ac_n "checking for sizeof(long long int) == sizeof(long int)""... $ac_c" 1>&6 -echo "configure:3666: checking for sizeof(long long int) == sizeof(long int)" >&5 +echo "configure:3679: checking for sizeof(long long int) == sizeof(long int)" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""default yes" 1>&6 ISC_PLATFORM_LONGLONGEQUALLONG="#define ISC_PLATFORM_LONGLONGEQUALLONG 1" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 ISC_PLATFORM_LONGLONGEQUALLONG="#define ISC_PLATFORM_LONGLONGEQUALLONG 1" @@ -3692,12 +3705,12 @@ fi # Security Stuff # echo $ac_n "checking for chroot""... $ac_c" 1>&6 -echo "configure:3696: checking for chroot" >&5 +echo "configure:3709: checking for chroot" >&5 if eval "test \"`echo '$''{'ac_cv_func_chroot'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_chroot=yes" else @@ -3746,17 +3759,17 @@ for ac_hdr in linux/capability.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3750: checking for $ac_hdr" >&5 +echo "configure:3763: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3786,17 +3799,17 @@ for ac_hdr in linux/prctl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3790: checking for $ac_hdr" >&5 +echo "configure:3803: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4071,6 +4084,8 @@ s%@STD_CWARNINGS@%$STD_CWARNINGS%g s%@AR@%$AR%g s%@ARFLAGS@%$ARFLAGS%g s%@ETAGS@%$ETAGS%g +s%@DST_PRIVATEOPENSSL@%$DST_PRIVATEOPENSSL%g +s%@dst_privateopenssl@%$dst_privateopenssl%g s%@CC@%$CC%g s%@YACC@%$YACC%g s%@CPP@%$CPP%g diff --git a/configure.in b/configure.in index c756bf18fc..585332a734 100644 --- a/configure.in +++ b/configure.in @@ -13,7 +13,7 @@ dnl PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS dnl ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS dnl SOFTWARE. -AC_REVISION($Revision: 1.115 $) +AC_REVISION($Revision: 1.116 $) AC_PREREQ(2.13) @@ -145,6 +145,18 @@ if test "X$CC" = "X" ; then esac fi +# +# If the user didn't specify where openssl is, and we didn't find or it +# is imcompatible with our code, use our internal one. +# XXXMLG Implement this check! +# +AC_MSG_CHECKING(for compatible OpenSSL library) +DST_PRIVATEOPENSSL='-DDST_USE_PRIVATE_OPENSSL' +dst_privateopenssl='openssl' +AC_MSG_RESULT(using private library) +AC_SUBST(DST_PRIVATEOPENSSL) +AC_SUBST(dst_privateopenssl) + # # NetBSD has two alternative pthreads implementations. Make the # user choose one by saying --with-mit-pthreads or --with-ptl2 diff --git a/lib/dns/sec/Makefile.in b/lib/dns/sec/Makefile.in index 281e600817..4d21db7a49 100644 --- a/lib/dns/sec/Makefile.in +++ b/lib/dns/sec/Makefile.in @@ -17,7 +17,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -SUBDIRS = dnssafe dst openssl +SUBDIRS = dnssafe dst @dst_privateopenssl@ TARGETS = @BIND9_MAKE_RULES@ diff --git a/lib/dns/sec/dst/Makefile.in b/lib/dns/sec/dst/Makefile.in index b881b2bcf7..eec5baf627 100644 --- a/lib/dns/sec/dst/Makefile.in +++ b/lib/dns/sec/dst/Makefile.in @@ -24,7 +24,7 @@ CINCLUDES = -I${srcdir} \ -I${srcdir}/../openssl/include \ ${DNS_INCLUDES} ${ISC_INCLUDES} -CDEFINES = -DUSE_MD5 -DDNSSAFE -DOPENSSL +CDEFINES = -DUSE_MD5 -DDNSSAFE -DOPENSSL @DST_PRIVATEOPENSSL@ CWARNINGS = LIBS = @LIBS@ diff --git a/lib/dns/sec/dst/dst_internal.h b/lib/dns/sec/dst/dst_internal.h index 7ab84ed4fc..563f538795 100644 --- a/lib/dns/sec/dst/dst_internal.h +++ b/lib/dns/sec/dst/dst_internal.h @@ -22,6 +22,8 @@ #include #include +#include "../rename.h" + #include #include diff --git a/lib/dns/sec/dst/hmac_link.c b/lib/dns/sec/dst/hmac_link.c index 809d2b2a9b..6b270b8033 100644 --- a/lib/dns/sec/dst/hmac_link.c +++ b/lib/dns/sec/dst/hmac_link.c @@ -17,7 +17,7 @@ /* * Principal Author: Brian Wellington - * $Id: hmac_link.c,v 1.17 2000/03/15 18:52:23 bwelling Exp $ + * $Id: hmac_link.c,v 1.18 2000/04/20 01:12:26 explorer Exp $ */ #include @@ -42,10 +42,6 @@ #define HMAC_IPAD 0x36 #define HMAC_OPAD 0x5c -#define MD5Init MD5_Init -#define MD5Update MD5_Update -#define MD5Final MD5_Final - #define RETERR(x) do { \ ret = (x); \ if (ret != ISC_R_SUCCESS) \ @@ -321,9 +317,9 @@ dst_hmacmd5_from_dns(dst_key_t *key, isc_buffer_t *data, isc_mem_t *mctx) { MD5_CTX ctx; unsigned char digest[MD5_DIGEST_LENGTH]; - MD5Init(&ctx); - MD5Update(&ctx, r.base, r.length); - MD5Final(digest, &ctx); + MD5_Init(&ctx); + MD5_Update(&ctx, r.base, r.length); + MD5_Final(digest, &ctx); memcpy(hkey->ipad, digest, MD5_DIGEST_LENGTH); memcpy(hkey->opad, digest, MD5_DIGEST_LENGTH); keylen = MD5_DIGEST_LENGTH; diff --git a/lib/dns/sec/dst/opensslmd5_link.c b/lib/dns/sec/dst/opensslmd5_link.c index 9f2d355c4b..9cfeb57174 100644 --- a/lib/dns/sec/dst/opensslmd5_link.c +++ b/lib/dns/sec/dst/opensslmd5_link.c @@ -19,7 +19,7 @@ /* * Principal Author: Brian Wellington - * $Id: opensslmd5_link.c,v 1.3 2000/03/06 20:06:01 bwelling Exp $ + * $Id: opensslmd5_link.c,v 1.4 2000/04/20 01:12:27 explorer Exp $ */ #include @@ -42,10 +42,6 @@ #include #include -#define MD5Init MD5_Init -#define MD5Update MD5_Update -#define MD5Final MD5_Final - /* * dst_s_md5 * Call MD5 functions to digest a block of data. @@ -79,17 +75,17 @@ dst_s_md5(const unsigned int mode, void **context, isc_region_t *data, REQUIRE (ctx != NULL); if (mode & DST_SIGMODE_INIT) - MD5Init(ctx); + MD5_Init(ctx); if (mode & DST_SIGMODE_UPDATE) - MD5Update(ctx, data->base, data->length); + MD5_Update(ctx, data->base, data->length); if (mode & DST_SIGMODE_FINAL) { isc_buffer_available(digest, &r); if (r.length < MD5_DIGEST_LENGTH) return (ISC_R_NOSPACE); - MD5Final(r.base, ctx); + MD5_Final(r.base, ctx); isc_buffer_add(digest, MD5_DIGEST_LENGTH); isc_mem_put(mctx, ctx, sizeof(MD5_CTX)); } diff --git a/lib/dns/sec/openssl/Makefile.in b/lib/dns/sec/openssl/Makefile.in index 5ffba57d15..8dafd039bb 100644 --- a/lib/dns/sec/openssl/Makefile.in +++ b/lib/dns/sec/openssl/Makefile.in @@ -19,7 +19,7 @@ top_srcdir = @top_srcdir@ CINCLUDES = -I${srcdir}/include -CDEFINES = -DMFUNC +CDEFINES = -DMFUNC @DST_PRIVATEOPENSSL@ CWARNINGS = LIBS = @LIBS@ diff --git a/lib/dns/sec/openssl/bn_add.c b/lib/dns/sec/openssl/bn_add.c index 5d24691233..7f6f7d4042 100644 --- a/lib/dns/sec/openssl/bn_add.c +++ b/lib/dns/sec/openssl/bn_add.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_add.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/bn_asm.c b/lib/dns/sec/openssl/bn_asm.c index 3329cc18e6..6718d5fd30 100644 --- a/lib/dns/sec/openssl/bn_asm.c +++ b/lib/dns/sec/openssl/bn_asm.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_asm.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. @@ -431,6 +432,8 @@ BN_ULONG bn_sub_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n) #undef bn_sqr_comba8 #undef bn_sqr_comba4 +#include "../rename.h" + /* mul_add_c(a,b,c0,c1,c2) -- c+=a*b for three word number c=(c2,c1,c0) */ /* mul_add_c2(a,b,c0,c1,c2) -- c+=2*a*b for three word number c=(c2,c1,c0) */ /* sqr_add_c(a,i,c0,c1,c2) -- c+=a[i]^2 for three word number c=(c2,c1,c0) */ diff --git a/lib/dns/sec/openssl/bn_ctx.c b/lib/dns/sec/openssl/bn_ctx.c index 46132fd180..9219165ddb 100644 --- a/lib/dns/sec/openssl/bn_ctx.c +++ b/lib/dns/sec/openssl/bn_ctx.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_ctx.c */ /* Written by Ulf Moeller for the OpenSSL project. */ /* ==================================================================== diff --git a/lib/dns/sec/openssl/bn_div.c b/lib/dns/sec/openssl/bn_div.c index 07af1d3b44..9568d6a161 100644 --- a/lib/dns/sec/openssl/bn_div.c +++ b/lib/dns/sec/openssl/bn_div.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_div.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/bn_err.c b/lib/dns/sec/openssl/bn_err.c index f3b9497dca..6799be548c 100644 --- a/lib/dns/sec/openssl/bn_err.c +++ b/lib/dns/sec/openssl/bn_err.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_err.c */ /* ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. diff --git a/lib/dns/sec/openssl/bn_exp.c b/lib/dns/sec/openssl/bn_exp.c index 0c11601675..7238a35bf9 100644 --- a/lib/dns/sec/openssl/bn_exp.c +++ b/lib/dns/sec/openssl/bn_exp.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_exp.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/bn_exp2.c b/lib/dns/sec/openssl/bn_exp2.c index 4f4e9e3299..a999f8ee86 100644 --- a/lib/dns/sec/openssl/bn_exp2.c +++ b/lib/dns/sec/openssl/bn_exp2.c @@ -1,3 +1,4 @@ +#include "../rename.h" #include #include "cryptlib.h" #include "bn_lcl.h" diff --git a/lib/dns/sec/openssl/bn_gcd.c b/lib/dns/sec/openssl/bn_gcd.c index 398207196b..d568584958 100644 --- a/lib/dns/sec/openssl/bn_gcd.c +++ b/lib/dns/sec/openssl/bn_gcd.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_gcd.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/bn_lib.c b/lib/dns/sec/openssl/bn_lib.c index 4ee26e21b6..b6e0c92144 100644 --- a/lib/dns/sec/openssl/bn_lib.c +++ b/lib/dns/sec/openssl/bn_lib.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_lib.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/bn_mont.c b/lib/dns/sec/openssl/bn_mont.c index 7bb0b91223..d7d9078e89 100644 --- a/lib/dns/sec/openssl/bn_mont.c +++ b/lib/dns/sec/openssl/bn_mont.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_mont.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/bn_mul.c b/lib/dns/sec/openssl/bn_mul.c index eb007e19e9..351394b07e 100644 --- a/lib/dns/sec/openssl/bn_mul.c +++ b/lib/dns/sec/openssl/bn_mul.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_mul.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/bn_prime.c b/lib/dns/sec/openssl/bn_prime.c index a5f01b92eb..6c421d65d8 100644 --- a/lib/dns/sec/openssl/bn_prime.c +++ b/lib/dns/sec/openssl/bn_prime.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_prime.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/bn_print.c b/lib/dns/sec/openssl/bn_print.c index c5469f9e2c..d02393af4f 100644 --- a/lib/dns/sec/openssl/bn_print.c +++ b/lib/dns/sec/openssl/bn_print.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_print.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/bn_rand.c b/lib/dns/sec/openssl/bn_rand.c index 943712c15b..46174c1437 100644 --- a/lib/dns/sec/openssl/bn_rand.c +++ b/lib/dns/sec/openssl/bn_rand.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_rand.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/bn_recp.c b/lib/dns/sec/openssl/bn_recp.c index ecc73c7b6d..90df70d667 100644 --- a/lib/dns/sec/openssl/bn_recp.c +++ b/lib/dns/sec/openssl/bn_recp.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_recp.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/bn_shift.c b/lib/dns/sec/openssl/bn_shift.c index 61aae65a6b..6d39737018 100644 --- a/lib/dns/sec/openssl/bn_shift.c +++ b/lib/dns/sec/openssl/bn_shift.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_shift.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/bn_sqr.c b/lib/dns/sec/openssl/bn_sqr.c index fe00c5f69a..90431cec88 100644 --- a/lib/dns/sec/openssl/bn_sqr.c +++ b/lib/dns/sec/openssl/bn_sqr.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_sqr.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/bn_word.c b/lib/dns/sec/openssl/bn_word.c index 73157a7d43..07918a818b 100644 --- a/lib/dns/sec/openssl/bn_word.c +++ b/lib/dns/sec/openssl/bn_word.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/bn/bn_word.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/buffer.c b/lib/dns/sec/openssl/buffer.c index c3a108ea52..986ecc1522 100644 --- a/lib/dns/sec/openssl/buffer.c +++ b/lib/dns/sec/openssl/buffer.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/buffer/buffer.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/cryptlib.c b/lib/dns/sec/openssl/cryptlib.c index a8f29f1e65..1c3e262c23 100644 --- a/lib/dns/sec/openssl/cryptlib.c +++ b/lib/dns/sec/openssl/cryptlib.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/cryptlib.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/dh_err.c b/lib/dns/sec/openssl/dh_err.c index 0348bd24a2..edede43537 100644 --- a/lib/dns/sec/openssl/dh_err.c +++ b/lib/dns/sec/openssl/dh_err.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/dh/dh_err.c */ /* ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. diff --git a/lib/dns/sec/openssl/dh_gen.c b/lib/dns/sec/openssl/dh_gen.c index 7a6a38fbb4..70ab1a1be5 100644 --- a/lib/dns/sec/openssl/dh_gen.c +++ b/lib/dns/sec/openssl/dh_gen.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/dh/dh_gen.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/dh_key.c b/lib/dns/sec/openssl/dh_key.c index 7d851378c8..4761ad627b 100644 --- a/lib/dns/sec/openssl/dh_key.c +++ b/lib/dns/sec/openssl/dh_key.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/dh/dh_key.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/dh_lib.c b/lib/dns/sec/openssl/dh_lib.c index 6c21463028..de798a524f 100644 --- a/lib/dns/sec/openssl/dh_lib.c +++ b/lib/dns/sec/openssl/dh_lib.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/dh/dh_lib.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/dsa_asn1.c b/lib/dns/sec/openssl/dsa_asn1.c index 3bc02163d6..cb6c131c2d 100644 --- a/lib/dns/sec/openssl/dsa_asn1.c +++ b/lib/dns/sec/openssl/dsa_asn1.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/dsa/dsa_asn1.c */ #include diff --git a/lib/dns/sec/openssl/dsa_err.c b/lib/dns/sec/openssl/dsa_err.c index 38e4af968c..2d4f496155 100644 --- a/lib/dns/sec/openssl/dsa_err.c +++ b/lib/dns/sec/openssl/dsa_err.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/dsa/dsa_err.c */ /* ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. diff --git a/lib/dns/sec/openssl/dsa_gen.c b/lib/dns/sec/openssl/dsa_gen.c index 2294a362d9..55fcbad8f4 100644 --- a/lib/dns/sec/openssl/dsa_gen.c +++ b/lib/dns/sec/openssl/dsa_gen.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/dsa/dsa_gen.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/dsa_key.c b/lib/dns/sec/openssl/dsa_key.c index ab7f38fc7c..2e888a5548 100644 --- a/lib/dns/sec/openssl/dsa_key.c +++ b/lib/dns/sec/openssl/dsa_key.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/dsa/dsa_key.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/dsa_lib.c b/lib/dns/sec/openssl/dsa_lib.c index d77244d1bf..4a44e027a5 100644 --- a/lib/dns/sec/openssl/dsa_lib.c +++ b/lib/dns/sec/openssl/dsa_lib.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/dsa/dsa_lib.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/dsa_ossl.c b/lib/dns/sec/openssl/dsa_ossl.c index a72b5d034d..3095564bbb 100644 --- a/lib/dns/sec/openssl/dsa_ossl.c +++ b/lib/dns/sec/openssl/dsa_ossl.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/dsa/dsa_ossl.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/dsa_sign.c b/lib/dns/sec/openssl/dsa_sign.c index 72ff43911e..8f45ab07f8 100644 --- a/lib/dns/sec/openssl/dsa_sign.c +++ b/lib/dns/sec/openssl/dsa_sign.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/dsa/dsa_sign.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/dsa_vrf.c b/lib/dns/sec/openssl/dsa_vrf.c index 9e20358bc4..d1b14065f9 100644 --- a/lib/dns/sec/openssl/dsa_vrf.c +++ b/lib/dns/sec/openssl/dsa_vrf.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/dsa/dsa_vrf.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/err.c b/lib/dns/sec/openssl/err.c index 93c64cbc4f..01ae71b294 100644 --- a/lib/dns/sec/openssl/err.c +++ b/lib/dns/sec/openssl/err.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/err/err.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/ex_data.c b/lib/dns/sec/openssl/ex_data.c index a057dd3b68..33f8577a04 100644 --- a/lib/dns/sec/openssl/ex_data.c +++ b/lib/dns/sec/openssl/ex_data.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/ex_data.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/include/openssl/Makefile.in b/lib/dns/sec/openssl/include/openssl/Makefile.in index 65fe200031..d3be26815d 100644 --- a/lib/dns/sec/openssl/include/openssl/Makefile.in +++ b/lib/dns/sec/openssl/include/openssl/Makefile.in @@ -17,6 +17,8 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ +CDEFINES = @DST_PRIVATEOPENSSL@ + SUBDIRS = TARGETS = diff --git a/lib/dns/sec/openssl/lhash.c b/lib/dns/sec/openssl/lhash.c index 6a340a2403..960f3242d1 100644 --- a/lib/dns/sec/openssl/lhash.c +++ b/lib/dns/sec/openssl/lhash.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/lhash/lhash.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/md5_dgst.c b/lib/dns/sec/openssl/md5_dgst.c index 23d196b8d4..cc88f34a09 100644 --- a/lib/dns/sec/openssl/md5_dgst.c +++ b/lib/dns/sec/openssl/md5_dgst.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/md5/md5_dgst.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. @@ -81,8 +82,8 @@ void MD5_Init(MD5_CTX *c) c->num=0; } -#ifndef md5_block_host_order -void md5_block_host_order (MD5_CTX *c, const void *data, int num) +#ifndef dst_md5_block_host_order +void dst_md5_block_host_order (MD5_CTX *c, const void *data, int num) { const MD5_LONG *X=data; register unsigned long A,B,C,D; @@ -185,11 +186,11 @@ void md5_block_host_order (MD5_CTX *c, const void *data, int num) } #endif -#ifndef md5_block_data_order +#ifndef dst_md5_block_data_order #ifdef X #undef X #endif -void md5_block_data_order (MD5_CTX *c, const void *data_, int num) +void dst_md5_block_data_order (MD5_CTX *c, const void *data_, int num) { const unsigned char *data=data_; register unsigned long A,B,C,D,l; diff --git a/lib/dns/sec/openssl/md_rand.c b/lib/dns/sec/openssl/md_rand.c index 4e5758c5ba..2c2605e4d7 100644 --- a/lib/dns/sec/openssl/md_rand.c +++ b/lib/dns/sec/openssl/md_rand.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/rand/md_rand.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/mem.c b/lib/dns/sec/openssl/mem.c index 6d5c93a351..127e618d36 100644 --- a/lib/dns/sec/openssl/mem.c +++ b/lib/dns/sec/openssl/mem.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/mem.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/mem_dbg.c b/lib/dns/sec/openssl/mem_dbg.c index d92faaf63d..70c91789bc 100644 --- a/lib/dns/sec/openssl/mem_dbg.c +++ b/lib/dns/sec/openssl/mem_dbg.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/mem_dbg.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/rand_lib.c b/lib/dns/sec/openssl/rand_lib.c index b09a300c46..89e4733cbf 100644 --- a/lib/dns/sec/openssl/rand_lib.c +++ b/lib/dns/sec/openssl/rand_lib.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/rand/rand_lib.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/sha1_one.c b/lib/dns/sec/openssl/sha1_one.c index 861752eaa7..bfa2dc5df0 100644 --- a/lib/dns/sec/openssl/sha1_one.c +++ b/lib/dns/sec/openssl/sha1_one.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/sha/sha1_one.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/sha1dgst.c b/lib/dns/sec/openssl/sha1dgst.c index c09edb4cd7..dd0141c42b 100644 --- a/lib/dns/sec/openssl/sha1dgst.c +++ b/lib/dns/sec/openssl/sha1dgst.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/sha/sha1dgst.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/stack.c b/lib/dns/sec/openssl/stack.c index 58e9126339..3db7162de1 100644 --- a/lib/dns/sec/openssl/stack.c +++ b/lib/dns/sec/openssl/stack.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/stack/stack.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/lib/dns/sec/openssl/th-lock.c b/lib/dns/sec/openssl/th-lock.c index ed976db3ba..d16a1c9ab3 100644 --- a/lib/dns/sec/openssl/th-lock.c +++ b/lib/dns/sec/openssl/th-lock.c @@ -1,3 +1,4 @@ +#include "../rename.h" /* crypto/threads/th-lock.c */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. diff --git a/util/copyrights b/util/copyrights index 6d3e3dc940..0b6e707081 100644 --- a/util/copyrights +++ b/util/copyrights @@ -557,6 +557,7 @@ ./lib/dns/rootns.c C 1999,2000 ./lib/dns/sec/.cvsignore X 1999,2000 ./lib/dns/sec/Makefile.in MAKE 1998,1999,2000 +./lib/dns/sec/rename.h C 2000 ./lib/dns/sec/dnssafe/.cvsignore X 1999,2000 ./lib/dns/sec/dnssafe/Makefile.in MAKE 1998,1999,2000 ./lib/dns/sec/dst/.cvsignore X 1999,2000