From: Mark Andrews <marka@isc.org>
Date: Wed, 8 Jul 2015 01:54:25 +0000 (+1000)
Subject: allow named to build w/o openssl
X-Git-Tag: v9.11.0a1~671
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4968e1de7eb4aa3701238cfb0198e762f65523a4;p=thirdparty%2Fbind9.git

allow named to build w/o openssl
---

diff --git a/bin/named/client.c b/bin/named/client.c
index f97e590a16d..f1f85154093 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -1629,6 +1629,7 @@ compute_cookie(ns_client_t *client, isc_uint32_t when, isc_uint32_t nonce,
 	       isc_buffer_t *buf)
 {
 	switch (ns_g_server->cookiealg) {
+#if defined(HAVE_OPENSSL_AES) || defined(HAVE_OPENSSL_EVP_AES)
 	case ns_cookiealg_aes: {
 		unsigned char digest[ISC_AES_BLOCK_LENGTH];
 		unsigned char input[4 + 4 + 16];
@@ -1668,6 +1669,7 @@ compute_cookie(ns_client_t *client, isc_uint32_t when, isc_uint32_t nonce,
 		isc_buffer_putmem(buf, digest, 8);
 		break;
 	}
+#endif
 
 	case ns_cookiealg_sha1: {
 		unsigned char digest[ISC_SHA1_DIGESTLENGTH];
diff --git a/bin/named/server.c b/bin/named/server.c
index d07e9aaba8d..ee337739e0d 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -6418,7 +6418,11 @@ load_configuration(const char *filename, ns_server_t *server,
 	result = ns_config_get(maps, "cookie-algorithm", &obj);
 	INSIST(result == ISC_R_SUCCESS);
 	if (strcasecmp(cfg_obj_asstring(obj), "aes") == 0)
+#if defined(HAVE_OPENSSL_AES) || defined(HAVE_OPENSSL_EVP_AES)
 		server->cookiealg = ns_cookiealg_aes;
+#else
+		INSIST(0);
+#endif
 	else if (strcasecmp(cfg_obj_asstring(obj), "sha1") == 0)
 		server->cookiealg = ns_cookiealg_sha1;
 	else if (strcasecmp(cfg_obj_asstring(obj), "sha256") == 0)