diff options
| author | Matt Caswell <matt@openssl.org> | 2019-11-12 15:51:00 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-11-14 09:44:18 +0000 |
| commit | 726ad13c4e720daeda5f56326aebcd27b4615d6c (patch) | |
| tree | 3590a0c02f31cfdea6f79566f6b95ac4ff2acc5f /test/evp_kdf_test.c | |
| parent | d7e4aecd89872112837baff6777147bb4b4d36bf (diff) | |
| download | openssl-726ad13c4e720daeda5f56326aebcd27b4615d6c.zip openssl-726ad13c4e720daeda5f56326aebcd27b4615d6c.tar.gz openssl-726ad13c4e720daeda5f56326aebcd27b4615d6c.tar.bz2 | |
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 <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10424)
Diffstat (limited to 'test/evp_kdf_test.c')
| -rw-r--r-- | test/evp_kdf_test.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/evp_kdf_test.c b/test/evp_kdf_test.c index ddf935b..5d807cd 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); |