testcrypto: Fix warnings about unused functions (depending on the libs avail).

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1896805 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 55 insertions, 11 deletions

diff --git a/test/testcrypto.c b/test/testcrypto.c
index bf44fdc8e..685a8507a 100644
--- a/test/testcrypto.c
+++ b/test/testcrypto.c
@@ -70,6 +70,7 @@ static const apr_crypto_driver_t *get_driver(abts_case *tc, apr_pool_t *pool,
 
 }
 
+#if APU_HAVE_NSS
 static const apr_crypto_driver_t *get_nss_driver(abts_case *tc,
         apr_pool_t *pool)
 {
@@ -78,7 +79,9 @@ static const apr_crypto_driver_t *get_nss_driver(abts_case *tc,
     return get_driver(tc, pool, "nss", "");
 
 }
+#endif /* APU_HAVE_NSS */
 
+#if APU_HAVE_OPENSSL
 static const apr_crypto_driver_t *get_openssl_driver(abts_case *tc,
         apr_pool_t *pool)
 {
@@ -86,7 +89,9 @@ static const apr_crypto_driver_t *get_openssl_driver(abts_case *tc,
     return get_driver(tc, pool, "openssl", NULL);
 
 }
+#endif /* APU_HAVE_OPENSSL */
 
+#if APU_HAVE_COMMONCRYPTO
 static const apr_crypto_driver_t *get_commoncrypto_driver(abts_case *tc,
         apr_pool_t *pool)
 {
@@ -94,6 +99,7 @@ static const apr_crypto_driver_t *get_commoncrypto_driver(abts_case *tc,
     return get_driver(tc, pool, "commoncrypto", NULL);
 
 }
+#endif /* APU_HAVE_COMMONCRYPTO */
 
 static apr_crypto_t *make(abts_case *tc, apr_pool_t *pool,
         const apr_crypto_driver_t *driver)
@@ -1082,6 +1088,7 @@ static void test_crypto_init(abts_case *tc, void *data)
 
 }
 
+#if APU_HAVE_OPENSSL
 /**
  * Simple test of OpenSSL key.
  */
@@ -1100,7 +1107,9 @@ static void test_crypto_key_openssl(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_OPENSSL */
 
+#if APU_HAVE_NSS
 /**
  * Simple test of NSS key.
  */
@@ -1119,7 +1128,9 @@ static void test_crypto_key_nss(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_NSS */
 
+#if APU_HAVE_COMMONCRYPTO
 /**
  * Simple test of CommonCrypto key.
  */
@@ -1138,7 +1149,9 @@ static void test_crypto_key_commoncrypto(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_COMMONCRYPTO */
 
+#if APU_HAVE_OPENSSL
 /**
  * Simple test of OpenSSL block crypt.
  */
@@ -1228,7 +1241,9 @@ static void test_crypto_digest_openssl(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_OPENSSL */
 
+#if APU_HAVE_NSS
 /**
  * Simple test of NSS block crypt.
  */
@@ -1317,7 +1332,9 @@ static void test_crypto_digest_nss(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_NSS */
 
+#if APU_HAVE_COMMONCRYPTO
 /**
  * Simple test of Common Crypto block crypt.
  */
@@ -1407,7 +1424,10 @@ static void test_crypto_digest_commoncrypto(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_COMMONCRYPTO */
 
+#if APU_HAVE_OPENSSL
+#if APU_HAVE_NSS
 /**
  * Encrypt NSS, decrypt OpenSSL.
  */
@@ -1593,7 +1613,9 @@ static void test_crypto_digest_openssl_nss(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_NSS */
 
+#if APU_HAVE_COMMONCRYPTO
 /**
  * Encrypt OpenSSL, decrypt CommonCrypto.
  */
@@ -1779,6 +1801,7 @@ static void test_crypto_digest_commoncrypto_openssl(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_COMMONCRYPTO */
 
 /**
  * Simple test of OpenSSL block crypt.
@@ -1815,7 +1838,9 @@ static void test_crypto_block_openssl_pad(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_OPENSSL */
 
+#if APU_HAVE_NSS
 /**
  * Simple test of NSS block crypt.
  */
@@ -1858,7 +1883,9 @@ static void test_crypto_block_nss_pad(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_NSS */
 
+#if APU_HAVE_COMMONCRYPTO
 /**
  * Simple test of Common Crypto block crypt.
  */
@@ -1894,7 +1921,10 @@ static void test_crypto_block_commoncrypto_pad(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_COMMONCRYPTO */
 
+#if APU_HAVE_OPENSSL
+#if APU_HAVE_NSS
 /**
  * Encrypt NSS, decrypt OpenSSL.
  */
@@ -1983,7 +2013,9 @@ static void test_crypto_block_openssl_nss_pad(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_NSS */
 
+#if APU_HAVE_COMMONCRYPTO
 /**
  * Encrypt CommonCrypto, decrypt OpenSSL.
  */
@@ -2059,6 +2091,7 @@ static void test_crypto_block_openssl_commoncrypto_pad(abts_case *tc,
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_COMMONCRYPTO */
 
 /**
  * Get Types, OpenSSL.
@@ -2102,7 +2135,9 @@ static void test_crypto_get_block_key_types_openssl(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_OPENSSL */
 
+#if APU_HAVE_NSS
 /**
  * Get Types, NSS.
  */
@@ -2145,7 +2180,9 @@ static void test_crypto_get_block_key_types_nss(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_NSS */
 
+#if APU_HAVE_COMMONCRYPTO
 /**
  * Get Types, Common Crypto.
  */
@@ -2188,7 +2225,9 @@ static void test_crypto_get_block_key_types_commoncrypto(abts_case *tc, void *da
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_COMMONCRYPTO */
 
+#if APU_HAVE_OPENSSL
 /**
  * Get Modes, OpenSSL.
  */
@@ -2221,7 +2260,9 @@ static void test_crypto_get_block_key_modes_openssl(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_OPENSSL */
 
+#if APU_HAVE_NSS
 /**
  * Get Modes, NSS.
  */
@@ -2254,7 +2295,9 @@ static void test_crypto_get_block_key_modes_nss(abts_case *tc, void *data)
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_NSS */
 
+#if APU_HAVE_COMMONCRYPTO
 /**
  * Get Modes, Common Crypto.
  */
@@ -2287,6 +2330,7 @@ static void test_crypto_get_block_key_modes_commoncrypto(abts_case *tc, void *da
     apr_pool_destroy(pool);
 
 }
+#endif /* APU_HAVE_COMMONCRYPTO */
 
 static void test_crypto_memzero(abts_case *tc, void *data)
 {
@@ -2641,7 +2685,7 @@ abts_suite *testcrypto(abts_suite *suite)
     /* test simple init and shutdown */
     abts_run_test(suite, test_crypto_init, NULL);
 
-#if APU_APU_HAVE_OPENSSL
+#if APU_HAVE_OPENSSL
     /* test key parsing - openssl */
     abts_run_test(suite, test_crypto_key_openssl, NULL);
     /* test a simple encrypt / decrypt operation - openssl */
@@ -2650,17 +2694,13 @@ abts_suite *testcrypto(abts_suite *suite)
     abts_run_test(suite, test_crypto_digest_openssl, NULL);
     /* test a padded encrypt / decrypt operation - openssl */
     abts_run_test(suite, test_crypto_block_openssl_pad, NULL);
-    /* test encrypt nss / decrypt openssl */
-    abts_run_test(suite, test_crypto_block_nss_openssl, NULL);
-    /* test padded encrypt nss / decrypt openssl */
-    abts_run_test(suite, test_crypto_block_nss_openssl_pad, NULL);
     /* test block key types openssl */
     abts_run_test(suite, test_crypto_get_block_key_types_openssl, NULL);
     /* test block key modes openssl */
     abts_run_test(suite, test_crypto_get_block_key_modes_openssl, NULL);
 
 #endif
-#if APU_APU_HAVE_NSS
+#if APU_HAVE_NSS
     /* test key parsing - nss */
     abts_run_test(suite, test_crypto_key_nss, NULL);
     /* test a simple encrypt / decrypt operation - nss */
@@ -2670,13 +2710,17 @@ abts_suite *testcrypto(abts_suite *suite)
     /* test a padded encrypt / decrypt operation - nss */
     abts_run_test(suite, test_crypto_block_nss_pad, NULL);
 
-#if APU_APU_HAVE_OPENSSL
-    /* test sign nss / verify openssl */
-    abts_run_test(suite, test_crypto_digest_nss_openssl, NULL);
+#if APU_HAVE_OPENSSL
+    /* test encrypt nss / decrypt openssl */
+    abts_run_test(suite, test_crypto_block_nss_openssl, NULL);
+    /* test padded encrypt nss / decrypt openssl */
+    abts_run_test(suite, test_crypto_block_nss_openssl_pad, NULL);
     /* test encrypt openssl / decrypt nss */
     abts_run_test(suite, test_crypto_block_openssl_nss, NULL);
     /* test padded encrypt openssl / decrypt nss */
     abts_run_test(suite, test_crypto_block_openssl_nss_pad, NULL);
+    /* test sign nss / verify openssl */
+    abts_run_test(suite, test_crypto_digest_nss_openssl, NULL);
     /* test sign openssl / verify nss */
     abts_run_test(suite, test_crypto_digest_openssl_nss, NULL);
 #endif
@@ -2687,7 +2731,7 @@ abts_suite *testcrypto(abts_suite *suite)
     abts_run_test(suite, test_crypto_get_block_key_modes_nss, NULL);
 #endif
 
-#if APU_APU_HAVE_COMMONCRYPTO
+#if APU_HAVE_COMMONCRYPTO
     /* test key parsing - commoncrypto */
     abts_run_test(suite, test_crypto_key_commoncrypto, NULL);
     /* test a simple encrypt / decrypt operation - commoncrypto */
@@ -2697,7 +2741,7 @@ abts_suite *testcrypto(abts_suite *suite)
     /* test a padded encrypt / decrypt operation - commoncrypto */
     abts_run_test(suite, test_crypto_block_commoncrypto_pad, NULL);
 
-#if APU_APU_HAVE_OPENSSL
+#if APU_HAVE_OPENSSL
     /* test encrypt openssl / decrypt commoncrypto */
     abts_run_test(suite, test_crypto_block_openssl_commoncrypto, NULL);
     /* test padded encrypt openssl / decrypt commoncrypto */