From: Wouter Wijngaards <wouter@NLnetLabs.nl>
Date: Tue, 19 Jun 2012 13:23:14 +0000 (+0000)
Subject: compile --without-ssl
X-Git-Tag: release-1.6.14rc1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd74f59958831c8cfdb2ea3ac03e62784109e5e4;p=thirdparty%2Fldns.git

compile --without-ssl
---

diff --git a/dnssec_verify.c b/dnssec_verify.c
index 68c70c5e..1d93e7ba 100644
--- a/dnssec_verify.c
+++ b/dnssec_verify.c
@@ -1576,7 +1576,6 @@ ldns_dnssec_verify_denial(ldns_rr *rr,
 	return LDNS_STATUS_OK;
 }
 
-#ifdef HAVE_SSL
 ldns_status
 ldns_dnssec_verify_denial_nsec3_match( ldns_rr *rr
 				     , ldns_rr_list *nsecs
@@ -1819,9 +1818,6 @@ ldns_dnssec_verify_denial_nsec3(ldns_rr *rr,
 	       );
 }
 
-
-#endif /* HAVE_SSL */
-
 #ifdef USE_GOST
 EVP_PKEY*
 ldns_gost2pkey_raw(unsigned char* key, size_t keylen)
diff --git a/dnssec_zone.c b/dnssec_zone.c
index 1f7274bb..213261a4 100644
--- a/dnssec_zone.c
+++ b/dnssec_zone.c
@@ -822,7 +822,6 @@ ldns_dname_compare_v(const void *a, const void *b) {
 	return ldns_dname_compare((ldns_rdf *)a, (ldns_rdf *)b);
 }
 
-#ifdef HAVE_SSL
 ldns_rbnode_t *
 ldns_dnssec_zone_find_nsec3_original(ldns_dnssec_zone *zone,
                                      ldns_rr *rr) {
@@ -912,7 +911,6 @@ ldns_dnssec_zone_add_rr(ldns_dnssec_zone *zone, ldns_rr *rr)
 
 	return result;
 }
-#endif /* HAVE_SSL */
 
 void
 ldns_dnssec_zone_names_print_fmt(FILE *out, const ldns_output_format *fmt,
diff --git a/drill/dnssec.c b/drill/dnssec.c
index b72ffb95..4ab8961f 100644
--- a/drill/dnssec.c
+++ b/drill/dnssec.c
@@ -153,6 +153,7 @@ get_dnssec_rr(ldns_pkt *p, ldns_rdf *name, ldns_rr_type t,
 ldns_status
 ldns_verify_denial(ldns_pkt *pkt, ldns_rdf *name, ldns_rr_type type, ldns_rr_list **nsec_rrs, ldns_rr_list **nsec_rr_sigs)
 {
+#ifdef HAVE_SSL
 	uint16_t nsec_i;
 
 	ldns_rr_list *nsecs;
@@ -234,6 +235,14 @@ ldns_verify_denial(ldns_pkt *pkt, ldns_rdf *name, ldns_rr_type type, ldns_rr_lis
 		ldns_rr_list_deep_free(sigs);
         }
 	return result;
+#else
+	(void)pkt;
+	(void)name;
+	(void)type;
+	(void)nsec_rrs;
+	(void)nsec_rr_sigs;
+	return LDNS_STATUS_ERR;
+#endif /* HAVE_SSL */
 }
 
 /* NSEC3 draft -07 */
diff --git a/host2str.c b/host2str.c
index 858b1c11..8cfe96bf 100644
--- a/host2str.c
+++ b/host2str.c
@@ -1661,11 +1661,10 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k)
 {
 	ldns_status status = LDNS_STATUS_OK;
 	unsigned char  *bignum;
-#ifndef S_SPLINT_S
-	uint16_t i;
-#endif
-
 #ifdef HAVE_SSL
+#  ifndef S_SPLINT_S
+	uint16_t i;
+#  endif
 	/* not used when ssl is not defined */
 	ldns_rdf *b64_bignum = NULL;