diff options
author | Pauli <pauli@openssl.org> | 2022-09-22 13:44:35 +1000 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2022-11-02 08:42:46 +1100 |
commit | 464c1011b02936850fc779739013dba52650840a (patch) | |
tree | 88b61cf3f06b4dbe8a4eb683fdc33dbd504a7aae /test/evp_libctx_test.c | |
parent | c511953a0828e126b80a9ea8cee12d001d685ba8 (diff) | |
download | openssl-464c1011b02936850fc779739013dba52650840a.zip openssl-464c1011b02936850fc779739013dba52650840a.tar.gz openssl-464c1011b02936850fc779739013dba52650840a.tar.bz2 |
Remove conditional FIPS dependence for 3DES
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/19510)
Diffstat (limited to 'test/evp_libctx_test.c')
-rw-r--r-- | test/evp_libctx_test.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/evp_libctx_test.c b/test/evp_libctx_test.c index 2448c35..bb31328 100644 --- a/test/evp_libctx_test.c +++ b/test/evp_libctx_test.c @@ -745,8 +745,14 @@ int setup_tests(void) #ifndef OPENSSL_NO_DH ADD_TEST(kem_invalid_keytype); #endif + /* + * The FIPS provider doesn't have 3DES, so we skip this test if + * FIPS is available. It's not perfect because FIPS + default might be + * loaded but it's good enough. + */ #ifndef OPENSSL_NO_DES - ADD_TEST(test_cipher_tdes_randkey); + if (!OSSL_PROVIDER_available(libctx, "fips")) + ADD_TEST(test_cipher_tdes_randkey); #endif return 1; } |