From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 21 Mar 2015 10:13:58 +0000 (+0100)
Subject: enable compilation with several options disabled
X-Git-Tag: gnutls_3_4_0~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=356ddd824b0f95d0713daa6d12dbbcb3baf65439;p=thirdparty%2Fgnutls.git

enable compilation with several options disabled
---

diff --git a/lib/gnutls_auth.c b/lib/gnutls_auth.c
index 6a2e706cdf..3a8170524c 100644
--- a/lib/gnutls_auth.c
+++ b/lib/gnutls_auth.c
@@ -301,6 +301,7 @@ void _gnutls_free_auth_info(gnutls_session_t session)
 	switch (session->key.auth_info_type) {
 	case GNUTLS_CRD_SRP:
 		break;
+#ifdef ENABLE_ANON
 	case GNUTLS_CRD_ANON:
 		{
 			anon_auth_info_t info =
@@ -313,6 +314,7 @@ void _gnutls_free_auth_info(gnutls_session_t session)
 			_gnutls_free_dh_info(dh_info);
 		}
 		break;
+#endif
 	case GNUTLS_CRD_PSK:
 		{
 			psk_auth_info_t info =
@@ -321,8 +323,10 @@ void _gnutls_free_auth_info(gnutls_session_t session)
 			if (info == NULL)
 				break;
 
+#ifdef ENABLE_DHE
 			dh_info = &info->dh;
 			_gnutls_free_dh_info(dh_info);
+#endif
 		}
 		break;
 	case GNUTLS_CRD_CERTIFICATE:
@@ -345,7 +349,9 @@ void _gnutls_free_auth_info(gnutls_session_t session)
 			info->raw_certificate_list = NULL;
 			info->ncerts = 0;
 
+#ifdef ENABLE_DHE
 			_gnutls_free_dh_info(dh_info);
+#endif
 		}
 
 
diff --git a/lib/gnutls_ui.c b/lib/gnutls_ui.c
index 344ade4e92..70897b16dc 100644
--- a/lib/gnutls_ui.c
+++ b/lib/gnutls_ui.c
@@ -738,6 +738,7 @@ int gnutls_load_file(const char *filename, gnutls_datum_t * data)
 	return 0;
 }
 
+#ifdef ENABLE_OCSP
 /**
  * gnutls_ocsp_status_request_is_checked:
  * @session: is a gnutls session
@@ -774,6 +775,7 @@ gnutls_ocsp_status_request_is_checked(gnutls_session_t session,
 	}
 	return session->internals.ocsp_check_ok;
 }
+#endif
 
 #define DESC_SIZE 64
 
@@ -813,9 +815,11 @@ char *gnutls_session_get_desc(gnutls_session_t session)
 		curve_name =
 		    gnutls_ecc_curve_get_name(gnutls_ecc_curve_get
 					      (session));
+#if defined(ENABLE_DHE) || defined(ENABLE_ANON)
 	} else if (kx == GNUTLS_KX_ANON_DH || kx == GNUTLS_KX_DHE_PSK
 		   || kx == GNUTLS_KX_DHE_RSA || kx == GNUTLS_KX_DHE_DSS) {
 		dh_bits = gnutls_dh_get_prime_bits(session);
+#endif
 	}
 
 	kx_str = gnutls_kx_get_name(kx);