feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

fix test case for enckeys + des3 with md5 disabled

Browse Source
This commit is contained in:
Jacob Barthelmeh
2019-10-15 17:07:05 -06:00
parent acd0a55d47
commit b4a3ad6e2d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/api.c
View File

@ -4542,7 +4542,7 @@ static void test_wolfSSL_PKCS12(void)
#if !defined(NO_FILESYSTEM) && !defined(NO_ASN) && defined(HAVE_PKCS8) && \ #if !defined(NO_FILESYSTEM) && !defined(NO_ASN) && defined(HAVE_PKCS8) && \
defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_DES3) && !defined(NO_PWDBASED) && \ 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 #define TEST_PKCS8_ENC
#endif #endif
@ -19225,7 +19225,7 @@ static void test_wolfSSL_PEM_PrivateKey(void)
/* key is DES encrypted */ /* key is DES encrypted */
#if !defined(NO_DES3) && defined(WOLFSSL_ENCRYPTED_KEYS) && \ #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; XFILE f;
pem_password_cb* passwd_cb; pem_password_cb* passwd_cb;
@ -27170,7 +27170,7 @@ static void test_wolfSSL_PEM_read(void)
AssertIntEQ(PEM_do_header(&cipher, data, &len, NULL, AssertIntEQ(PEM_do_header(&cipher, data, &len, NULL,
(void*)"yassl123"), WOLFSSL_FAILURE); (void*)"yassl123"), WOLFSSL_FAILURE);
#ifndef NO_DES3 #if !defined(NO_DES3) && !defined(NO_MD5)
AssertIntEQ(PEM_do_header(&cipher, data, &len, PasswordCallBack, AssertIntEQ(PEM_do_header(&cipher, data, &len, PasswordCallBack,
(void*)"yassl123"), WOLFSSL_SUCCESS); (void*)"yassl123"), WOLFSSL_SUCCESS);
#endif #endif

2
tests/suites.c
View File

@ -899,7 +899,7 @@ int SuiteTest(int argc, char** argv)
} }
#endif #endif
#endif #endif
#if defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_DES3) #if defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_DES3) && !defined(NO_MD5)
/* test encrypted keys */ /* test encrypted keys */
strcpy(argv0[1], "tests/test-enckeys.conf"); strcpy(argv0[1], "tests/test-enckeys.conf");
printf("starting encrypted keys extra cipher suite tests\n"); printf("starting encrypted keys extra cipher suite tests\n");