From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 24 Nov 2010 13:25:40 +0000 (+0100)
Subject: More ocsp build cleanups
X-Git-Tag: release_2_1_11~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38f8025f2d413aa68de3277156edc6b4051f3385;p=thirdparty%2Ffreeradius-server.git

More ocsp build cleanups
---

diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
index e2b7c484b25..067388af595 100644
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
@@ -356,10 +356,11 @@ ocsp_end:
 	BIO_free_all(cbio);
 	OCSP_BASICRESP_free(bresp);
 
-	if(ocsp_ok)
+	if (ocsp_ok) {
 		DEBUG2("[ocsp] --> Certificate is valid!");
-	else
+	} else {
 		DEBUG2("[ocsp] --> Certificate has been expired/revoked!");
+	}
 
 	return ocsp_ok;
 }
@@ -1041,8 +1042,10 @@ static int eaptls_detach(void *arg)
 	if (inst->ctx) SSL_CTX_free(inst->ctx);
 	inst->ctx = NULL;
 
+#ifdef HAVE_OPENSSL_OCSP_H
 	if (inst->store) X509_STORE_free(inst->store);
 	inst->store = NULL;
+#endif
 
 	free(inst);
 
@@ -1284,7 +1287,9 @@ static int eaptls_initiate(void *type_arg, EAP_HANDLER *handler)
 	 */
 	SSL_set_ex_data(ssn->ssl, 0, (void *)handler);
 	SSL_set_ex_data(ssn->ssl, 1, (void *)inst->conf);
+#ifdef HAVE_OPENSSL_OCSP_H
 	SSL_set_ex_data(ssn->ssl, 2, (void *)inst->store);
+#endif
 
 	ssn->length_flag = inst->conf->include_length;
 
diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h
index 49c8bc72ba7..6be8542140b 100644
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h
@@ -85,7 +85,9 @@ typedef struct eap_tls_conf {
 typedef struct _eap_tls_t {
 	EAP_TLS_CONF 	*conf;
 	SSL_CTX		*ctx;
+#ifdef HAVE_OPENSSL_OCSP_H
 	X509_STORE	*store; /* OCSP Revocation Store */
+#endif
 } eap_tls_t;