From: Evan Hunt <each@isc.org>
Date: Mon, 23 Mar 2015 18:34:56 +0000 (-0500)
Subject: [master] fixed build errors with libressl
X-Git-Tag: v9.11.0a1~910
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e89972afcb893a824db11086f4f00388057170cc;p=thirdparty%2Fbind9.git

[master] fixed build errors with libressl

4088.	[port]		Fixed errors when building with libressl. [RT #38899]
---

diff --git a/CHANGES b/CHANGES
index d915355e45b..0aaceb68212 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4088.	[port]		Fixed errors when building with libressl. [RT #38899]
+
 4087.	[bug]		Fix a crash due to use-after-free due to sequencing
 			of tasks actions. [RT #38495]
 
diff --git a/lib/isc/tests/hash_test.c b/lib/isc/tests/hash_test.c
index ce0bd9d31a5..15c78f85fff 100644
--- a/lib/isc/tests/hash_test.c
+++ b/lib/isc/tests/hash_test.c
@@ -40,7 +40,7 @@
 unsigned char digest[ISC_SHA512_DIGESTLENGTH];
 unsigned char buffer[1024];
 const char *s;
-char str[2 * ISC_SHA512_DIGESTLENGTH + 1];
+char str[2 * ISC_SHA512_DIGESTLENGTH + 3];
 unsigned char key[20];
 
 isc_result_t
diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index 1a33be9163b..831a6febb1e 100644
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -25,7 +25,8 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	-I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCC_INCLUDES}
+CINCLUDES =	-I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
+		@ISC_OPENSSL_INC@
 
 CDEFINES =
 CWARNINGS =