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

RSA Fips harness fix.

Browse Source
This commit is contained in:
jrblixt
2017-07-24 10:40:34 -06:00
parent e68ceb3d2c
commit 6df9bc07a4
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
tests/api.c
View File

@@ -7124,7 +7124,7 @@ static int test_wc_RsaPublicKeyDecode (void)
*/
static int test_wc_RsaPublicKeyDecodeRaw (void)
{
#if !defined(NO_RSA) && !defined(HAVE_FIPS)
#if !defined(NO_RSA)
RsaKey key;
int ret;
const byte n = 0x23;
@@ -7322,7 +7322,7 @@ static int test_wc_SetKeyUsage (void)
*/
static int test_wc_RsaKeyToDer (void)
{
#if !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN) && !defined(HAVE_FIPS)
#if !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN)
RsaKey genKey;
WC_RNG rng;
byte* der;
@@ -7416,7 +7416,7 @@ static int test_wc_RsaKeyToDer (void)
*/
static int test_wc_RsaKeyToPublicDer (void)
{
#if !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN) && !defined(HAVE_FIPS)
#if !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN)
RsaKey key;
WC_RNG rng;
byte* der;
@@ -7504,8 +7504,7 @@ static int test_wc_RsaKeyToPublicDer (void)
*/
static int test_wc_RsaPublicEncryptDecrypt (void)
{
#if !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN)\
&& defined(WC_RSA_BLINDING)
#if !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN)
RsaKey key;
WC_RNG rng;
const char* inStr = "Everyone gets Friday off.";
@@ -7544,10 +7543,12 @@ static int test_wc_RsaPublicEncryptDecrypt (void)
/* Decrypt */
printf(testingFmt, "wc_RsaPrivateDecrypt()");
/* Bind rng */
if (ret == 0) {
ret = wc_RsaSetRNG(&key, &rng);
}
#if defined(WC_RSA_BLINDING)
/* Bind rng */
if (ret == 0) {
ret = wc_RsaSetRNG(&key, &rng);
}
#endif
if (ret == 0) {
ret = wc_RsaPrivateDecrypt(cipher, cipherLen, plain, plainLen, &key);
}
@@ -7580,7 +7581,7 @@ static int test_wc_RsaPublicEncryptDecrypt (void)
*/
static int test_wc_RsaPublicEncryptDecrypt_ex (void)
{
#if !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN) && defined(WC_RSA_BLINDING)\
#if !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN) && !defined(HAVE_FIPS)\
&& !defined(WC_NO_RSA_OAEP) && !defined(HAVE_USER_RSA)
RsaKey key;
WC_RNG rng;
@@ -7626,19 +7627,21 @@ static int test_wc_RsaPublicEncryptDecrypt_ex (void)
/* Decrypt */
printf(testingFmt, "wc_RsaPrivateDecrypt_ex()");
if (ret == 0) {
ret = wc_RsaSetRNG(&key, &rng);
#if defined(WC_RSA_BLINDING)
if (ret == 0) {
ret = wc_RsaPrivateDecrypt_ex(cipher, (word32)idx,
plain, plainSz, &key, WC_RSA_OAEP_PAD, WC_HASH_TYPE_SHA,
WC_MGF1SHA1, NULL, 0);
ret = wc_RsaSetRNG(&key, &rng);
}
if (ret >= 0) {
if (!XMEMCMP(plain, inStr, plainSz)) {
ret = 0;
} else {
ret = SSL_FATAL_ERROR;
}
#endif
if (ret == 0) {
ret = wc_RsaPrivateDecrypt_ex(cipher, (word32)idx,
plain, plainSz, &key, WC_RSA_OAEP_PAD, WC_HASH_TYPE_SHA,
WC_MGF1SHA1, NULL, 0);
}
if (ret >= 0) {
if (!XMEMCMP(plain, inStr, plainSz)) {
ret = 0;
} else {
ret = SSL_FATAL_ERROR;
}
}