From: Matt Caswell Date: Tue, 12 Nov 2019 15:51:00 +0000 (+0000) Subject: Fix no-cmac and no-camellia X-Git-Tag: openssl-3.0.0-alpha1~952 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=726ad13c4e720daeda5f56326aebcd27b4615d6c;p=oweals%2Fopenssl.git Fix no-cmac and no-camellia Guard two tests that depend on CMAC and Camellia so that we don't fail if those algorithms are not available. Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/10424) --- diff --git a/test/evp_kdf_test.c b/test/evp_kdf_test.c index ddf935b818..5d807cd533 100644 --- a/test/evp_kdf_test.c +++ b/test/evp_kdf_test.c @@ -297,6 +297,7 @@ static int test_kdf_x963(void) return ret; } +#if !defined(OPENSSL_NO_CMAC) && !defined(OPENSSL_NO_CAMELLIA) /* * KBKDF test vectors from RFC 6803 (Camellia Encryption for Kerberos 5) * section 10. @@ -421,6 +422,7 @@ static int test_kdf_kbkdf_6803_256(void) return ret; } +#endif /* Two test vectors from RFC 8009 (AES Encryption with HMAC-SHA2 for Kerberos * 5) appendix A. */ @@ -771,8 +773,10 @@ static int test_kdf_krb5kdf(void) int setup_tests(void) { +#if !defined(OPENSSL_NO_CMAC) && !defined(OPENSSL_NO_CAMELLIA) ADD_TEST(test_kdf_kbkdf_6803_128); ADD_TEST(test_kdf_kbkdf_6803_256); +#endif ADD_TEST(test_kdf_kbkdf_8009_prf1); ADD_TEST(test_kdf_kbkdf_8009_prf2); ADD_TEST(test_kdf_get_kdf);