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

Merge pull request #1054 from jrblixt/fix-RsaSetRng

Browse Source 
Fix rsa set rng
This commit is contained in:
Chris Conlon
2017-07-25 09:16:14 -06:00
committed by GitHub
parent 36c2ee92dc 6df9bc07a4
commit e9f87b9f33
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/api.c
View File

@ -7167,7 +7167,7 @@ static int test_wc_RsaPublicKeyDecode (void)
*/ */
static int test_wc_RsaPublicKeyDecodeRaw (void) static int test_wc_RsaPublicKeyDecodeRaw (void)
{ {
#if !defined(NO_RSA) && !defined(HAVE_FIPS) #if !defined(NO_RSA)
RsaKey key; RsaKey key;
int ret; int ret;
const byte n = 0x23; const byte n = 0x23;
@ -7365,7 +7365,7 @@ static int test_wc_SetKeyUsage (void)
*/ */
static int test_wc_RsaKeyToDer (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; RsaKey genKey;
WC_RNG rng; WC_RNG rng;
byte* der; byte* der;
@ -7459,7 +7459,7 @@ static int test_wc_RsaKeyToDer (void)
*/ */
static int test_wc_RsaKeyToPublicDer (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; RsaKey key;
WC_RNG rng; WC_RNG rng;
byte* der; byte* der;
@ -7547,8 +7547,7 @@ static int test_wc_RsaKeyToPublicDer (void)
*/ */
static int test_wc_RsaPublicEncryptDecrypt (void) static int test_wc_RsaPublicEncryptDecrypt (void)
{ {
#if !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN)\ #if !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN)
&& !defined(HAVE_FIPS)
RsaKey key; RsaKey key;
WC_RNG rng; WC_RNG rng;
const char* inStr = "Everyone gets Friday off."; const char* inStr = "Everyone gets Friday off.";
@ -7587,10 +7586,12 @@ static int test_wc_RsaPublicEncryptDecrypt (void)
/* Decrypt */ /* Decrypt */
printf(testingFmt, "wc_RsaPrivateDecrypt()"); printf(testingFmt, "wc_RsaPrivateDecrypt()");
/* Bind rng */ #if defined(WC_RSA_BLINDING)
if (ret == 0) { /* Bind rng */
ret = wc_RsaSetRNG(&key, &rng); if (ret == 0) {
} ret = wc_RsaSetRNG(&key, &rng);
}
#endif
if (ret == 0) { if (ret == 0) {
ret = wc_RsaPrivateDecrypt(cipher, cipherLen, plain, plainLen, &key); ret = wc_RsaPrivateDecrypt(cipher, cipherLen, plain, plainLen, &key);
} }
@ -7669,19 +7670,21 @@ static int test_wc_RsaPublicEncryptDecrypt_ex (void)
/* Decrypt */ /* Decrypt */
printf(testingFmt, "wc_RsaPrivateDecrypt_ex()"); printf(testingFmt, "wc_RsaPrivateDecrypt_ex()");
if (ret == 0) { #if defined(WC_RSA_BLINDING)
ret = wc_RsaSetRNG(&key, &rng);
if (ret == 0) { if (ret == 0) {
ret = wc_RsaPrivateDecrypt_ex(cipher, (word32)idx, ret = wc_RsaSetRNG(&key, &rng);
plain, plainSz, &key, WC_RSA_OAEP_PAD, WC_HASH_TYPE_SHA,
WC_MGF1SHA1, NULL, 0);
} }
if (ret >= 0) { #endif
if (!XMEMCMP(plain, inStr, plainSz)) { if (ret == 0) {
ret = 0; ret = wc_RsaPrivateDecrypt_ex(cipher, (word32)idx,
} else { plain, plainSz, &key, WC_RSA_OAEP_PAD, WC_HASH_TYPE_SHA,
ret = SSL_FATAL_ERROR; WC_MGF1SHA1, NULL, 0);
} }
if (ret >= 0) {
if (!XMEMCMP(plain, inStr, plainSz)) {
ret = 0;
} else {
ret = SSL_FATAL_ERROR;
} }
} }