You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2022/01/07 13:56:36 UTC
svn commit: r1896805 - /apr/apr/trunk/test/testcrypto.c
Author: ylavic
Date: Fri Jan 7 13:56:36 2022
New Revision: 1896805
URL: http://svn.apache.org/viewvc?rev=1896805&view=rev
Log:
testcrypto: Fix warnings about unused functions (depending on the libs avail).
Modified:
apr/apr/trunk/test/testcrypto.c
Modified: apr/apr/trunk/test/testcrypto.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testcrypto.c?rev=1896805&r1=1896804&r2=1896805&view=diff
==============================================================================
--- apr/apr/trunk/test/testcrypto.c (original)
+++ apr/apr/trunk/test/testcrypto.c Fri Jan 7 13:56:36 2022
@@ -70,6 +70,7 @@ static const apr_crypto_driver_t *get_dr
}
+#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_ns
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_op
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_co
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 *
}
+#if APU_HAVE_OPENSSL
/**
* Simple test of OpenSSL key.
*/
@@ -1100,7 +1107,9 @@ static void test_crypto_key_openssl(abts
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_cas
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
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(a
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_
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_commoncry
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_n
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_commoncry
apr_pool_destroy(pool);
}
+#endif /* APU_HAVE_COMMONCRYPTO */
/**
* Simple test of OpenSSL block crypt.
@@ -1815,7 +1838,9 @@ static void test_crypto_block_openssl_pa
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(ab
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_commoncryp
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_ns
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_co
apr_pool_destroy(pool);
}
+#endif /* APU_HAVE_COMMONCRYPTO */
/**
* Get Types, OpenSSL.
@@ -2102,7 +2135,9 @@ static void test_crypto_get_block_key_ty
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_ty
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_ty
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_mo
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_mo
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_mo
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 */