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

Merge pull request #1075 from JacobBarthelmeh/fast-rsa

Browse Source 
add sanity check in fast-rsa and change loop behavior when generating…
This commit is contained in:
dgarske
2017-08-01 14:05:03 -07:00
committed by GitHub
parent bd20729fba c20859e67d
commit 2d94a3954a
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wolfcrypt/user-crypto/src/rsa.c
View File

@@ -2008,7 +2008,7 @@ IppStatus wolfSSL_rng(Ipp32u* pData, int nBits, void* pEbsParams)
} }
nBytes = (nBits/8) + ((nBits % 8)? 1: 0); nBytes = (nBits/8) + ((nBits % 8)? 1: 0);
if (wc_RNG_GenerateBlock(pEbsParams, (byte*)pData, nBytes) != 0) { if (wc_RNG_GenerateBlock((WC_RNG*)pEbsParams, (byte*)pData, nBytes) != 0) {
USER_DEBUG(("error in generating random wolfSSL block\n")); USER_DEBUG(("error in generating random wolfSSL block\n"));
return ippStsErr; return ippStsErr;
} }
@@ -2042,8 +2042,10 @@ int wc_MakeRsaKey(RsaKey* key, int size, long e, WC_RNG* rng)
qBitSz = (size / 2) + ((size % 2)? 1: 0); qBitSz = (size / 2) + ((size % 2)? 1: 0);
bytSz = (size / 8) + ((size % 8)? 1: 0); bytSz = (size / 8) + ((size % 8)? 1: 0);
if (key == NULL) if (key == NULL || rng == NULL) {
USER_DEBUG(("Error, NULL argument passed in\n"));
return USER_CRYPTO_ERROR; return USER_CRYPTO_ERROR;
}
if (e < 3 || (e&1) == 0) if (e < 3 || (e&1) == 0)
return USER_CRYPTO_ERROR; return USER_CRYPTO_ERROR;
@@ -2157,9 +2159,9 @@ int wc_MakeRsaKey(RsaKey* key, int size, long e, WC_RNG* rng)
goto makeKeyEnd; goto makeKeyEnd;
} }
/* call IPP to generate keys, if inseficent entropy error call again /* call IPP to generate keys, if inseficent entropy error call again */
using for loop to avoid infinte loop */ ret = ippStsInsufficientEntropy;
for (i = 0; i < 5; i++) { while (ret == ippStsInsufficientEntropy) {
ret = ippsRSA_GenerateKeys(pSrcPublicExp, key->n, key->e, ret = ippsRSA_GenerateKeys(pSrcPublicExp, key->n, key->e,
key->dipp, key->pPrv, scratchBuffer, trys, pPrime, key->dipp, key->pPrv, scratchBuffer, trys, pPrime,
wolfSSL_rng, rng); wolfSSL_rng, rng);
@@ -2175,13 +2177,6 @@ int wc_MakeRsaKey(RsaKey* key, int size, long e, WC_RNG* rng)
goto makeKeyEnd; goto makeKeyEnd;
} }
} }
/* catch if still did not generate a good key */
if (ret != ippStsNoErr) {
USER_DEBUG(("ippsRSA_GeneratKeys error of %s\n",
ippGetStatusString(ret)));
ret = USER_CRYPTO_ERROR;
goto makeKeyEnd;
}
/* get bn sizes needed for private key set up */ /* get bn sizes needed for private key set up */
ret = ippsExtGet_BN(NULL, &key->eSz, NULL, key->e); ret = ippsExtGet_BN(NULL, &key->eSz, NULL, key->e);