enable compilation with several options disabled

diff --git a/lib/gnutls_auth.c b/lib/gnutls_auth.c
index 6a2e706cdfbf81f4ec51f9655b260e18b78c661f..3a8170524c79073112cc8c0e503a263aaffaaaa8 100644 (file)
--- 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 344ade4e92d2168d9dd82820a9b16a3b5fbe5d35..70897b16dc6a10ad9b05f8081dffcfa9e9643891 100644 (file)
--- 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);