[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  726ad13c4e720daeda5f56326aebcd27b4615d6c (commit)
      from  d7e4aecd89872112837baff6777147bb4b4d36bf (commit)


- Log -----------------------------------------------------------------
commit 726ad13c4e720daeda5f56326aebcd27b4615d6c
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 12 15:51:00 2019 +0000

    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 at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/10424)

-----------------------------------------------------------------------

Summary of changes:
 test/evp_kdf_test.c | 4 ++++
 1 file changed, 4 insertions(+)

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);