Added several ifdefs to avoid using disabled code.

3 files changed, 12 insertions, 1 deletions

diff --git a/src/cli-debug.c b/src/cli-debug.c
index 95c33f1603..7ad02a0585 100644
--- a/src/cli-debug.c
+++ b/src/cli-debug.c
@@ -129,9 +129,11 @@ static const TLS_TEST tls_tests[] = {
    */
   {"whether the server supports session resumption",
    test_session_resume2, "yes", "no", "dunno"},
+#ifdef ENABLE_RSA_EXPORT
   {"for export-grade ciphersuite support", test_export, "yes", "no",
    "dunno"},
   {"RSA-export ciphersuite info", test_export_info, "", "N/A", "N/A"},
+#endif
 #ifdef ENABLE_ANON
   {"for anonymous authentication support", test_anonymous, "yes", "no",
    "dunno"},
diff --git a/src/serv.c b/src/serv.c
index 295725e18e..fab13117fd 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -302,6 +302,7 @@ get_params (gnutls_session_t session, gnutls_params_type_t type,
   return 0;
 }
 
+#ifdef ENABLE_RSA_EXPORT
 static int
 generate_rsa_params (void)
 {
@@ -327,6 +328,13 @@ generate_rsa_params (void)
 
   return 0;
 }
+#else
+static int
+generate_rsa_params (void) 
+{
+  return 0;
+}
+#endif
 
 LIST_DECLARE_INIT (listener_list, listener_item, listener_free);
 
diff --git a/src/tests.c b/src/tests.c
index aad046cf8b..cbf792cc6f 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -185,6 +185,7 @@ static gnutls_datum_t exp = { NULL, 0 }, mod =
 {
 NULL, 0};
 
+#ifdef ENABLE_RSA_EXPORT
 test_code_t
 test_export (gnutls_session_t session)
 {
@@ -253,8 +254,8 @@ test_export_info (gnutls_session_t session)
     }
 
   return ret;
-
 }
+#endif
 
 static gnutls_datum_t pubkey = { NULL, 0 };
 static gnutls_ecc_curve_t curve = GNUTLS_ECC_CURVE_INVALID;