]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
test: fix test_evp_kdf when DES is disabled.
authorPauli <pauli@openssl.org>
Thu, 22 Apr 2021 00:05:47 +0000 (10:05 +1000)
committerTomas Mraz <tomas@openssl.org>
Fri, 23 Apr 2021 09:27:58 +0000 (11:27 +0200)
Fixes #14958

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14975)

test/evp_kdf_test.c

index 0c1de95f95b8f21b76592971742f841d658e9aea..cc172db42ead59070052d0c24b3032b45b4374c4 100644 (file)
@@ -1291,7 +1291,7 @@ static int test_kdf_get_kdf(void)
     return ok;
 }
 
-#ifndef OPENSSL_NO_CMS
+#if !defined(OPENSSL_NO_CMS) && !defined(OPENSSL_NO_DES)
 static int test_kdf_x942_asn1(void)
 {
     int ret;
@@ -1409,7 +1409,7 @@ int setup_tests(void)
     ADD_TEST(test_kdf_ss_kmac);
     ADD_TEST(test_kdf_sshkdf);
     ADD_TEST(test_kdf_x963);
-#ifndef OPENSSL_NO_CMS
+#if !defined(OPENSSL_NO_CMS) && !defined(OPENSSL_NO_DES)
     ADD_TEST(test_kdf_x942_asn1);
 #endif
     ADD_TEST(test_kdf_krb5kdf);