mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1911 from kaleb-himes/CRYPT_LOGIC_UPDATES-R2

Browse Source 
Fix pre-processor checks in wolfCrypt test for unique configuration
This commit is contained in:
JacobBarthelmeh 2018-11-07 10:22:03 -07:00 committed by GitHub
commit 196791390b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wolfcrypt/test/test.c
View File

@ -7013,7 +7013,7 @@ int aesgcm_test(void)
return -5709;
#endif /* HAVE_AES_DECRYPT */
#endif /* BENCH_AESGCM_LARGE */
#ifdef ENABLE_NON_12BYTE_IV_TEST
#if defined(ENABLE_NON_12BYTE_IV_TEST) && defined(WOLFSSL_AES_256)
/* Variable IV length test */
for (ivlen=0; ivlen<(int)sizeof(k1); ivlen++) {
/* AES-GCM encrypt and decrypt both use AES encrypt internally */
@ -7206,7 +7206,7 @@ int aesgcm_test(void)
#if !defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2))
/* Test encrypt with internally generated IV */
#if !(defined(WC_NO_RNG) || defined(HAVE_SELFTEST))
#if defined(WOLFSSL_AES_256) && !(defined(WC_NO_RNG) || defined(HAVE_SELFTEST))
{
WC_RNG rng;
byte randIV[12];
@ -9489,7 +9489,12 @@ static int rsa_decode_test(RsaKey* keyPub)
inOutIdx = 2;
inSz = sizeof(goodAlgId);
ret = wc_RsaPublicKeyDecode(goodAlgId, &inOutIdx, keyPub, inSz);
if (ret != ASN_PARSE_E) {
#ifndef WOLFSSL_NO_DECODE_EXTRA
if (ret != ASN_PARSE_E)
#else
if (ret != ASN_RSA_KEY_E)
#endif
{
ret = -6797;
goto done;
}