wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4834 from anhu/guard_wc_PKCS7_SetPassword

Browse Source 
Fix tests to properly gate on ! NO_PWDBASED && ! NO_SHA
This commit is contained in:
David Garske
2022-02-07 15:12:22 -08:00
committed by GitHub
parent d085984103 e47dd675af
commit d0246a280d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/test/test.c
View File

@ -31419,7 +31419,7 @@ static int pkcs7enveloped_run_vectors(byte* rsaCert, word32 rsaCertSz,
} }
} else if (testVectors[i].password != NULL) { } else if (testVectors[i].password != NULL) {
#ifndef NO_PWDBASED #if !defined(NO_PWDBASED) && !defined(NO_SHA)
/* PWRI recipient type */ /* PWRI recipient type */
ret = wc_PKCS7_Init(pkcs7, pkcs7->heap, pkcs7->devId); ret = wc_PKCS7_Init(pkcs7, pkcs7->heap, pkcs7->devId);
@ -31454,7 +31454,7 @@ static int pkcs7enveloped_run_vectors(byte* rsaCert, word32 rsaCertSz,
wc_PKCS7_Free(pkcs7); wc_PKCS7_Free(pkcs7);
ERROR_OUT(-12178, out); ERROR_OUT(-12178, out);
} }
#endif /* NO_PWDBASED */ #endif /* ! NO_PWDBASED && ! NO_SHA */
} else if (testVectors[i].isOri == 1) { } else if (testVectors[i].isOri == 1) {
/* ORI recipient type */ /* ORI recipient type */
@ -32113,7 +32113,7 @@ static int pkcs7authenveloped_run_vectors(byte* rsaCert, word32 rsaCertSz,
} }
} else if (testVectors[i].password != NULL) { } else if (testVectors[i].password != NULL) {
#ifndef NO_PWDBASED #if !defined(NO_PWDBASED) && !defined(NO_SHA)
/* PWRI recipient type */ /* PWRI recipient type */
ret = wc_PKCS7_Init(pkcs7, pkcs7->heap, pkcs7->devId); ret = wc_PKCS7_Init(pkcs7, pkcs7->heap, pkcs7->devId);
@ -32153,7 +32153,7 @@ static int pkcs7authenveloped_run_vectors(byte* rsaCert, word32 rsaCertSz,
ERROR_OUT(-12219, out); ERROR_OUT(-12219, out);
} }
#endif /* NO_PWDBASED */ #endif /* ! NO_PWDBASED && ! NO_SHA */
} else if (testVectors[i].isOri == 1) { } else if (testVectors[i].isOri == 1) {
/* ORI recipient type */ /* ORI recipient type */