[src/trunk]: src/external/bsd/unbound merge conflicts

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/906046d248f2
branches:  trunk
changeset: 359263:906046d248f2
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Feb 06 03:05:47 2018 +0000

description:
merge conflicts

diffstat:

 external/bsd/unbound/dist/testdata/00-lint.tpkg             |  Bin 
 external/bsd/unbound/dist/testdata/01-doc.tpkg              |  Bin 
 external/bsd/unbound/dist/testdata/02-unittest.tpkg         |  Bin 
 external/bsd/unbound/dist/testdata/03-testbound.tpkg        |  Bin 
 external/bsd/unbound/dist/testdata/04-checkconf.tpkg        |  Bin 
 external/bsd/unbound/dist/testdata/05-asynclook.tpkg        |  Bin 
 external/bsd/unbound/dist/testdata/06-ianaports.tpkg        |  Bin 
 external/bsd/unbound/dist/testdata/07-confroot.tpkg         |  Bin 
 external/bsd/unbound/dist/testdata/08-host-lib.tpkg         |  Bin 
 external/bsd/unbound/dist/testdata/09-unbound-control.tpkg  |  Bin 
 external/bsd/unbound/dist/testdata/10-unbound-anchor.tpkg   |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_itr.tpkg            |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tpkg           |  Bin 
 external/bsd/unbound/dist/testdata/edns_cache.tpkg          |  Bin 
 external/bsd/unbound/dist/testdata/edns_lame.tpkg           |  Bin 
 external/bsd/unbound/dist/testdata/fwd_ancil.tpkg           |  Bin 
 external/bsd/unbound/dist/testdata/fwd_bogus.tpkg           |  Bin 
 external/bsd/unbound/dist/testdata/fwd_capsid.tpkg          |  Bin 
 external/bsd/unbound/dist/testdata/fwd_capsid_fallback.tpkg |  Bin 
 external/bsd/unbound/dist/testdata/fwd_capsid_strip.tpkg    |  Bin 
 external/bsd/unbound/dist/testdata/fwd_capsid_white.tpkg    |  Bin 
 external/bsd/unbound/dist/testdata/fwd_compress_c00c.tpkg   |  Bin 
 external/bsd/unbound/dist/testdata/fwd_edns_bksec.tpkg      |  Bin 
 external/bsd/unbound/dist/testdata/fwd_edns_probe.tpkg      |  Bin 
 external/bsd/unbound/dist/testdata/fwd_no_edns.tpkg         |  Bin 
 external/bsd/unbound/dist/testdata/fwd_oneport.tpkg         |  Bin 
 external/bsd/unbound/dist/testdata/fwd_tcp.tpkg             |  Bin 
 external/bsd/unbound/dist/testdata/fwd_tcp_tc.tpkg          |  Bin 
 external/bsd/unbound/dist/testdata/fwd_tcp_tc6.tpkg         |  Bin 
 external/bsd/unbound/dist/testdata/fwd_three.tpkg           |  Bin 
 external/bsd/unbound/dist/testdata/fwd_three_service.tpkg   |  Bin 
 external/bsd/unbound/dist/testdata/fwd_ttlexpire.tpkg       |  Bin 
 external/bsd/unbound/dist/testdata/fwd_udp.tpkg             |  Bin 
 external/bsd/unbound/dist/testdata/fwd_udptmout.tpkg        |  Bin 
 external/bsd/unbound/dist/testdata/fwd_waitudp.tpkg         |  Bin 
 external/bsd/unbound/dist/testdata/fwd_zero.tpkg            |  Bin 
 external/bsd/unbound/dist/testdata/hostsfileosx.tpkg        |  Bin 
 external/bsd/unbound/dist/testdata/local_nodefault.tpkg     |  Bin 
 external/bsd/unbound/dist/testdata/local_norec.tpkg         |  Bin 
 external/bsd/unbound/dist/testdata/local_nosnoop.tpkg       |  Bin 
 external/bsd/unbound/dist/testdata/nss_compile.tpkg         |  Bin 
 external/bsd/unbound/dist/testdata/pylib.tpkg               |  Bin 
 external/bsd/unbound/dist/testdata/pymod.tpkg               |  Bin 
 external/bsd/unbound/dist/testdata/pymod_thread.tpkg        |  Bin 
 external/bsd/unbound/dist/testdata/remote-threaded.tpkg     |  Bin 
 external/bsd/unbound/dist/testdata/root_anchor.tpkg         |  Bin 
 external/bsd/unbound/dist/testdata/root_hints.tpkg          |  Bin 
 external/bsd/unbound/dist/testdata/speed_cache.tpkg         |  Bin 
 external/bsd/unbound/dist/testdata/speed_local.tpkg         |  Bin 
 external/bsd/unbound/dist/testdata/stat_timer.tpkg          |  Bin 
 external/bsd/unbound/dist/testdata/stream_ssl.tpkg          |  Bin 
 external/bsd/unbound/dist/testdata/stream_tcp.tpkg          |  Bin 
 external/bsd/unbound/dist/testdata/stub_udp.tpkg            |  Bin 
 external/bsd/unbound/dist/testdata/stub_udp6.tpkg           |  Bin 
 external/bsd/unbound/dist/testdata/tcp_sigpipe.tpkg         |  Bin 
 external/bsd/unbound/include/config.h                       |  159 ++++++++++-
 external/bsd/unbound/include/dnscrypt/dnscrypt_config.h     |   17 +
 external/bsd/unbound/lib/libunbound/Makefile                |    6 +-
 external/bsd/unbound/lib/libunbound/shlib_version           |    4 +-
 external/bsd/unbound/sbin/unbound/Makefile                  |    5 +-
 60 files changed, 164 insertions(+), 27 deletions(-)

diffs (truncated from 557 to 300 lines):

diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/00-lint.tpkg
Binary file external/bsd/unbound/dist/testdata/00-lint.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/01-doc.tpkg
Binary file external/bsd/unbound/dist/testdata/01-doc.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/02-unittest.tpkg
Binary file external/bsd/unbound/dist/testdata/02-unittest.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/03-testbound.tpkg
Binary file external/bsd/unbound/dist/testdata/03-testbound.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/04-checkconf.tpkg
Binary file external/bsd/unbound/dist/testdata/04-checkconf.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/05-asynclook.tpkg
Binary file external/bsd/unbound/dist/testdata/05-asynclook.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/06-ianaports.tpkg
Binary file external/bsd/unbound/dist/testdata/06-ianaports.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/07-confroot.tpkg
Binary file external/bsd/unbound/dist/testdata/07-confroot.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/08-host-lib.tpkg
Binary file external/bsd/unbound/dist/testdata/08-host-lib.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/09-unbound-control.tpkg
Binary file external/bsd/unbound/dist/testdata/09-unbound-control.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/10-unbound-anchor.tpkg
Binary file external/bsd/unbound/dist/testdata/10-unbound-anchor.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/ctrl_itr.tpkg
Binary file external/bsd/unbound/dist/testdata/ctrl_itr.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/ctrl_pipe.tpkg
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/edns_cache.tpkg
Binary file external/bsd/unbound/dist/testdata/edns_cache.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/edns_lame.tpkg
Binary file external/bsd/unbound/dist/testdata/edns_lame.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_ancil.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_ancil.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_bogus.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_bogus.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_capsid.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_capsid.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_capsid_fallback.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_capsid_fallback.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_capsid_strip.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_capsid_strip.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_capsid_white.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_capsid_white.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_compress_c00c.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_compress_c00c.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_edns_bksec.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_edns_bksec.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_edns_probe.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_edns_probe.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_no_edns.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_no_edns.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_oneport.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_oneport.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_tcp.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_tcp.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_tcp_tc.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_tcp_tc.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_tcp_tc6.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_tcp_tc6.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_three.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_three.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_three_service.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_three_service.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_ttlexpire.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_ttlexpire.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_udp.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_udp.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_udptmout.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_udptmout.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_waitudp.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_waitudp.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/fwd_zero.tpkg
Binary file external/bsd/unbound/dist/testdata/fwd_zero.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/hostsfileosx.tpkg
Binary file external/bsd/unbound/dist/testdata/hostsfileosx.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/local_nodefault.tpkg
Binary file external/bsd/unbound/dist/testdata/local_nodefault.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/local_norec.tpkg
Binary file external/bsd/unbound/dist/testdata/local_norec.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/local_nosnoop.tpkg
Binary file external/bsd/unbound/dist/testdata/local_nosnoop.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/nss_compile.tpkg
Binary file external/bsd/unbound/dist/testdata/nss_compile.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/pylib.tpkg
Binary file external/bsd/unbound/dist/testdata/pylib.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/pymod.tpkg
Binary file external/bsd/unbound/dist/testdata/pymod.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/pymod_thread.tpkg
Binary file external/bsd/unbound/dist/testdata/pymod_thread.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/remote-threaded.tpkg
Binary file external/bsd/unbound/dist/testdata/remote-threaded.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/root_anchor.tpkg
Binary file external/bsd/unbound/dist/testdata/root_anchor.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/root_hints.tpkg
Binary file external/bsd/unbound/dist/testdata/root_hints.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/speed_cache.tpkg
Binary file external/bsd/unbound/dist/testdata/speed_cache.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/speed_local.tpkg
Binary file external/bsd/unbound/dist/testdata/speed_local.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/stat_timer.tpkg
Binary file external/bsd/unbound/dist/testdata/stat_timer.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/stream_ssl.tpkg
Binary file external/bsd/unbound/dist/testdata/stream_ssl.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/stream_tcp.tpkg
Binary file external/bsd/unbound/dist/testdata/stream_tcp.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/stub_udp.tpkg
Binary file external/bsd/unbound/dist/testdata/stub_udp.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/stub_udp6.tpkg
Binary file external/bsd/unbound/dist/testdata/stub_udp6.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/dist/testdata/tcp_sigpipe.tpkg
Binary file external/bsd/unbound/dist/testdata/tcp_sigpipe.tpkg has changed
diff -r e9b5aa3c6464 -r 906046d248f2 external/bsd/unbound/include/config.h
--- a/external/bsd/unbound/include/config.h     Tue Feb 06 02:39:25 2018 +0000
+++ b/external/bsd/unbound/include/config.h     Tue Feb 06 03:05:47 2018 +0000
@@ -4,6 +4,9 @@
 /* Directory to chroot to */
 #define CHROOT_DIR "/var/chroot/unbound"
 
+/* Define this to enable client subnet option. */
+/* #undef CLIENT_SUBNET */
+
 /* Do sha512 definitions in config.h */
 /* #undef COMPAT_SHA512 */
 
@@ -52,6 +55,9 @@
 /* Define to 1 if you have the `chroot' function. */
 #define HAVE_CHROOT 1
 
+/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */
+#define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1
+
 /* Define to 1 if you have the `ctime_r' function. */
 #define HAVE_CTIME_R 1
 
@@ -66,6 +72,18 @@
    if you don't. */
 /* #undef HAVE_DECL_ARC4RANDOM_UNIFORM */
 
+/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you
+   don't. */
+#define HAVE_DECL_INET_NTOP 1
+
+/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you
+   don't. */
+#define HAVE_DECL_INET_PTON 1
+
+/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you
+   don't. */
+#define HAVE_DECL_NID_ED25519 0
+
 /* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you
    don't. */
 #define HAVE_DECL_NID_SECP384R1 1
@@ -88,15 +106,15 @@
 
 /* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to
    0 if you don't. */
-#define HAVE_DECL_SSL_CTX_SET_ECDH_AUTO 0
+#define HAVE_DECL_SSL_CTX_SET_ECDH_AUTO 1
 
 /* Define to 1 if you have the declaration of `strlcat', and to 0 if you
    don't. */
-#define HAVE_DECL_STRLCAT 1
+/* #undef HAVE_DECL_STRLCAT */
 
 /* Define to 1 if you have the declaration of `strlcpy', and to 0 if you
    don't. */
-#define HAVE_DECL_STRLCPY 1
+/* #undef HAVE_DECL_STRLCPY */
 
 /* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if
    you don't. */
@@ -105,29 +123,50 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
+/* Define to 1 if you have the `DSA_SIG_set0' function. */
+/* #undef HAVE_DSA_SIG_SET0 */
+
 /* Define to 1 if you have the <endian.h> header file. */
-/* #undef HAVE_ENDIAN_H */
+#define HAVE_ENDIAN_H 1
 
 /* Define to 1 if you have the `endprotoent' function. */
 #define HAVE_ENDPROTOENT 1
 
+/* Define to 1 if you have the `endpwent' function. */
+#define HAVE_ENDPWENT 1
+
 /* Define to 1 if you have the `endservent' function. */
 #define HAVE_ENDSERVENT 1
 
+/* Define to 1 if you have the `ERR_free_strings' function. */
+#define HAVE_ERR_FREE_STRINGS 1
+
+/* Define to 1 if you have the `ERR_load_crypto_strings' function. */
+#define HAVE_ERR_LOAD_CRYPTO_STRINGS 1
+
 /* Define to 1 if you have the `event_base_free' function. */
-#define HAVE_EVENT_BASE_FREE 1
+/* #undef HAVE_EVENT_BASE_FREE */
 
 /* Define to 1 if you have the `event_base_get_method' function. */
-#define HAVE_EVENT_BASE_GET_METHOD 1
+/* #undef HAVE_EVENT_BASE_GET_METHOD */
 
 /* Define to 1 if you have the `event_base_new' function. */
-#define HAVE_EVENT_BASE_NEW 1
+/* #undef HAVE_EVENT_BASE_NEW */
 
 /* Define to 1 if you have the `event_base_once' function. */
-#define HAVE_EVENT_BASE_ONCE 1
+/* #undef HAVE_EVENT_BASE_ONCE */
 
 /* Define to 1 if you have the <event.h> header file. */
-#define HAVE_EVENT_H 1
+/* #undef HAVE_EVENT_H */
+
+/* Define to 1 if you have the `EVP_cleanup' function. */
+#define HAVE_EVP_CLEANUP 1
+
+/* Define to 1 if you have the `EVP_DigestVerify' function. */
+/* #undef HAVE_EVP_DIGESTVERIFY */
+
+/* Define to 1 if you have the `EVP_dss1' function. */
+#define HAVE_EVP_DSS1 1
 
 /* Define to 1 if you have the `EVP_MD_CTX_new' function. */
 /* #undef HAVE_EVP_MD_CTX_NEW */
@@ -255,24 +294,51 @@
 /* Use libnettle for crypto */
 /* #undef HAVE_NETTLE */
 
+/* Define to 1 if you have the <nettle/dsa-compat.h> header file. */
+/* #undef HAVE_NETTLE_DSA_COMPAT_H */
+
+/* Define to 1 if you have the <nettle/eddsa.h> header file. */
+/* #undef HAVE_NETTLE_EDDSA_H */
+
 /* Use libnss for crypto */
 /* #undef HAVE_NSS */
 
+/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */
+#define HAVE_OPENSSL_ADD_ALL_DIGESTS 1
+
+/* Define to 1 if you have the <openssl/bn.h> header file. */
+#define HAVE_OPENSSL_BN_H 1
+
 /* Define to 1 if you have the `OPENSSL_config' function. */
 #define HAVE_OPENSSL_CONFIG 1
 
 /* Define to 1 if you have the <openssl/conf.h> header file. */
 #define HAVE_OPENSSL_CONF_H 1
 
+/* Define to 1 if you have the <openssl/dh.h> header file. */
+#define HAVE_OPENSSL_DH_H 1
+
+/* Define to 1 if you have the <openssl/dsa.h> header file. */
+#define HAVE_OPENSSL_DSA_H 1
+
 /* Define to 1 if you have the <openssl/engine.h> header file. */
 #define HAVE_OPENSSL_ENGINE_H 1
 
 /* Define to 1 if you have the <openssl/err.h> header file. */
 #define HAVE_OPENSSL_ERR_H 1
 
+/* Define to 1 if you have the `OPENSSL_init_crypto' function. */
+/* #undef HAVE_OPENSSL_INIT_CRYPTO */
+
+/* Define to 1 if you have the `OPENSSL_init_ssl' function. */
+/* #undef HAVE_OPENSSL_INIT_SSL */
+
 /* Define to 1 if you have the <openssl/rand.h> header file. */
 #define HAVE_OPENSSL_RAND_H 1
 
+/* Define to 1 if you have the <openssl/rsa.h> header file. */
+#define HAVE_OPENSSL_RSA_H 1
+
 /* Define to 1 if you have the <openssl/ssl.h> header file. */
 #define HAVE_OPENSSL_SSL_H 1
 
@@ -297,15 +363,15 @@
 /* Define to 1 if you have the `random' function. */
 #define HAVE_RANDOM 1
 
+/* Define to 1 if you have the `RAND_cleanup' function. */
+#define HAVE_RAND_CLEANUP 1
+
 /* Define to 1 if you have the `reallocarray' function. */
 #define HAVE_REALLOCARRAY 1
 
 /* Define to 1 if you have the `recvmsg' function. */
 #define HAVE_RECVMSG 1
 
-/* define if you have the sbrk() call */
-#define HAVE_SBRK 1
-
 /* Define to 1 if you have the `sendmsg' function. */
 #define HAVE_SENDMSG 1
 
@@ -333,6 +399,9 @@