From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 24 Dec 2014 22:16:17 +0000 (+0200)
Subject: tools: use OCSP functions only when OCSP is enabled
X-Git-Tag: gnutls_3_4_0~433
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6ae4c71b84f53304d11f3acd9664ba4eedf4e37;p=thirdparty%2Fgnutls.git

tools: use OCSP functions only when OCSP is enabled
---

diff --git a/src/cli-debug.c b/src/cli-debug.c
index fa0c087c5e..b188201ece 100644
--- a/src/cli-debug.c
+++ b/src/cli-debug.c
@@ -169,8 +169,10 @@ static const TLS_TEST tls_tests[] = {
 #endif
 	{"for max record size (RFC6066) support", test_max_record_size, "yes",
 	 "no", "dunno"},
+#ifdef ENABLE_OCSP
 	{"for OCSP status response (RFC6066) support", test_ocsp_status, "yes",
 	 "no", "dunno"},
+#endif
 	{"for OpenPGP authentication (RFC6091) support", test_openpgp1,
 	 "yes", "no", "dunno"},
 	{NULL, NULL, NULL, NULL, NULL}
diff --git a/src/common.c b/src/common.c
index eaff478cdf..ae46468c2f 100644
--- a/src/common.c
+++ b/src/common.c
@@ -562,9 +562,11 @@ int print_info(gnutls_session_t session, int verbose, int print_cert)
 		printf(" safe renegotiation,");
 	if (gnutls_session_etm_status(session)!=0)
 		printf(" EtM,");
+#ifdef ENABLE_OCSP
 	if (gnutls_ocsp_status_request_is_checked(session, GNUTLS_OCSP_SR_IS_AVAIL)!=0) {
 		printf(" OCSP status request%s,", gnutls_ocsp_status_request_is_checked(session,0)!=0?"":"[ignored]");
 	}
+#endif
 	printf("\n");
 
 #ifdef ENABLE_DTLS_SRTP
diff --git a/src/tests.c b/src/tests.c
index 5b570f7b55..2e59066bd0 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -246,6 +246,7 @@ test_code_t test_safe_renegotiation(gnutls_session_t session)
 	return ret;
 }
 
+#ifdef ENABLE_OCSP
 test_code_t test_ocsp_status(gnutls_session_t session)
 {
 	int ret;
@@ -325,6 +326,7 @@ test_code_t test_ext_master_secret(gnutls_session_t session)
 
 	return TEST_FAILED;
 }
+#endif
 
 test_code_t test_safe_renegotiation_scsv(gnutls_session_t session)
 {