mirrors
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for build with user-crypto RSA (--enable-fast-rsa).

This commit is contained in:
David Garske 2017-02-07 11:03:17 -08:00
parent 3a1921e107
commit a2984553d7
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -853,7 +853,7 @@ static int GetInt(IppsBigNumState** mpi, const byte* input, word32* inOutIdx,
if (length > 0) { if (length > 0) {
/* remove leading zero */ /* remove leading zero */
if ( (b = input[i++]) == 0x00) if ( (b = input[idx++]) == 0x00)
length--; length--;
else else
idx--; idx--;
@ -901,11 +901,11 @@ static int GetSequence(const byte* input, word32* inOutIdx, int* len,
static int GetMyVersion(const byte* input, word32* inOutIdx, static int GetMyVersion(const byte* input, word32* inOutIdx,
int* version) int* version, word32 maxIdx)
{ {
word32 idx = *inOutIdx; word32 idx = *inOutIdx;
if ((idx + MIN_VERSION_SZ) > maxIdx) if ((idx + 3) > maxIdx)
return USER_CRYPTO_ERROR; return USER_CRYPTO_ERROR;
if (input[idx++] != 0x02) if (input[idx++] != 0x02)
@ -934,7 +934,7 @@ int wc_RsaPrivateKeyDecode(const byte* input, word32* inOutIdx, RsaKey* key,
if (GetSequence(input, inOutIdx, &length, inSz) < 0) if (GetSequence(input, inOutIdx, &length, inSz) < 0)
return USER_CRYPTO_ERROR; return USER_CRYPTO_ERROR;
if (GetMyVersion(input, inOutIdx, &version) < 0) if (GetMyVersion(input, inOutIdx, &version, inSz) < 0)
return USER_CRYPTO_ERROR; return USER_CRYPTO_ERROR;
key->type = RSA_PRIVATE; key->type = RSA_PRIVATE;
@ -1074,10 +1074,8 @@ int wc_RsaPublicKeyDecode(const byte* input, word32* inOutIdx, RsaKey* key,
key->type = RSA_PUBLIC; key->type = RSA_PUBLIC;
#if defined(OPENSSL_EXTRA) || defined(RSA_DECODE_EXTRA) #if defined(OPENSSL_EXTRA) || defined(RSA_DECODE_EXTRA)
if ((*inOutIdx + 1) > inSz) { if ((*inOutIdx + 1) > inSz)
printf("wc_RsaPublicKeyDecode error\n"); return USER_CRYPTO_ERROR;
return ASN_PARSE_E;
}
b = input[*inOutIdx]; b = input[*inOutIdx];
if (b != ASN_INTEGER) { if (b != ASN_INTEGER) {