Commit 08a768e8 authored by Michael Graff's avatar Michael Graff

Infrastructure to allow use of alternate openssl libraries. Default is still...

Infrastructure to allow use of alternate openssl libraries.  Default is still to use our internal, now renamed, version.
parent 264fd373
......@@ -27,12 +27,19 @@ CINCLUDES = \
CDEFINES =
CWARNINGS =
DEPLIBS = ../../lib/lwres/liblwres.@A@ \
../../lib/dns/libdns.@A@ \
../../lib/isc/libisc.@A@
OMAPILIBS = ../../lib/omapi/libomapi.@A@
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
ISCLIBS = ../../lib/isc/libisc.@A@
LWRESLIBS = ../../lib/lwres/liblwres.@A@
LIBS = ${DEPLIBS} \
@LIBS@
OMAPIDEPLIBS = ../../lib/omapi/libomapi.@A@
DNSDEPLIBS = ../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../lib/isc/libisc.@A@
LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@
DEPLIBS = ${OMAPIDEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS} ${LWRESDEPLIBS}
LIBS = ${OMAPILIBS} ${DNSLIBS} ${ISCLIBS} ${LWRESLIBS} @LIBS@
TARGETS = lwresd
......
......@@ -27,12 +27,17 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include \
CDEFINES =
CWARNINGS =
DEPLIBS = ../../lib/dns/libdns.@A@ \
../../lib/omapi/libomapi.@A@ \
../../lib/isc/libisc.@A@
OMAPILIBS = ../../lib/omapi/libomapi.@A@
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
ISCLIBS = ../../lib/isc/libisc.@A@
LIBS = ${DEPLIBS} \
@LIBS@
OMAPIDEPLIBS = ../../lib/omapi/libomapi.@A@
DNSDEPLIBS = ../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../lib/isc/libisc.@A@
DEPLIBS = ${OMAPIDEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${OMAPILIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@
SUBDIRS = unix
......
......@@ -27,12 +27,17 @@ CINCLUDES = -I${top_srcdir}/bin/named/include \
CDEFINES =
CWARNINGS =
DEPLIBS = ../../lib/omapi/libomapi.@A@ \
../../lib/dns/libdns.@A@ \
../../lib/isc/libisc.@A@
OMAPILIBS = ../../lib/omapi/libomapi.@A@
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
ISCLIBS = ../../lib/isc/libisc.@A@
LIBS = ${DEPLIBS} \
@LIBS@
OMAPIDEPLIBS = ../../lib/omapi/libomapi.@A@
DNSDEPLIBS = ../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../lib/isc/libisc.@A@
DEPLIBS = ${OMAPIDEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${OMAPILIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@
TARGETS = rndc
......
......@@ -25,7 +25,7 @@ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${LWRES_INCLUDES} \
CDEFINES =
CWARNINGS =
DNSLIBS = ../../lib/dns/libdns.@A@
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
ISCLIBS = ../../lib/isc/libisc.@A@
OMAPILIBS = ../../lib/omapi/libomapi.@A@
LWRESLIBS = ../../lib/lwres/liblwres.@A@
......
......@@ -24,11 +24,15 @@ CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
CDEFINES =
CWARNINGS =
DEPLIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/isc/libisc.@A@
DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
ISCLIBS = ../../../lib/isc/libisc.@A@
LIBS = ${DEPLIBS} \
@LIBS@
DNSDEPLIBS = ../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../lib/isc/libisc.@A@
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
TLIB = ../../../lib/tests/libt_api.@A@
......
......@@ -24,11 +24,15 @@ CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
CDEFINES =
CWARNINGS =
DEPLIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/isc/libisc.@A@
DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
ISCLIBS = ../../../lib/isc/libisc.@A@
LIBS = ${DEPLIBS} \
@LIBS@
DNSDEPLIBS = ../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../lib/isc/libisc.@A@
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
TLIB = ../../../lib/tests/libt_api.@A@
......
......@@ -25,11 +25,15 @@ CDEFINES =
CWARNINGS =
# Note that we do not want to use libtool for libt_api
DEPLIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/isc/libisc.@A@
DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
ISCLIBS = ../../../lib/isc/libisc.@A@
LIBS = ${DEPLIBS} \
@LIBS@
DNSDEPLIBS = ../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../lib/isc/libisc.@A@
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
TLIB = ../../../lib/tests/libt_api.@A@
......
......@@ -24,12 +24,17 @@ CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
CDEFINES =
CWARNINGS =
DEPLIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/tests/libt_api.@A@ \
../../../lib/isc/libisc.@A@
DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
ISCLIBS = ../../../lib/isc/libisc.@A@
TAPIDEPLIBS = ../../../lib/tests/libt_api.@A@
LIBS = ${DEPLIBS} \
@LIBS@
DNSDEPLIBS = ../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../lib/isc/libisc.@A@
TAPILIBS = ../../../lib/tests/libt_api.@A@
DEPLIBS = ${DNSDEPLIBS} ${TAPIDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${TAPILIBS} ${ISCLIBS} @LIBS@
TARGETS = t_mem
......
......@@ -25,11 +25,15 @@ CDEFINES =
CWARNINGS =
# Note that we do not want to use libtool for libt_api
DEPLIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/isc/libisc.@A@
DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
ISCLIBS = ../../../lib/isc/libisc.@A@
LIBS = ${DEPLIBS} \
@LIBS@
DNSDEPLIBS = ../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../lib/isc/libisc.@A@
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
TLIB = ../../../lib/tests/libt_api.@A@
......
......@@ -25,11 +25,15 @@ CDEFINES =
CWARNINGS =
# Note that we do not want to use libtool for libt_api
DEPLIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/isc/libisc.@A@
DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
ISCLIBS = ../../../lib/isc/libisc.@A@
LIBS = ${DEPLIBS} \
@LIBS@
DNSDEPLIBS = ../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../lib/isc/libisc.@A@
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
TLIB = ../../../lib/tests/libt_api.@A@
......
......@@ -24,12 +24,17 @@ CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
CDEFINES =
CWARNINGS =
DEPLIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/tests/libt_api.@A@ \
../../../lib/isc/libisc.@A@
DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
ISCLIBS = ../../../lib/isc/libisc.@A@
TAPIDEPLIBS = ../../../lib/tests/libt_api.@A@
LIBS = ${DEPLIBS} \
@LIBS@
DNSDEPLIBS = ../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../lib/isc/libisc.@A@
TAPILIBS = ../../../lib/tests/libt_api.@A@
DEPLIBS = ${DNSDEPLIBS} ${TAPIDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${TAPILIBS} ${ISCLIBS} @LIBS@
TARGETS = t_sockaddr
......
......@@ -24,13 +24,17 @@ CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
CDEFINES =
CWARNINGS =
DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
ISCLIBS = ../../../lib/isc/libisc.@A@
TAPIDEPLIBS = ../../../lib/tests/libt_api.@A@
DEPLIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/tests/libt_api.@A@ \
../../../lib/isc/libisc.@A@
DNSDEPLIBS = ../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../lib/isc/libisc.@A@
TAPILIBS = ../../../lib/tests/libt_api.@A@
LIBS = ${DEPLIBS} \
@LIBS@
DEPLIBS = ${DNSDEPLIBS} ${TAPIDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${TAPILIBS} ${ISCLIBS} @LIBS@
TARGETS = t_tasks
......
......@@ -24,11 +24,15 @@ CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
CDEFINES =
CWARNINGS =
DEPLIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/isc/libisc.@A@
DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
ISCLIBS = ../../../lib/isc/libisc.@A@
LIBS = ${DEPLIBS} \
@LIBS@
DNSDEPLIBS = ../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../lib/isc/libisc.@A@
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
TLIB = ../../../lib/tests/libt_api.@A@
......
This diff is collapsed.
......@@ -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.116 $)
AC_REVISION($Revision: 1.117 $)
AC_PREREQ(2.13)
......@@ -151,11 +151,36 @@ fi
# XXXMLG Implement this check!
#
AC_MSG_CHECKING(for compatible OpenSSL library)
DST_PRIVATEOPENSSL='-DDST_USE_PRIVATE_OPENSSL'
dst_privateopenssl='openssl'
DST_OPENSSL_INC='-I${srcdir}/../openssl/include'
DST_OPENSSL_LIB=''
DST_OPENSSL_OBJS='${OPENSSLOBJS}'
AC_MSG_RESULT(using private library)
AC_SUBST(DST_PRIVATEOPENSSL)
AC_SUBST(dst_privateopenssl)
AC_SUBST(DST_OPENSSL_INC)
AC_SUBST(DST_OPENSSL_LIB)
AC_SUBST(DST_OPENSSL_OBJS)
#
# This would include the system openssl path (and linker options to use
# it as needed) if it is found.
#
DNS_OPENSSL_LIBS=""
AC_SUBST(DNS_OPENSSL_LIBS)
#
# testing with alternate openssl libraries... XXXMLG
#
# DNS_OPENSSL_LIBS="-L/usr/pkg/lib -lssl -lcrypto"
# DST_PRIVATEOPENSSL=''
# dst_privateopenssl=''
# DST_OPENSSL_INC='-I/usr/pkg/include'
# DST_OPENSSL_LIB=''
#
# NetBSD has two alternative pthreads implementations. Make the
......
......@@ -128,7 +128,7 @@ OBJS = a6.@O@ acl.@O@ aclconf.@O@ adb.@O@ byaddr.@O@ \
tcpmsg.@O@ time.@O@ tkey.@O@ tkeyconf.@O@ \
tsig.@O@ tsigconf.@O@ ttl.@O@ validator.@O@ \
version.@O@ view.@O@ xfrin.@O@ zone.@O@ zoneconf.@O@ zt.@O@ \
${DSTOBJS} ${OPENSSLOBJS} ${DNSSAFEOBJS} ${CONFOBJS}
${DSTOBJS} @DST_OPENSSL_OBJS@ ${DNSSAFEOBJS} ${CONFOBJS}
# Alphabetically
SRCS = a6.c acl.c aclconf.c adb.c byaddr.c \
......
......@@ -22,7 +22,7 @@ top_srcdir = @top_srcdir@
CINCLUDES = -I${srcdir} \
-I${srcdir}/../dnssafe \
-I${srcdir}/../openssl/include \
${DNS_INCLUDES} ${ISC_INCLUDES}
${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = -DUSE_MD5 -DDNSSAFE -DOPENSSL @DST_PRIVATEOPENSSL@
CWARNINGS =
......
......@@ -17,7 +17,7 @@
/*
* Principal Author: Brian Wellington
* $Id: dst_api.c,v 1.28 2000/04/18 17:39:36 bwelling Exp $
* $Id: dst_api.c,v 1.29 2000/04/20 18:27:40 explorer Exp $
*/
#include <config.h>
......@@ -43,11 +43,11 @@
#include <dns/rdata.h>
#include <dns/keyvalues.h>
#include <openssl/rand.h>
#include "dst_internal.h"
#include "dst/result.h"
#include <openssl/rand.h>
#define KEY_MAGIC 0x44535421U /* DST! */
#define VALID_KEY(key) (key != NULL && key->magic == KEY_MAGIC)
......
......@@ -17,7 +17,7 @@
/*
* Principal Author: Brian Wellington
* $Id: hmac_link.c,v 1.18 2000/04/20 01:12:26 explorer Exp $
* $Id: hmac_link.c,v 1.19 2000/04/20 18:27:42 explorer Exp $
*/
#include <config.h>
......@@ -33,11 +33,11 @@
#include <isc/int.h>
#include <isc/region.h>
#include <openssl/md5.h>
#include "dst_internal.h"
#include "dst_parse.h"
#include <openssl/md5.h>
#define HMAC_LEN 64
#define HMAC_IPAD 0x36
#define HMAC_OPAD 0x5c
......
......@@ -67,15 +67,15 @@
#ifdef MD5_ASM
# if defined(__i386) || defined(_M_IX86) || defined(__INTEL__)
# define md5_block_host_order md5_block_asm_host_order
# define dst_md5_block_host_order dst_md5_block_asm_host_order
# elif defined(__sparc) && defined(ULTRASPARC)
void md5_block_asm_data_order_aligned (MD5_CTX *c, const MD5_LONG *p,int num);
# define HASH_BLOCK_DATA_ORDER_ALIGNED md5_block_asm_data_order_aligned
void dst_md5_block_asm_data_order_aligned (MD5_CTX *c, const MD5_LONG *p,int num);
# define HASH_BLOCK_DATA_ORDER_ALIGNED dst_md5_block_asm_data_order_aligned
# endif
#endif
void md5_block_host_order (MD5_CTX *c, const void *p,int num);
void md5_block_data_order (MD5_CTX *c, const void *p,int num);
void dst_md5_block_host_order (MD5_CTX *c, const void *p,int num);
void dst_md5_block_data_order (MD5_CTX *c, const void *p,int num);
#if defined(__i386) || defined(_M_IX86) || defined(__INTEL__)
/*
......@@ -99,7 +99,7 @@ void md5_block_data_order (MD5_CTX *c, const void *p,int num);
*
* <appro@fy.chalmers.se>
*/
#define md5_block_data_order md5_block_host_order
#define dst_md5_block_data_order dst_md5_block_host_order
#endif
#define DATA_ORDER_IS_LITTLE_ENDIAN
......@@ -119,13 +119,13 @@ void md5_block_data_order (MD5_CTX *c, const void *p,int num);
ll=(c)->C; HOST_l2c(ll,(s)); \
ll=(c)->D; HOST_l2c(ll,(s)); \
} while (0)
#define HASH_BLOCK_HOST_ORDER md5_block_host_order
#if !defined(L_ENDIAN) || defined(md5_block_data_order)
#define HASH_BLOCK_DATA_ORDER md5_block_data_order
#define HASH_BLOCK_HOST_ORDER dst_md5_block_host_order
#if !defined(L_ENDIAN) || defined(dst_md5_block_data_order)
#define HASH_BLOCK_DATA_ORDER dst_md5_block_data_order
/*
* Little-endians (Intel and Alpha) feel better without this.
* It looks like memcpy does better job than generic
* md5_block_data_order on copying-n-aligning input data.
* dst_md5_block_data_order on copying-n-aligning input data.
* But frankly speaking I didn't expect such result on Alpha.
* On the other hand I've got this with egcs-1.0.2 and if
* program is compiled with another (better?) compiler it
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment