Finished merge of rt45019 (openssl hash default)

diff --cc CHANGES
index 1cc3ddcccbf5cb80627a82cf1bdb3a4962e82a1a,fd5169de257c4ec65f28196cb5023754d3a008b6..30106335ac8067e8b01f006e4fafa50e0e493f5e
--- 1/CHANGES
--- 2/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 26177bdcb597540311bd7e40d7f172d336234e1d,e9d2515853e41b52c770262d1257fc9c749d24b2..ac55cb87d87352d7f2edb82f4e271ae6a50c8c6b
--- 1/bin/dig/Makefile.in
--- 2/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 4541ab60ad07478142ad2e43a567e1a3de139fb9,9b18d15fbde3e26429380833a66ecc7cae98b716..7ddc621fd0eec3b64cb29ea607090b1523b8f701
--- 1/bin/named/Makefile.in
--- 2/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 786878c51f38fccb706612b9333068486df6005e,c383cc7b648cdfdb650554b0a9455926e688125d..2342d36b88f49ca6e515f3ae2936eb641cdefcfe
--- 1/bin/nsupdate/Makefile.in
--- 2/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 02d514b136be36314981a63b5ef077dae6c998f3,e80ad0be23c32e66f92fa5a2e982d6c6e0698e51..446df582416cba69e6c2eb41dda2aad6372644e2
--- 1/bin/tests/Makefile.in
--- 2/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 4f29a735f9a48d725cd77034f0640cfcda2c59f3,eea83811eb67bb282a111172f2b6055d08475168..300564437c7fe5d521d14f81ce186d08cb507119
--- 1/bin/tools/Makefile.in
--- 2/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@

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge