From: Francis Dupont <fdupont@isc.org>
Date: Sat, 9 Sep 2017 08:30:16 +0000 (+0200)
Subject: Finished merge of rt45019 (openssl hash default)
X-Git-Tag: v9.12.0a1~29
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=90f6140832d7addcc5c924343d5cdcccd25eac3f;p=thirdparty%2Fbind9.git

Finished merge of rt45019 (openssl hash default)
---

90f6140832d7addcc5c924343d5cdcccd25eac3f
diff --cc CHANGES
index 1cc3ddcccbf,fd5169de257..30106335ac8
--- a/CHANGES
+++ b/CHANGES
@@@ -1,34 -1,3 +1,37 @@@
++4710.	[cleanup]	Changed the --enable-openssl-hash default to yes.
++			[RT #45019]
++
 +4709.	[cleanup]	Use dns_name_fullhash() to hash names for RRL.
 +			[RT #45435]
 +
 +4708.   [cleanup]       Legacy Windows builds (i.e. for XP and earlier)
 +			are no longer supported. [RT #45186]
 +
 +4707.	[func]		The lightweight resolver daemon and library (lwresd
 +			and liblwres) have been removed. [RT #45186]
 +
 +4706.	[func]		Code implementing name server query processing has
 +			been moved from bin/named to a new library "libns".
 +			Functions remaining in bin/named are now prefixed
 +			with "named_" rather than "ns_".  This will make it
 +			easier to write unit tests for name server code, or
 +			link name server functionality into new tools.
 +			[RT #45186]
 +
 +4705.	[placeholder]
 +
 +4704.	[cleanup]	Silence Visual Studio compiler warnings. [RT #45898]
 +
 +4703.	[bug]		BINDInstall.exe was missing some buffer length checks.
 +			[RT #45898]
 +
 +4702.	[func]		Update function declarations to use
 +			dns_masterstyle_flags_t for style flags. [RT #45924]
 +
 +4701.	[cleanup]	Refactored lib/dns/tsig.c to reduce code
 +			duplication and simplify the disabling of MD5.
 +			[RT #45490]
 +
  4700.	[func]		Serving of stale answers is now supported. This
  			allows named to provide stale cached answers when
  			the authoritative server is under attack.
diff --cc bin/dig/Makefile.in
index 26177bdcb59,e9d2515853e..ac55cb87d87
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@@ -24,9 -24,9 +24,9 @@@ CWARNINGS 
  ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
  DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
  BIND9LIBS =	../../lib/bind9/libbind9.@A@
- ISCLIBS =	../../lib/isc/libisc.@A@
- ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
+ ISCLIBS =	../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
+ ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@
 -LWRESLIBS =	../../lib/lwres/liblwres.@A@
 +IRSLIBS =	../../lib/irs/libirs.@A@
  
  ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
  DNSDEPLIBS =	../../lib/dns/libdns.@A@
diff --cc bin/named/Makefile.in
index 4541ab60ad0,9b18d15fbde..7ddc621fd0e
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@@ -48,10 -47,10 +48,10 @@@ CWARNINGS 
  DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
  ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
  ISCCCLIBS =	../../lib/isccc/libisccc.@A@
- ISCLIBS =	../../lib/isc/libisc.@A@
- ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
+ ISCLIBS =	../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
+ ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@
 -LWRESLIBS =	../../lib/lwres/liblwres.@A@
  BIND9LIBS =	../../lib/bind9/libbind9.@A@
 +NSLIBS =	../../lib/ns/libns.@A@
  
  DNSDEPLIBS =	../../lib/dns/libdns.@A@
  ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
diff --cc bin/nsupdate/Makefile.in
index 786878c51f3,c383cc7b648..2342d36b88f
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@@ -23,13 -23,14 +23,13 @@@ CINCLUDES =	${DNS_INCLUDES} ${BIND9_INC
  CDEFINES =	-DVERSION=\"${VERSION}\" @CRYPTO@ @USE_GSSAPI@
  CWARNINGS =
  
 -LWRESLIBS =	../../lib/lwres/liblwres.@A@
  DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
  BIND9LIBS =	../../lib/bind9/libbind9.@A@
- ISCLIBS =	../../lib/isc/libisc.@A@
- ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
+ ISCLIBS =	../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
+ ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@
  ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
 +IRSLIBS =	../../lib/irs/libirs.@A@
  
 -LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@
  DNSDEPLIBS =	../../lib/dns/libdns.@A@
  BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
  ISCDEPLIBS =	../../lib/isc/libisc.@A@
diff --cc bin/tests/Makefile.in
index 02d514b136b,e80ad0be23c..446df582416
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@@ -11,7 -11,7 +11,7 @@@ top_srcdir =	@top_srcdir
  @BIND9_MAKE_INCLUDES@
  
  CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
--		${LWRES_INCLUDES} ${OMAPI_INCLUDES} @DST_OPENSSL_INC@
++		${OMAPI_INCLUDES} @DST_OPENSSL_INC@
  
  CDEFINES =	@CRYPTO@
  CWARNINGS =
diff --cc bin/tools/Makefile.in
index 4f29a735f9a,eea83811eb6..300564437c7
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@@ -20,9 -21,10 +20,9 @@@ CWARNINGS 
  
  DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
  BIND9LIBS =	../../lib/bind9/libbind9.@A@
- ISCLIBS =	../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@
- ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
+ ISCLIBS =	../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
+ ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@
  ISCCFGLIBS = 	../../lib/isccfg/libisccfg.@A@
 -LWRESLIBS =	../../lib/lwres/liblwres.@A@
  
  DNSDEPLIBS =	../../lib/dns/libdns.@A@
  BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@