From 1cbda52138a70acfdd83e6d0344ea5bba4e4edbb Mon Sep 17 00:00:00 2001 From: mturk Date: Fri, 3 Dec 2021 03:49:20 +0000 Subject: Fix testcrypto ensuring it runs only compiled drivers git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895522 13f79535-47bb-0310-9956-ffa450edef68 --- test/testcrypto.c | 85 ++++++++++++++++++++++--------------------------------- 1 file changed, 34 insertions(+), 51 deletions(-) diff --git a/test/testcrypto.c b/test/testcrypto.c index 09b236fc6..bf44fdc8e 100644 --- a/test/testcrypto.c +++ b/test/testcrypto.c @@ -2641,100 +2641,83 @@ abts_suite *testcrypto(abts_suite *suite) /* test simple init and shutdown */ abts_run_test(suite, test_crypto_init, NULL); +#if APU_APU_HAVE_OPENSSL /* test key parsing - openssl */ abts_run_test(suite, test_crypto_key_openssl, NULL); - - /* test key parsing - nss */ - abts_run_test(suite, test_crypto_key_nss, NULL); - - /* test key parsing - commoncrypto */ - abts_run_test(suite, test_crypto_key_commoncrypto, NULL); - /* test a simple encrypt / decrypt operation - openssl */ abts_run_test(suite, test_crypto_block_openssl, NULL); - /* test a simple sign / verify operation - openssl */ 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 + /* test key parsing - nss */ + abts_run_test(suite, test_crypto_key_nss, NULL); /* test a simple encrypt / decrypt operation - nss */ abts_run_test(suite, test_crypto_block_nss, NULL); - /* test a simple sign / verify operation - nss */ abts_run_test(suite, test_crypto_digest_nss, NULL); - /* test a padded encrypt / decrypt operation - nss */ abts_run_test(suite, test_crypto_block_nss_pad, NULL); - /* test a simple encrypt / decrypt operation - commoncrypto */ - abts_run_test(suite, test_crypto_block_commoncrypto, NULL); - - /* test a simple sign / verify operation - commoncrypto */ - abts_run_test(suite, test_crypto_digest_commoncrypto, NULL); - - /* test a padded encrypt / decrypt operation - commoncrypto */ - abts_run_test(suite, test_crypto_block_commoncrypto_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); - +#if APU_APU_HAVE_OPENSSL /* test sign nss / verify openssl */ abts_run_test(suite, test_crypto_digest_nss_openssl, 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 openssl / verify nss */ abts_run_test(suite, test_crypto_digest_openssl_nss, NULL); +#endif + + /* test block key types nss */ + abts_run_test(suite, test_crypto_get_block_key_types_nss, NULL); + /* test block key modes nss */ + abts_run_test(suite, test_crypto_get_block_key_modes_nss, NULL); +#endif +#if APU_APU_HAVE_COMMONCRYPTO + /* test key parsing - commoncrypto */ + abts_run_test(suite, test_crypto_key_commoncrypto, NULL); + /* test a simple encrypt / decrypt operation - commoncrypto */ + abts_run_test(suite, test_crypto_block_commoncrypto, NULL); + /* test a simple sign / verify operation - commoncrypto */ + abts_run_test(suite, test_crypto_digest_commoncrypto, NULL); + /* test a padded encrypt / decrypt operation - commoncrypto */ + abts_run_test(suite, test_crypto_block_commoncrypto_pad, NULL); +#if APU_APU_HAVE_OPENSSL /* test encrypt openssl / decrypt commoncrypto */ abts_run_test(suite, test_crypto_block_openssl_commoncrypto, NULL); - /* test padded encrypt openssl / decrypt commoncrypto */ abts_run_test(suite, test_crypto_block_openssl_commoncrypto_pad, NULL); - /* test sign openssl / verify commoncrypto */ abts_run_test(suite, test_crypto_digest_openssl_commoncrypto, NULL); - - /* test encrypt commoncrypto / decrypt openssl */ abts_run_test(suite, test_crypto_block_commoncrypto_openssl, NULL); - /* test padded encrypt commoncrypto / decrypt openssl */ abts_run_test(suite, test_crypto_block_commoncrypto_openssl_pad, NULL); - /* test sign commoncrypto / verify openssl */ abts_run_test(suite, test_crypto_digest_commoncrypto_openssl, NULL); - - - /* test block key types openssl */ - abts_run_test(suite, test_crypto_get_block_key_types_openssl, NULL); - - /* test block key types nss */ - abts_run_test(suite, test_crypto_get_block_key_types_nss, NULL); +#endif /* test block key types commoncrypto */ abts_run_test(suite, test_crypto_get_block_key_types_commoncrypto, NULL); - - /* test block key modes openssl */ - abts_run_test(suite, test_crypto_get_block_key_modes_openssl, NULL); - - /* test block key modes nss */ - abts_run_test(suite, test_crypto_get_block_key_modes_nss, NULL); - /* test block key modes commoncrypto */ abts_run_test(suite, test_crypto_get_block_key_modes_commoncrypto, NULL); +#endif + abts_run_test(suite, test_crypto_memzero, NULL); abts_run_test(suite, test_crypto_equals, NULL); -- cgit v1.2.1