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

Merge pull request #1976 from embhorn/test_fix

Browse Source 
Fix failing nightly tests
This commit is contained in:
David Garske
2018-12-12 12:07:01 -08:00
committed by GitHub
parent c7b0aac47a cbc8f4ce38
commit 8772b5dc51
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfcrypt/src/asn.c
View File

@@ -9056,8 +9056,9 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
if (ret >= 0) { if (ret >= 0) {
der->length = ret; der->length = ret;
if (algId == ECDSAk) if ((algId == ECDSAk) && (eccKey != NULL)) {
*eccKey = 1; *eccKey = 1;
}
ret = 0; ret = 0;
} }
#else #else

8
wolfcrypt/test/test.c
View File

@@ -19320,7 +19320,9 @@ static int pkcs7enveloped_run_vectors(byte* rsaCert, word32 rsaCertSz,
}; };
#endif #endif
#if !defined(NO_PWDBASED) #if !defined(NO_PWDBASED) && !defined(NO_AES) && \
!defined(NO_SHA) && defined(WOLFSSL_AES_128)
char password[] = "password"; char password[] = "password";
byte salt[] = { byte salt[] = {
@@ -19871,7 +19873,9 @@ static int pkcs7authenveloped_run_vectors(byte* rsaCert, word32 rsaCertSz,
}; };
#endif #endif
#if !defined(NO_PWDBASED) #if !defined(NO_PWDBASED) && !defined(NO_AES) && defined(HAVE_AESGCM) && \
!defined(NO_SHA) && defined(WOLFSSL_AES_128)
char password[] = "password"; char password[] = "password";
byte salt[] = { byte salt[] = {