Patch for testcrypto.c

1.6.x-BZ-61636.patch (text/plain), 8.40 KB, created by Michal Karm Babacek on 2017-10-19 11:46:31 UTC

(hide)

Description: Patch for testcrypto.c

Filename:

MIME Type:

Creator: Michal Karm Babacek

Created: 2017-10-19 11:46:31 UTC

Size: 8.40 KB

patch

obsolete

>From 2f8e76bc79292118283d3baf3133a4a760d79620 Mon Sep 17 00:00:00 2001 >From: Michal Karm Babacek <karm@fedoraproject.org> >Date: Thu, 19 Oct 2017 13:38:59 +0200 >Subject: [PATCH] Added optional env properties APU_TEST_NSS=on|off, > APU_TEST_OPENSSL=on|off, APU_TEST_COMMONCRYPTO=on|off to allow for switching > off particular drivers, e.g. in a case when one builds only with OpenSSL. > >--- > test/testcrypto.c | 125 ++++++++++++++++++++++++++++++++++++++++++++---------- > 1 file changed, 102 insertions(+), 23 deletions(-) > >diff --git a/test/testcrypto.c b/test/testcrypto.c >index 865cffc6..2ca71129 100644 >--- a/test/testcrypto.c >+++ b/test/testcrypto.c >@@ -1454,77 +1454,156 @@ abts_suite *testcrypto(abts_suite *suite) > { > suite = ADD_SUITE(suite); > >+ enum { >+ NSS_DRIVER_SELECTED = 0x0001, >+ OPENSSL_DRIVER_SELECTED = 0x0002, >+ COMMONCRYPTO_DRIVER_SELECTED = 0x0004 >+ }; >+ >+ unsigned int crypto_driver_selection = (NSS_DRIVER_SELECTED | OPENSSL_DRIVER_SELECTED | COMMONCRYPTO_DRIVER_SELECTED); >+ >+ if (getenv("APU_TEST_NSS")) { >+ if (strncasecmp(getenv("APU_TEST_NSS"), "on", 2) == 0) { >+ crypto_driver_selection |= NSS_DRIVER_SELECTED; >+ } >+ else { >+ crypto_driver_selection &= (~NSS_DRIVER_SELECTED); >+ } >+ } >+ if (getenv("APU_TEST_OPENSSL")) { >+ if (strncasecmp(getenv("APU_TEST_OPENSSL"), "on", 2) == 0) { >+ crypto_driver_selection |= OPENSSL_DRIVER_SELECTED; >+ } >+ else { >+ crypto_driver_selection &= (~OPENSSL_DRIVER_SELECTED); >+ } >+ } >+ if (getenv("APU_TEST_COMMONCRYPTO")) { >+ if (strncasecmp(getenv("APU_TEST_COMMONCRYPTO"), "on", 2) == 0) { >+ crypto_driver_selection |= COMMONCRYPTO_DRIVER_SELECTED; >+ } >+ else { >+ crypto_driver_selection &= (~COMMONCRYPTO_DRIVER_SELECTED); >+ } >+ } >+ > /* test simple init and shutdown */ > abts_run_test(suite, test_crypto_init, NULL); > > /* test key parsing - openssl */ >- abts_run_test(suite, test_crypto_key_openssl, NULL); >+ if (crypto_driver_selection & OPENSSL_DRIVER_SELECTED) { >+ abts_run_test(suite, test_crypto_key_openssl, NULL); >+ } > > /* test key parsing - nss */ >- abts_run_test(suite, test_crypto_key_nss, NULL); >+ if (crypto_driver_selection & NSS_DRIVER_SELECTED) { >+ abts_run_test(suite, test_crypto_key_nss, NULL); >+ } > > /* test key parsing - commoncrypto */ >- abts_run_test(suite, test_crypto_key_commoncrypto, NULL); >+ if (crypto_driver_selection & COMMONCRYPTO_DRIVER_SELECTED) { >+ 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); >+ if (crypto_driver_selection & OPENSSL_DRIVER_SELECTED) { >+ abts_run_test(suite, test_crypto_block_openssl, NULL); >+ } > > /* test a padded encrypt / decrypt operation - openssl */ >- abts_run_test(suite, test_crypto_block_openssl_pad, NULL); >+ if (crypto_driver_selection & OPENSSL_DRIVER_SELECTED) { >+ abts_run_test(suite, test_crypto_block_openssl_pad, NULL); >+ } > > /* test a simple encrypt / decrypt operation - nss */ >- abts_run_test(suite, test_crypto_block_nss, NULL); >+ if (crypto_driver_selection & NSS_DRIVER_SELECTED) { >+ abts_run_test(suite, test_crypto_block_nss, NULL); >+ } > > /* test a padded encrypt / decrypt operation - nss */ >- abts_run_test(suite, test_crypto_block_nss_pad, NULL); >+ if (crypto_driver_selection & NSS_DRIVER_SELECTED) { >+ 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); >+ if (crypto_driver_selection & COMMONCRYPTO_DRIVER_SELECTED) { >+ abts_run_test(suite, test_crypto_block_commoncrypto, NULL); >+ } > > /* test a padded encrypt / decrypt operation - commoncrypto */ >- abts_run_test(suite, test_crypto_block_commoncrypto_pad, NULL); >+ if (crypto_driver_selection & COMMONCRYPTO_DRIVER_SELECTED) { >+ 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); >+ if ((crypto_driver_selection & NSS_DRIVER_SELECTED) && (crypto_driver_selection & OPENSSL_DRIVER_SELECTED)) { >+ 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 ((crypto_driver_selection & NSS_DRIVER_SELECTED) && (crypto_driver_selection & OPENSSL_DRIVER_SELECTED)) { >+ 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); >+ if ((crypto_driver_selection & NSS_DRIVER_SELECTED) && (crypto_driver_selection & OPENSSL_DRIVER_SELECTED)) { >+ 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); >+ if ((crypto_driver_selection & NSS_DRIVER_SELECTED) && (crypto_driver_selection & OPENSSL_DRIVER_SELECTED)) { >+ abts_run_test(suite, test_crypto_block_openssl_nss_pad, NULL); >+ } > > /* test encrypt openssl / decrypt commoncrypto */ >- abts_run_test(suite, test_crypto_block_openssl_commoncrypto, NULL); >+ if ((crypto_driver_selection & OPENSSL_DRIVER_SELECTED) && (crypto_driver_selection & COMMONCRYPTO_DRIVER_SELECTED)) { >+ 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); >+ if ((crypto_driver_selection & OPENSSL_DRIVER_SELECTED) && (crypto_driver_selection & COMMONCRYPTO_DRIVER_SELECTED)) { >+ abts_run_test(suite, test_crypto_block_openssl_commoncrypto_pad, NULL); >+ } > > /* test encrypt commoncrypto / decrypt openssl */ >- abts_run_test(suite, test_crypto_block_commoncrypto_openssl, NULL); >+ if ((crypto_driver_selection & OPENSSL_DRIVER_SELECTED) && (crypto_driver_selection & COMMONCRYPTO_DRIVER_SELECTED)) { >+ 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); >+ if ((crypto_driver_selection & OPENSSL_DRIVER_SELECTED) && (crypto_driver_selection & COMMONCRYPTO_DRIVER_SELECTED)) { >+ abts_run_test(suite, test_crypto_block_commoncrypto_openssl_pad, NULL); >+ } > > /* test block key types openssl */ >- abts_run_test(suite, test_crypto_get_block_key_types_openssl, NULL); >+ if (crypto_driver_selection & OPENSSL_DRIVER_SELECTED) { >+ 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); >+ if (crypto_driver_selection & NSS_DRIVER_SELECTED) { >+ abts_run_test(suite, test_crypto_get_block_key_types_nss, NULL); >+ } > > /* test block key types commoncrypto */ >- abts_run_test(suite, test_crypto_get_block_key_types_commoncrypto, NULL); >+ if (crypto_driver_selection & COMMONCRYPTO_DRIVER_SELECTED) { >+ 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); >+ if (crypto_driver_selection & OPENSSL_DRIVER_SELECTED) { >+ 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); >+ if (crypto_driver_selection & NSS_DRIVER_SELECTED) { >+ 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); >+ if (crypto_driver_selection & COMMONCRYPTO_DRIVER_SELECTED) { >+ abts_run_test(suite, test_crypto_get_block_key_modes_commoncrypto, NULL); >+ } > > abts_run_test(suite, test_crypto_memzero, NULL); > abts_run_test(suite, test_crypto_equals, NULL); >-- >2.11.0.windows.1 > View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]