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

Merge pull request #5310 from SparkiDev/memusage_fix_1

Browse Source 
TLS memusage: reduce usage
This commit is contained in:
David Garske
2022-07-01 09:13:05 -07:00
committed by GitHub
parent b9a8f18a97 7d58dc5678
commit 0459e83a59
5 changed files with 208 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

247
src/internal.c
View File

@ -24230,6 +24230,66 @@ exit_dpk:
} }
#endif /* WOLFSSL_TLS13 */ #endif /* WOLFSSL_TLS13 */
#ifndef WOLFSSL_NO_TLS12
#if (!defined(NO_WOLFSSL_CLIENT) && (!defined(NO_DH) || defined(HAVE_ECC) || \
defined(HAVE_CURVE25519) || defined(HAVE_CURVE448))) || \
(!defined(NO_WOLFSSL_SERVER) && (defined(HAVE_ECC) || \
((defined(HAVE_CURVE25519) || defined(HAVE_CURVE448)) && \
(defined(HAVE_ED25519) || defined(HAVE_ED448) || !defined(NO_RSA)))) || \
(!defined(NO_DH) && (!defined(NO_RSA) || defined(HAVE_ANON))))
static int HashSkeData(WOLFSSL* ssl, enum wc_HashType hashType,
const byte* data, int sz, byte sigAlgo)
{
int ret = 0;
int digest_sz = wc_HashGetDigestSize(hashType);
if (digest_sz <= 0) {
ret = BUFFER_ERROR;
}
if (ret == 0) {
/* buffer for signature */
ssl->buffers.sig.buffer = (byte*)XMALLOC(SEED_LEN + sz, ssl->heap,
DYNAMIC_TYPE_SIGNATURE);
if (ssl->buffers.sig.buffer == NULL) {
ret = MEMORY_E;
}
}
if (ret == 0) {
ssl->buffers.sig.length = SEED_LEN + sz;
/* build message to hash */
XMEMCPY(ssl->buffers.sig.buffer, ssl->arrays->clientRandom, RAN_LEN);
XMEMCPY(&ssl->buffers.sig.buffer[RAN_LEN], ssl->arrays->serverRandom,
RAN_LEN);
/* message */
XMEMCPY(&ssl->buffers.sig.buffer[RAN_LEN * 2], data, sz);
}
if (ret == 0 && sigAlgo != ed25519_sa_algo && sigAlgo != ed448_sa_algo) {
ssl->buffers.digest.length = (unsigned int)digest_sz;
/* buffer for hash */
ssl->buffers.digest.buffer = (byte*)XMALLOC(ssl->buffers.digest.length,
ssl->heap, DYNAMIC_TYPE_DIGEST);
if (ssl->buffers.digest.buffer == NULL) {
ret = MEMORY_E;
}
}
if (ret == 0 && sigAlgo != ed25519_sa_algo && sigAlgo != ed448_sa_algo) {
/* Perform hash. Only wc_Hash supports MD5_SHA1. */
ret = wc_Hash(hashType, ssl->buffers.sig.buffer,
ssl->buffers.sig.length,
ssl->buffers.digest.buffer,
ssl->buffers.digest.length);
XFREE(ssl->buffers.sig.buffer, ssl->heap, DYNAMIC_TYPE_SIGNATURE);
ssl->buffers.sig.buffer = NULL;
}
return ret;
}
#endif
#endif /* !WOLFSSL_NO_TLS12 */
/* client only parts */ /* client only parts */
#ifndef NO_WOLFSSL_CLIENT #ifndef NO_WOLFSSL_CLIENT
@ -26138,45 +26198,10 @@ static int DoServerKeyExchange(WOLFSSL* ssl, const byte* input,
ERROR_OUT(BUFFER_ERROR, exit_dske); ERROR_OUT(BUFFER_ERROR, exit_dske);
} }
/* buffer for signature */ ret = HashSkeData(ssl, hashType, input + args->begin,
ssl->buffers.sig.buffer = (byte*)XMALLOC(SEED_LEN + verifySz, verifySz, args->sigAlgo);
ssl->heap, DYNAMIC_TYPE_SIGNATURE); if (ret != 0) {
if (ssl->buffers.sig.buffer == NULL) { goto exit_dske;
ERROR_OUT(MEMORY_E, exit_dske);
}
ssl->buffers.sig.length = SEED_LEN + verifySz;
/* build message to hash */
XMEMCPY(ssl->buffers.sig.buffer,
ssl->arrays->clientRandom, RAN_LEN);
XMEMCPY(&ssl->buffers.sig.buffer[RAN_LEN],
ssl->arrays->serverRandom, RAN_LEN);
XMEMCPY(&ssl->buffers.sig.buffer[RAN_LEN * 2],
input + args->begin, verifySz); /* message */
if (args->sigAlgo != ed25519_sa_algo) {
int digest_sz = wc_HashGetDigestSize(hashType);
if (digest_sz <= 0) {
ERROR_OUT(BUFFER_ERROR, exit_dske);
}
ssl->buffers.digest.length = (unsigned int)digest_sz;
/* buffer for hash */
ssl->buffers.digest.buffer = (byte*)XMALLOC(
ssl->buffers.digest.length, ssl->heap,
DYNAMIC_TYPE_DIGEST);
if (ssl->buffers.digest.buffer == NULL) {
ERROR_OUT(MEMORY_E, exit_dske);
}
/* Perform hash */
ret = wc_Hash(hashType, ssl->buffers.sig.buffer,
ssl->buffers.sig.length,
ssl->buffers.digest.buffer,
ssl->buffers.digest.length);
if (ret != 0) {
goto exit_dske;
}
} }
switch (args->sigAlgo) switch (args->sigAlgo)
@ -28831,10 +28856,6 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
typedef struct SskeArgs { typedef struct SskeArgs {
byte* output; /* not allocated */ byte* output; /* not allocated */
#if defined(HAVE_ECC) || defined(HAVE_ED25519) || defined(HAVE_ED448) || \
!defined(NO_RSA)
byte* sigDataBuf;
#endif
#if defined(HAVE_ECC) || defined(HAVE_CURVE25519) || defined(HAVE_CURVE448) #if defined(HAVE_ECC) || defined(HAVE_CURVE25519) || defined(HAVE_CURVE448)
byte* exportBuf; byte* exportBuf;
#endif #endif
@ -28869,13 +28890,6 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
args->exportBuf = NULL; args->exportBuf = NULL;
} }
#endif #endif
#if defined(HAVE_ECC) || defined(HAVE_ED25519) || defined(HAVE_ED448) || \
(!defined(NO_DH) && !defined(NO_RSA))
if (args->sigDataBuf) {
XFREE(args->sigDataBuf, ssl->heap, DYNAMIC_TYPE_SIGNATURE);
args->sigDataBuf = NULL;
}
#endif
#ifndef NO_RSA #ifndef NO_RSA
if (args->verifySig) { if (args->verifySig) {
XFREE(args->verifySig, ssl->heap, DYNAMIC_TYPE_SIGNATURE); XFREE(args->verifySig, ssl->heap, DYNAMIC_TYPE_SIGNATURE);
@ -29736,42 +29750,11 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
} }
#endif #endif
/* Assemble buffer to hash for signature */ ret = HashSkeData(ssl, hashType,
args->sigDataSz = RAN_LEN + RAN_LEN + preSigSz; args->output + preSigIdx, preSigSz,
args->sigDataBuf = (byte*)XMALLOC(args->sigDataSz, ssl->suites->sigAlgo);
ssl->heap, DYNAMIC_TYPE_SIGNATURE); if (ret != 0) {
if (args->sigDataBuf == NULL) { goto exit_sske;
ERROR_OUT(MEMORY_E, exit_sske);
}
XMEMCPY(args->sigDataBuf, ssl->arrays->clientRandom,
RAN_LEN);
XMEMCPY(args->sigDataBuf+RAN_LEN,
ssl->arrays->serverRandom, RAN_LEN);
XMEMCPY(args->sigDataBuf+RAN_LEN+RAN_LEN,
args->output + preSigIdx, preSigSz);
if (ssl->suites->sigAlgo != ed25519_sa_algo &&
ssl->suites->sigAlgo != ed448_sa_algo) {
ssl->buffers.sig.length =
wc_HashGetDigestSize(hashType);
if ((int)ssl->buffers.sig.length < 0) {
ERROR_OUT(HASH_TYPE_E, exit_sske);
}
ssl->buffers.sig.buffer = (byte*)XMALLOC(
ssl->buffers.sig.length,
ssl->heap, DYNAMIC_TYPE_SIGNATURE);
if (ssl->buffers.sig.buffer == NULL) {
ERROR_OUT(MEMORY_E, exit_sske);
}
/* Perform hash */
ret = wc_Hash(hashType, args->sigDataBuf,
args->sigDataSz,
ssl->buffers.sig.buffer,
ssl->buffers.sig.length);
if (ret != 0) {
goto exit_sske;
}
} }
args->sigSz = args->tmpSigSz; args->sigSz = args->tmpSigSz;
@ -29786,21 +29769,21 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
if (IsAtLeastTLSv1_2(ssl)) { if (IsAtLeastTLSv1_2(ssl)) {
byte* encodedSig = (byte*)XMALLOC( byte* encodedSig = (byte*)XMALLOC(
MAX_ENCODED_SIG_SZ, ssl->heap, MAX_ENCODED_SIG_SZ, ssl->heap,
DYNAMIC_TYPE_SIGNATURE); DYNAMIC_TYPE_DIGEST);
if (encodedSig == NULL) { if (encodedSig == NULL) {
ERROR_OUT(MEMORY_E, exit_sske); ERROR_OUT(MEMORY_E, exit_sske);
} }
ssl->buffers.sig.length = ssl->buffers.digest.length =
wc_EncodeSignature(encodedSig, wc_EncodeSignature(encodedSig,
ssl->buffers.sig.buffer, ssl->buffers.digest.buffer,
ssl->buffers.sig.length, ssl->buffers.digest.length,
TypeHash(ssl->suites->hashAlgo)); TypeHash(ssl->suites->hashAlgo));
/* Replace sig buffer with new one */ /* Replace sig buffer with new one */
XFREE(ssl->buffers.sig.buffer, ssl->heap, XFREE(ssl->buffers.digest.buffer, ssl->heap,
DYNAMIC_TYPE_SIGNATURE); DYNAMIC_TYPE_DIGEST);
ssl->buffers.sig.buffer = encodedSig; ssl->buffers.digest.buffer = encodedSig;
} }
/* write sig size here */ /* write sig size here */
@ -29985,39 +29968,11 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
c16toa((word16)args->tmpSigSz, args->output + args->idx); c16toa((word16)args->tmpSigSz, args->output + args->idx);
args->idx += LENGTH_SZ; args->idx += LENGTH_SZ;
/* Assemble buffer to hash for signature */ ret = HashSkeData(ssl, hashType,
args->sigDataSz = RAN_LEN + RAN_LEN + preSigSz; args->output + preSigIdx, preSigSz,
args->sigDataBuf = (byte*)XMALLOC(args->sigDataSz, ssl->suites->sigAlgo);
ssl->heap, DYNAMIC_TYPE_SIGNATURE); if (ret != 0) {
if (args->sigDataBuf == NULL) { goto exit_sske;
ERROR_OUT(MEMORY_E, exit_sske);
}
XMEMCPY(args->sigDataBuf, ssl->arrays->clientRandom,
RAN_LEN);
XMEMCPY(args->sigDataBuf+RAN_LEN,
ssl->arrays->serverRandom, RAN_LEN);
XMEMCPY(args->sigDataBuf+RAN_LEN+RAN_LEN,
args->output + preSigIdx, preSigSz);
if (ssl->suites->sigAlgo != ed25519_sa_algo &&
ssl->suites->sigAlgo != ed448_sa_algo) {
ssl->buffers.sig.length =
wc_HashGetDigestSize(hashType);
ssl->buffers.sig.buffer = (byte*)XMALLOC(
ssl->buffers.sig.length, ssl->heap,
DYNAMIC_TYPE_SIGNATURE);
if (ssl->buffers.sig.buffer == NULL) {
ERROR_OUT(MEMORY_E, exit_sske);
}
/* Perform hash */
ret = wc_Hash(hashType, args->sigDataBuf,
args->sigDataSz,
ssl->buffers.sig.buffer,
ssl->buffers.sig.length);
if (ret != 0) {
goto exit_sske;
}
} }
args->sigSz = args->tmpSigSz; args->sigSz = args->tmpSigSz;
@ -30032,21 +29987,21 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
if (IsAtLeastTLSv1_2(ssl)) { if (IsAtLeastTLSv1_2(ssl)) {
byte* encodedSig = (byte*)XMALLOC( byte* encodedSig = (byte*)XMALLOC(
MAX_ENCODED_SIG_SZ, ssl->heap, MAX_ENCODED_SIG_SZ, ssl->heap,
DYNAMIC_TYPE_SIGNATURE); DYNAMIC_TYPE_DIGEST);
if (encodedSig == NULL) { if (encodedSig == NULL) {
ERROR_OUT(MEMORY_E, exit_sske); ERROR_OUT(MEMORY_E, exit_sske);
} }
ssl->buffers.sig.length = ssl->buffers.digest.length =
wc_EncodeSignature(encodedSig, wc_EncodeSignature(encodedSig,
ssl->buffers.sig.buffer, ssl->buffers.digest.buffer,
ssl->buffers.sig.length, ssl->buffers.digest.length,
TypeHash(ssl->suites->hashAlgo)); TypeHash(ssl->suites->hashAlgo));
/* Replace sig buffer with new one */ /* Replace sig buffer with new one */
XFREE(ssl->buffers.sig.buffer, ssl->heap, XFREE(ssl->buffers.digest.buffer, ssl->heap,
DYNAMIC_TYPE_SIGNATURE); DYNAMIC_TYPE_DIGEST);
ssl->buffers.sig.buffer = encodedSig; ssl->buffers.digest.buffer = encodedSig;
} }
break; break;
} }
@ -30110,8 +30065,8 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
RsaKey* key = (RsaKey*)ssl->hsKey; RsaKey* key = (RsaKey*)ssl->hsKey;
ret = RsaSign(ssl, ret = RsaSign(ssl,
ssl->buffers.sig.buffer, ssl->buffers.digest.buffer,
ssl->buffers.sig.length, ssl->buffers.digest.length,
args->output + args->idx, args->output + args->idx,
&args->sigSz, &args->sigSz,
ssl->suites->sigAlgo, ssl->suites->hashAlgo, ssl->suites->sigAlgo, ssl->suites->hashAlgo,
@ -30127,8 +30082,8 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
ecc_key* key = (ecc_key*)ssl->hsKey; ecc_key* key = (ecc_key*)ssl->hsKey;
ret = EccSign(ssl, ret = EccSign(ssl,
ssl->buffers.sig.buffer, ssl->buffers.digest.buffer,
ssl->buffers.sig.length, ssl->buffers.digest.length,
args->output + LENGTH_SZ + args->idx, args->output + LENGTH_SZ + args->idx,
&args->sigSz, &args->sigSz,
key, key,
@ -30147,7 +30102,8 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
ed25519_key* key = (ed25519_key*)ssl->hsKey; ed25519_key* key = (ed25519_key*)ssl->hsKey;
ret = Ed25519Sign(ssl, ret = Ed25519Sign(ssl,
args->sigDataBuf, args->sigDataSz, ssl->buffers.sig.buffer,
ssl->buffers.sig.length,
args->output + LENGTH_SZ + args->idx, args->output + LENGTH_SZ + args->idx,
&args->sigSz, &args->sigSz,
key, key,
@ -30166,7 +30122,8 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
ed448_key* key = (ed448_key*)ssl->hsKey; ed448_key* key = (ed448_key*)ssl->hsKey;
ret = Ed448Sign(ssl, ret = Ed448Sign(ssl,
args->sigDataBuf, args->sigDataSz, ssl->buffers.sig.buffer,
ssl->buffers.sig.length,
args->output + LENGTH_SZ + args->idx, args->output + LENGTH_SZ + args->idx,
&args->sigSz, &args->sigSz,
key, key,
@ -30204,8 +30161,8 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
} }
ret = RsaSign(ssl, ret = RsaSign(ssl,
ssl->buffers.sig.buffer, ssl->buffers.digest.buffer,
ssl->buffers.sig.length, ssl->buffers.digest.length,
args->output + args->idx, args->output + args->idx,
&args->sigSz, &args->sigSz,
ssl->suites->sigAlgo, ssl->suites->hashAlgo, ssl->suites->sigAlgo, ssl->suites->hashAlgo,
@ -30293,8 +30250,8 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
/* check for signature faults */ /* check for signature faults */
ret = VerifyRsaSign(ssl, ret = VerifyRsaSign(ssl,
args->verifySig, args->sigSz, args->verifySig, args->sigSz,
ssl->buffers.sig.buffer, ssl->buffers.digest.buffer,
ssl->buffers.sig.length, ssl->buffers.digest.length,
ssl->suites->sigAlgo, ssl->suites->hashAlgo, ssl->suites->sigAlgo, ssl->suites->hashAlgo,
key, ssl->buffers.key key, ssl->buffers.key
); );
@ -30358,8 +30315,8 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
/* check for signature faults */ /* check for signature faults */
ret = VerifyRsaSign(ssl, ret = VerifyRsaSign(ssl,
args->verifySig, args->sigSz, args->verifySig, args->sigSz,
ssl->buffers.sig.buffer, ssl->buffers.digest.buffer,
ssl->buffers.sig.length, ssl->buffers.digest.length,
ssl->suites->sigAlgo, ssl->suites->hashAlgo, ssl->suites->sigAlgo, ssl->suites->hashAlgo,
key, ssl->buffers.key key, ssl->buffers.key
); );

4
wolfcrypt/src/asn.c
View File

@ -13910,8 +13910,8 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
sigCtx->key.rsa = (RsaKey*)XMALLOC(sizeof(RsaKey), sigCtx->key.rsa = (RsaKey*)XMALLOC(sizeof(RsaKey),
sigCtx->heap, DYNAMIC_TYPE_RSA); sigCtx->heap, DYNAMIC_TYPE_RSA);
sigCtx->sigCpy = (byte*)XMALLOC(MAX_ENCODED_SIG_SZ, sigCtx->sigCpy = (byte*)XMALLOC(sigSz, sigCtx->heap,
sigCtx->heap, DYNAMIC_TYPE_SIGNATURE); DYNAMIC_TYPE_SIGNATURE);
if (sigCtx->key.rsa == NULL || sigCtx->sigCpy == NULL) { if (sigCtx->key.rsa == NULL || sigCtx->sigCpy == NULL) {
ERROR_OUT(MEMORY_E, exit_cs); ERROR_OUT(MEMORY_E, exit_cs);
} }

4
wolfcrypt/src/rsa.c
View File

@ -921,17 +921,21 @@ static int RsaMGF1(enum wc_HashType hType, byte* seed, word32 seedSz,
#ifdef WOLFSSL_SMALL_STACK_CACHE #ifdef WOLFSSL_SMALL_STACK_CACHE
hash = (wc_HashAlg*)XMALLOC(sizeof(*hash), heap, DYNAMIC_TYPE_DIGEST); hash = (wc_HashAlg*)XMALLOC(sizeof(*hash), heap, DYNAMIC_TYPE_DIGEST);
if (hash == NULL) { if (hash == NULL) {
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
if (tmpF) { if (tmpF) {
XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER); XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER);
} }
#endif
return MEMORY_E; return MEMORY_E;
} }
ret = wc_HashInit_ex(hash, hType, heap, INVALID_DEVID); ret = wc_HashInit_ex(hash, hType, heap, INVALID_DEVID);
if (ret != 0) { if (ret != 0) {
XFREE(hash, heap, DYNAMIC_TYPE_DIGEST); XFREE(hash, heap, DYNAMIC_TYPE_DIGEST);
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
if (tmpF) { if (tmpF) {
XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER); XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER);
} }
#endif
return ret; return ret;
} }
#endif #endif

98
wolfcrypt/src/sp_int.c
View File

@ -7094,20 +7094,49 @@ int sp_div(sp_int* a, sp_int* d, sp_int* r, sp_int* rem)
} }
if (!done) { if (!done) {
#if (defined(WOLFSSL_SMALL_STACK) || defined(SP_ALLOC)) && \
!defined(WOLFSSL_SP_NO_MALLOC)
int cnt = 4;
if ((rem != NULL) && (rem != d)) {
cnt--;
}
if ((r != NULL) && (r != d)) {
cnt--;
}
/* Macro always has code associated with it and checks err first. */ /* Macro always has code associated with it and checks err first. */
ALLOC_SP_INT_ARRAY(td, a->used + 1, cnt, err, NULL);
#else
ALLOC_SP_INT_ARRAY(td, a->used + 1, 4, err, NULL); ALLOC_SP_INT_ARRAY(td, a->used + 1, 4, err, NULL);
#endif
} }
if ((!done) && (err == MP_OKAY)) { if ((!done) && (err == MP_OKAY)) {
sa = td[0]; sd = td[0];
sd = td[1]; trial = td[1];
tr = td[2]; i = 2;
trial = td[3]; #if (defined(WOLFSSL_SMALL_STACK) || defined(SP_ALLOC)) && \
!defined(WOLFSSL_SP_NO_MALLOC)
sa = ((rem != NULL) && (rem != d)) ? rem : td[i++];
tr = ((r != NULL) && (r != d)) ? r : td[i];
#else
sa = td[2];
tr = td[3];
#endif
sp_init_size(sa, a->used + 1);
sp_init_size(sd, d->used + 1); sp_init_size(sd, d->used + 1);
sp_init_size(tr, a->used - d->used + 2);
sp_init_size(trial, a->used + 1); sp_init_size(trial, a->used + 1);
#if (defined(WOLFSSL_SMALL_STACK) || defined(SP_ALLOC)) && \
!defined(WOLFSSL_SP_NO_MALLOC)
if ((rem == NULL) || (rem == d)) {
sp_init_size(sa, a->used + 1);
}
if ((r == NULL) || (r == d)) {
sp_init_size(tr, a->used - d->used + 2);
}
#else
sp_init_size(sa, a->used + 1);
sp_init_size(tr, a->used - d->used + 2);
#endif
s = sp_count_bits(d); s = sp_count_bits(d);
s = SP_WORD_SIZE - (s & SP_WORD_MASK); s = SP_WORD_SIZE - (s & SP_WORD_MASK);
@ -10360,7 +10389,6 @@ int sp_mul(sp_int* a, sp_int* b, sp_int* r)
int sp_mulmod(sp_int* a, sp_int* b, sp_int* m, sp_int* r) int sp_mulmod(sp_int* a, sp_int* b, sp_int* m, sp_int* r)
{ {
int err = MP_OKAY; int err = MP_OKAY;
DECL_SP_INT(t, ((a == NULL) || (b == NULL)) ? 1 : a->used + b->used);
if ((a == NULL) || (b == NULL) || (m == NULL) || (r == NULL)) { if ((a == NULL) || (b == NULL) || (m == NULL) || (r == NULL)) {
err = MP_VAL; err = MP_VAL;
@ -10369,18 +10397,29 @@ int sp_mulmod(sp_int* a, sp_int* b, sp_int* m, sp_int* r)
err = MP_VAL; err = MP_VAL;
} }
ALLOC_SP_INT(t, a->used + b->used, err, NULL); if ((r == m) || (r->size < a->used + b->used)) {
if (err == MP_OKAY) { DECL_SP_INT(t, ((a == NULL) || (b == NULL)) ? 1 : a->used + b->used);
err = sp_init_size(t, a->used + b->used); ALLOC_SP_INT(t, a->used + b->used, err, NULL);
} if (err == MP_OKAY) {
if (err == MP_OKAY) { err = sp_init_size(t, a->used + b->used);
err = sp_mul(a, b, t); }
} if (err == MP_OKAY) {
if (err == MP_OKAY) { err = sp_mul(a, b, t);
err = sp_mod(t, m, r); }
} if (err == MP_OKAY) {
err = sp_mod(t, m, r);
}
FREE_SP_INT(t, NULL); FREE_SP_INT(t, NULL);
}
else {
if (err == MP_OKAY) {
err = sp_mul(a, b, r);
}
if (err == MP_OKAY) {
err = sp_mod(r, m, r);
}
}
return err; return err;
} }
#endif #endif
@ -16056,20 +16095,22 @@ int sp_prime_is_prime_ex(sp_int* a, int t, int* result, WC_RNG* rng)
if ((err == MP_OKAY) && (!haveRes)) { if ((err == MP_OKAY) && (!haveRes)) {
int bits = sp_count_bits(a); int bits = sp_count_bits(a);
word32 baseSz = (bits + 7) / 8; word32 baseSz = (bits + 7) / 8;
DECL_SP_INT_ARRAY(d, a->used * 2 + 1, 5); DECL_SP_INT_ARRAY(ds, a->used + 1, 3);
DECL_SP_INT_ARRAY(d, a->used * 2 + 1, 2);
ALLOC_SP_INT_ARRAY(d, a->used * 2 + 1, 5, err, NULL); ALLOC_SP_INT_ARRAY(ds, a->used + 1, 3, err, NULL);
ALLOC_SP_INT_ARRAY(d, a->used * 2 + 1, 2, err, NULL);
if (err == MP_OKAY) { if (err == MP_OKAY) {
b = d[0]; b = ds[0];
c = d[1]; c = ds[1];
n1 = d[2]; n1 = ds[2];
y = d[3]; y = d[0];
r = d[4]; r = d[1];
/* Only 'y' needs to be twice as big. */ /* Only 'y' needs to be twice as big. */
sp_init_size(b , a->used * 2 + 1); sp_init_size(b , a->used + 1);
sp_init_size(c , a->used * 2 + 1); sp_init_size(c , a->used + 1);
sp_init_size(n1, a->used * 2 + 1); sp_init_size(n1, a->used + 1);
sp_init_size(y , a->used * 2 + 1); sp_init_size(y , a->used * 2 + 1);
sp_init_size(r , a->used * 2 + 1); sp_init_size(r , a->used * 2 + 1);
@ -16117,6 +16158,7 @@ int sp_prime_is_prime_ex(sp_int* a, int t, int* result, WC_RNG* rng)
} }
FREE_SP_INT_ARRAY(d, NULL); FREE_SP_INT_ARRAY(d, NULL);
FREE_SP_INT_ARRAY(ds, NULL);
} }
#else #else
(void)t; (void)t;

42
wolfssl/internal.h
View File

@ -1166,6 +1166,33 @@ enum {
#error RSA maximum bit size must be multiple of 8 #error RSA maximum bit size must be multiple of 8
#endif #endif
/* MySQL wants to be able to use 8192-bit numbers. */
#if defined(WOLFSSL_MYSQL_COMPATIBLE) || \
(defined(USE_FAST_MATH) && defined(FP_MAX_BITS) && \
FP_MAX_BITS >= 16384) || \
((defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_SP_MATH)) && \
SP_INT_MAX_BITS >= 16384)
/* Maximum supported number length is 8192-bit. */
#define ENCRYPT_BASE_BITS 8192
#elif defined(USE_FAST_MATH) && defined(FP_MAX_BITS)
/* Use the FP size down to a min of 1024-bit. */
#if FP_MAX_BITS > 2048
#define ENCRYPT_BASE_BITS (FP_MAX_BITS / 2)
#else
#define ENCRYPT_BASE_BITS 1024
#endif
#elif defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_SP_MATH)
/* Use the SP math size down to a min of 1024-bit. */
#if SP_INT_MAX_BITS > 2048
#define ENCRYPT_BASE_BITS (SP_INT_MAX_BITS / 2)
#else
#define ENCRYPT_BASE_BITS 1024
#endif
#else
/* Integer/heap maths - support 4096-bit. */
#define ENCRYPT_BASE_BITS 4096
#endif
enum Misc { enum Misc {
CIPHER_BYTE = 0x00, /* Default ciphers */ CIPHER_BYTE = 0x00, /* Default ciphers */
ECC_BYTE = 0xC0, /* ECC first cipher suite byte */ ECC_BYTE = 0xC0, /* ECC first cipher suite byte */
@ -1204,21 +1231,12 @@ enum Misc {
#endif #endif
#endif #endif
#ifdef HAVE_PQC #ifdef HAVE_PQC
ENCRYPT_LEN = 1500, /* allow 1500 bit static buffer for falcon */ ENCRYPT_LEN = 1500, /* allow 1500 byte static buffer for falcon */
#else
#if defined(WOLFSSL_MYSQL_COMPATIBLE) || \
(defined(USE_FAST_MATH) && defined(FP_MAX_BITS) && FP_MAX_BITS >= 16384)
#if !defined(NO_PSK) && defined(USE_FAST_MATH)
ENCRYPT_LEN = (FP_MAX_BITS / 2 / 8) + MAX_PSK_ID_LEN + 2,
#else
ENCRYPT_LEN = 1024, /* allow 8192 bit static buffer */
#endif
#else #else
#ifndef NO_PSK #ifndef NO_PSK
ENCRYPT_LEN = 512 + MAX_PSK_ID_LEN + 2, /* 4096 bit static buffer */ ENCRYPT_LEN = (ENCRYPT_BASE_BITS / 8) + MAX_PSK_ID_LEN + 2,
#else #else
ENCRYPT_LEN = 512, /* allow 4096 bit static buffer */ ENCRYPT_LEN = (ENCRYPT_BASE_BITS / 8),
#endif
#endif #endif
#endif #endif
SIZEOF_SENDER = 4, /* clnt or srvr */ SIZEOF_SENDER = 4, /* clnt or srvr */