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

Disable large alloc scrypt test. Fix unused ret warning in DH key gen from prev change.

Browse Source
This commit is contained in:
David Garske 2017-06-09 19:08:36 -07:00
parent a77f9fe3e6
commit 131ccf289f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/dh.c
View File

@ -701,7 +701,9 @@ static int wc_DhGenerateKeyPair_Async(DhKey* key, WC_RNG* rng,
#endif
/* otherwise use software DH */
return wc_DhGenerateKeyPair_Sync(key, rng, priv, privSz, pub, pubSz);
ret = wc_DhGenerateKeyPair_Sync(key, rng, priv, privSz, pub, pubSz);
return ret;
}
#endif /* WOLFSSL_ASYNC_CRYPT && WC_ASYNC_ENABLE_DH */

6
wolfcrypt/test/test.c
View File

@ -9174,6 +9174,7 @@ int scrypt_test(void)
0xc7, 0x27, 0xaf, 0xb9, 0x4a, 0x83, 0xee, 0x6d,
0x83, 0x60, 0xcb, 0xdf, 0xa2, 0xcc, 0x06, 0x40
};
#if !defined(BENCH_EMBEDDED) && !defined(HAVE_INTEL_QA)
const byte verify3[] = {
0x70, 0x23, 0xbd, 0xcb, 0x3a, 0xfd, 0x73, 0x48,
0x46, 0x1c, 0x06, 0xcd, 0x81, 0xfd, 0x38, 0xeb,
@ -9184,6 +9185,7 @@ int scrypt_test(void)
0xe6, 0x1e, 0x85, 0xdc, 0x0d, 0x65, 0x1e, 0x40,
0xdf, 0xcf, 0x01, 0x7b, 0x45, 0x57, 0x58, 0x87
};
#endif
#ifdef SCRYPT_TEST_ALL
/* Test case is very slow.
* Use for confirmation after code change or new platform.
@ -9214,7 +9216,7 @@ int scrypt_test(void)
return -6003;
/* Don't run these test on embedded, since they use large mallocs */
#ifndef BENCH_EMBEDDED
#if !defined(BENCH_EMBEDDED) && !defined(HAVE_INTEL_QA)
ret = wc_scrypt(derived, (byte*)"pleaseletmein", 13,
(byte*)"SodiumChloride", 14, 14, 8, 1, sizeof(verify3));
if (ret != 0)
@ -9230,7 +9232,7 @@ int scrypt_test(void)
if (XMEMCMP(derived, verify4, sizeof(verify4)) != 0)
return -6007;
#endif
#endif /* !BENCH_EMBEDDED */
#endif /* !BENCH_EMBEDDED && !HAVE_INTEL_QA */
return 0;
}