From b4a3ad6e2d9704399ceeb8ad60ad3c8468acbc5b Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Tue, 15 Oct 2019 17:07:05 -0600 Subject: [PATCH] fix test case for enckeys + des3 with md5 disabled --- tests/api.c | 6 +++--- tests/suites.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/api.c b/tests/api.c index 77403b0fb..529f8d416 100644 --- a/tests/api.c +++ b/tests/api.c @@ -4542,7 +4542,7 @@ static void test_wolfSSL_PKCS12(void) #if !defined(NO_FILESYSTEM) && !defined(NO_ASN) && defined(HAVE_PKCS8) && \ defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_DES3) && !defined(NO_PWDBASED) && \ - (!defined(NO_RSA) || defined(HAVE_ECC)) + (!defined(NO_RSA) || defined(HAVE_ECC)) && !defined(NO_MD5) #define TEST_PKCS8_ENC #endif @@ -19225,7 +19225,7 @@ static void test_wolfSSL_PEM_PrivateKey(void) /* key is DES encrypted */ #if !defined(NO_DES3) && defined(WOLFSSL_ENCRYPTED_KEYS) && \ - !defined(NO_RSA) && !defined(NO_FILESYSTEM) + !defined(NO_RSA) && !defined(NO_FILESYSTEM) && !defined(NO_MD5) { XFILE f; pem_password_cb* passwd_cb; @@ -27170,7 +27170,7 @@ static void test_wolfSSL_PEM_read(void) AssertIntEQ(PEM_do_header(&cipher, data, &len, NULL, (void*)"yassl123"), WOLFSSL_FAILURE); -#ifndef NO_DES3 +#if !defined(NO_DES3) && !defined(NO_MD5) AssertIntEQ(PEM_do_header(&cipher, data, &len, PasswordCallBack, (void*)"yassl123"), WOLFSSL_SUCCESS); #endif diff --git a/tests/suites.c b/tests/suites.c index 1bffb53a2..252481cc1 100644 --- a/tests/suites.c +++ b/tests/suites.c @@ -899,7 +899,7 @@ int SuiteTest(int argc, char** argv) } #endif #endif -#if defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_DES3) +#if defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_DES3) && !defined(NO_MD5) /* test encrypted keys */ strcpy(argv0[1], "tests/test-enckeys.conf"); printf("starting encrypted keys extra cipher suite tests\n");