WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2276 from kaleb-himes/BOTH_FIPS_VERSION_TESTING 

Adjustment to test.c for merge of WCv4.0.1 changes
pull/2281/head
John Safranek 2019-06-11 13:21:42 -07:00 committed by GitHub
parent 24042c973a c5aa13021a
commit 01ad44feef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wolfcrypt/test/test.c
View File

@ -5457,10 +5457,17 @@ static int aes_key_size_test(void)
word32 keySize; word32 keySize;
#endif #endif
#if !defined(HAVE_FIPS) || \
defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)
/* w/ FIPS v1 (cert 2425) wc_AesInit just returns 0 always as it's not
* supported with that FIPS version */
ret = wc_AesInit(NULL, HEAP_HINT, devId); ret = wc_AesInit(NULL, HEAP_HINT, devId);
if (ret != BAD_FUNC_ARG) if (ret != BAD_FUNC_ARG)
return -4800; return -4800;
#endif
ret = wc_AesInit(&aes, HEAP_HINT, devId); ret = wc_AesInit(&aes, HEAP_HINT, devId);
/* 0 check OK for FIPSv1 */
if (ret != 0) if (ret != 0)
return -4801; return -4801;