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

internal.c: refactoring DoServerKeyExchange to reduce stack usage:

Browse Source 
--- variable hash256 moved to the heap (32 bytes saved)
--- variable hash384 moved to the heap (48 bytes saved)
--- variable hash moved to the heap (36 bytes saved)
--- variable messageVerify moved to the heap (612 bytes saved)
--- variable encodedSig moved to the heap (512 bytes saved)
This commit is contained in:
Moisés Guimarães
2014-10-20 16:44:44 -03:00
parent 0447bf7551
commit 5056ebe829
1 changed files with 198 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

223
src/internal.c
View File

@ -9688,8 +9688,8 @@ static void PickHashSigAlgo(CYASSL* ssl,
{ {
#ifndef NO_OLD_TLS #ifndef NO_OLD_TLS
#ifdef CYASSL_SMALL_STACK #ifdef CYASSL_SMALL_STACK
Md5* md5; Md5* md5 = NULL;
Sha* sha; Sha* sha = NULL;
#else #else
Md5 md5[0]; Md5 md5[0];
Sha sha[0]; Sha sha[0];
@ -9697,59 +9697,96 @@ static void PickHashSigAlgo(CYASSL* ssl,
#endif #endif
#ifndef NO_SHA256 #ifndef NO_SHA256
#ifdef CYASSL_SMALL_STACK #ifdef CYASSL_SMALL_STACK
Sha256* sha256; Sha256* sha256 = NULL;
byte* hash256 = NULL;
#else #else
Sha256 sha256[0]; Sha256 sha256[0];
#endif
byte hash256[SHA256_DIGEST_SIZE]; byte hash256[SHA256_DIGEST_SIZE];
#endif #endif
#endif
#ifdef CYASSL_SHA384 #ifdef CYASSL_SHA384
#ifdef CYASSL_SMALL_STACK #ifdef CYASSL_SMALL_STACK
Sha384* sha384; Sha384* sha384 = NULL;
byte* hash384 = NULL;
#else #else
Sha384 sha384[0]; Sha384 sha384[0];
#endif
byte hash384[SHA384_DIGEST_SIZE]; byte hash384[SHA384_DIGEST_SIZE];
#endif #endif
#endif
#ifdef CYASSL_SMALL_STACK
byte* hash = NULL;
byte* messageVerify = NULL;
#else
byte hash[FINISHED_SZ]; byte hash[FINISHED_SZ];
byte messageVerify[MAX_DH_SZ]; byte messageVerify[MAX_DH_SZ];
#endif
byte hashAlgo = sha_mac; byte hashAlgo = sha_mac;
byte sigAlgo = ssl->specs.sig_algo; byte sigAlgo = ssl->specs.sig_algo;
word16 verifySz = (word16) (*inOutIdx - begin); word16 verifySz = (word16) (*inOutIdx - begin);
/* save message for hash verify */ /* save message for hash verify */
if (verifySz > sizeof(messageVerify)) if (verifySz > MAX_DH_SZ)
return BUFFER_ERROR; return BUFFER_ERROR;
#ifdef CYASSL_SMALL_STACK
messageVerify = (byte*)XMALLOC(MAX_DH_SZ, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (messageVerify == NULL)
return MEMORY_E;
#endif
XMEMCPY(messageVerify, input + begin, verifySz); XMEMCPY(messageVerify, input + begin, verifySz);
if (IsAtLeastTLSv1_2(ssl)) { if (IsAtLeastTLSv1_2(ssl)) {
if ((*inOutIdx - begin) + ENUM_LEN + ENUM_LEN > size) if ((*inOutIdx - begin) + ENUM_LEN + ENUM_LEN > size) {
#ifdef CYASSL_SMALL_STACK
XFREE(messageVerify, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return BUFFER_ERROR; return BUFFER_ERROR;
}
hashAlgo = input[(*inOutIdx)++]; hashAlgo = input[(*inOutIdx)++];
sigAlgo = input[(*inOutIdx)++]; sigAlgo = input[(*inOutIdx)++];
} }
/* signature */ /* signature */
if ((*inOutIdx - begin) + OPAQUE16_LEN > size) if ((*inOutIdx - begin) + OPAQUE16_LEN > size) {
#ifdef CYASSL_SMALL_STACK
XFREE(messageVerify, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return BUFFER_ERROR; return BUFFER_ERROR;
}
ato16(input + *inOutIdx, &length); ato16(input + *inOutIdx, &length);
*inOutIdx += OPAQUE16_LEN; *inOutIdx += OPAQUE16_LEN;
if ((*inOutIdx - begin) + length > size) if ((*inOutIdx - begin) + length > size) {
#ifdef CYASSL_SMALL_STACK
XFREE(messageVerify, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return BUFFER_ERROR; return BUFFER_ERROR;
}
/* inOutIdx updated at the end of the function */ /* inOutIdx updated at the end of the function */
/* verify signature */ /* verify signature */
#ifdef CYASSL_SMALL_STACK
hash = (byte*)XMALLOC(FINISHED_SZ, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (hash == NULL) {
XFREE(messageVerify, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return MEMORY_E;
}
#endif
#ifndef NO_OLD_TLS #ifndef NO_OLD_TLS
/* md5 */ /* md5 */
#ifdef CYASSL_SMALL_STACK #ifdef CYASSL_SMALL_STACK
md5 = (Md5*)XMALLOC(sizeof(Md5), NULL, DYNAMIC_TYPE_TMP_BUFFER); md5 = (Md5*)XMALLOC(sizeof(Md5), NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (md5 == NULL) if (md5 == NULL) {
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(messageVerify, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return MEMORY_E; return MEMORY_E;
}
#endif #endif
InitMd5(md5); InitMd5(md5);
Md5Update(md5, ssl->arrays->clientRandom, RAN_LEN); Md5Update(md5, ssl->arrays->clientRandom, RAN_LEN);
@ -9763,13 +9800,18 @@ static void PickHashSigAlgo(CYASSL* ssl,
/* sha */ /* sha */
#ifdef CYASSL_SMALL_STACK #ifdef CYASSL_SMALL_STACK
sha = (Sha*)XMALLOC(sizeof(Sha), NULL, DYNAMIC_TYPE_TMP_BUFFER); sha = (Sha*)XMALLOC(sizeof(Sha), NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (sha == NULL) if (sha == NULL) {
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(messageVerify, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return MEMORY_E; return MEMORY_E;
}
#endif #endif
ret = InitSha(sha); ret = InitSha(sha);
if (ret != 0) { if (ret != 0) {
#ifdef CYASSL_SMALL_STACK #ifdef CYASSL_SMALL_STACK
XFREE(sha, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(sha, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(messageVerify, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif #endif
return ret; return ret;
} }
@ -9786,8 +9828,15 @@ static void PickHashSigAlgo(CYASSL* ssl,
#ifdef CYASSL_SMALL_STACK #ifdef CYASSL_SMALL_STACK
sha256 = (Sha256*)XMALLOC(sizeof(Sha256), NULL, sha256 = (Sha256*)XMALLOC(sizeof(Sha256), NULL,
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);
if (sha256 == NULL) hash256 = (byte*)XMALLOC(SHA256_DIGEST_SIZE, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (sha256 == NULL || hash256 == NULL) {
XFREE(sha256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(hash256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(messageVerify, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return MEMORY_E; return MEMORY_E;
}
#endif #endif
if (!(ret = InitSha256(sha256)) if (!(ret = InitSha256(sha256))
&& !(ret = Sha256Update(sha256, ssl->arrays->clientRandom, RAN_LEN)) && !(ret = Sha256Update(sha256, ssl->arrays->clientRandom, RAN_LEN))
@ -9797,16 +9846,32 @@ static void PickHashSigAlgo(CYASSL* ssl,
#ifdef CYASSL_SMALL_STACK #ifdef CYASSL_SMALL_STACK
XFREE(sha256, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(sha256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif #endif
if (ret != 0) if (ret != 0) {
#ifdef CYASSL_SMALL_STACK
XFREE(hash256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(messageVerify, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret; return ret;
}
#endif #endif
#ifdef CYASSL_SHA384 #ifdef CYASSL_SHA384
#ifdef CYASSL_SMALL_STACK #ifdef CYASSL_SMALL_STACK
sha384 = (Sha384*)XMALLOC(sizeof(Sha384), NULL, sha384 = (Sha384*)XMALLOC(sizeof(Sha384), NULL,
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);
if (sha384 == NULL) hash384 = (byte*)XMALLOC(SHA384_DIGEST_SIZE, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (sha384 == NULL || hash384 == NULL) {
XFREE(sha384, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(hash384, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#ifndef NO_SHA256
XFREE(hash256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(messageVerify, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return MEMORY_E; return MEMORY_E;
}
#endif #endif
if (!(ret = InitSha384(sha384)) if (!(ret = InitSha384(sha384))
&& !(ret = Sha384Update(sha384, ssl->arrays->clientRandom, RAN_LEN)) && !(ret = Sha384Update(sha384, ssl->arrays->clientRandom, RAN_LEN))
@ -9816,10 +9881,23 @@ static void PickHashSigAlgo(CYASSL* ssl,
#ifdef CYASSL_SMALL_STACK #ifdef CYASSL_SMALL_STACK
XFREE(sha384, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(sha384, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif #endif
if (ret != 0) if (ret != 0) {
#ifdef CYASSL_SMALL_STACK
#ifndef NO_SHA256
XFREE(hash256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
XFREE(hash384, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(messageVerify, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret; return ret;
}
#endif #endif
#ifdef CYASSL_SMALL_STACK
XFREE(messageVerify, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
#ifndef NO_RSA #ifndef NO_RSA
/* rsa */ /* rsa */
if (sigAlgo == rsa_sa_algo) if (sigAlgo == rsa_sa_algo)
@ -9832,8 +9910,18 @@ static void PickHashSigAlgo(CYASSL* ssl,
doUserRsa = 1; doUserRsa = 1;
#endif /*HAVE_PK_CALLBACKS */ #endif /*HAVE_PK_CALLBACKS */
if (!ssl->peerRsaKeyPresent) if (!ssl->peerRsaKeyPresent) {
#ifdef CYASSL_SMALL_STACK
#ifndef NO_SHA256
XFREE(hash256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
#ifdef CYASSL_SHA384
XFREE(hash384, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return NO_PEER_KEY; return NO_PEER_KEY;
}
if (doUserRsa) { if (doUserRsa) {
#ifdef HAVE_PK_CALLBACKS #ifdef HAVE_PK_CALLBACKS
@ -9850,7 +9938,6 @@ static void PickHashSigAlgo(CYASSL* ssl,
} }
if (IsAtLeastTLSv1_2(ssl)) { if (IsAtLeastTLSv1_2(ssl)) {
byte encodedSig[MAX_ENCODED_SIG_SZ];
word32 encSigSz; word32 encSigSz;
#ifndef NO_OLD_TLS #ifndef NO_OLD_TLS
byte* digest = &hash[MD5_DIGEST_SIZE]; byte* digest = &hash[MD5_DIGEST_SIZE];
@ -9861,6 +9948,11 @@ static void PickHashSigAlgo(CYASSL* ssl,
int typeH = SHA256h; int typeH = SHA256h;
int digestSz = SHA256_DIGEST_SIZE; int digestSz = SHA256_DIGEST_SIZE;
#endif #endif
#ifdef CYASSL_SMALL_STACK
byte* encodedSig = NULL;
#else
byte encodedSig[MAX_ENCODED_SIG_SZ];
#endif
if (hashAlgo == sha_mac) { if (hashAlgo == sha_mac) {
#ifndef NO_SHA #ifndef NO_SHA
@ -9884,16 +9976,57 @@ static void PickHashSigAlgo(CYASSL* ssl,
#endif #endif
} }
#ifdef CYASSL_SMALL_STACK
encodedSig = (byte*)XMALLOC(MAX_ENCODED_SIG_SZ, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (encodedSig == NULL) {
#ifdef CYASSL_SMALL_STACK
#ifndef NO_SHA256
XFREE(hash256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
#ifdef CYASSL_SHA384
XFREE(hash384, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return MEMORY_E;
}
#endif
encSigSz = EncodeSignature(encodedSig, digest, digestSz, typeH); encSigSz = EncodeSignature(encodedSig, digest, digestSz, typeH);
if (encSigSz != (word32)ret || !out || XMEMCMP(out, encodedSig, if (encSigSz != (word32)ret || !out || XMEMCMP(out, encodedSig,
min(encSigSz, MAX_ENCODED_SIG_SZ)) != 0) min(encSigSz, MAX_ENCODED_SIG_SZ)) != 0) {
#ifdef CYASSL_SMALL_STACK
#ifndef NO_SHA256
XFREE(hash256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
#ifdef CYASSL_SHA384
XFREE(hash384, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(encodedSig, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return VERIFY_SIGN_ERROR; return VERIFY_SIGN_ERROR;
}
#ifdef CYASSL_SMALL_STACK
XFREE(encodedSig, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
} }
else { else {
if (ret != sizeof(hash) || !out || XMEMCMP(out, if (ret != FINISHED_SZ || !out || XMEMCMP(out,
hash, sizeof(hash)) != 0) hash, FINISHED_SZ) != 0) {
#ifdef CYASSL_SMALL_STACK
#ifndef NO_SHA256
XFREE(hash256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
#ifdef CYASSL_SHA384
XFREE(hash384, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return VERIFY_SIGN_ERROR; return VERIFY_SIGN_ERROR;
}
} }
} else } else
#endif #endif
@ -9915,8 +10048,18 @@ static void PickHashSigAlgo(CYASSL* ssl,
doUserEcc = 1; doUserEcc = 1;
#endif #endif
if (!ssl->peerEccDsaKeyPresent) if (!ssl->peerEccDsaKeyPresent) {
#ifdef CYASSL_SMALL_STACK
#ifndef NO_SHA256
XFREE(hash256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
#ifdef CYASSL_SHA384
XFREE(hash384, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return NO_PEER_KEY; return NO_PEER_KEY;
}
if (IsAtLeastTLSv1_2(ssl)) { if (IsAtLeastTLSv1_2(ssl)) {
if (hashAlgo == sha_mac) { if (hashAlgo == sha_mac) {
@ -9951,17 +10094,47 @@ static void PickHashSigAlgo(CYASSL* ssl,
ret = ecc_verify_hash(input + *inOutIdx, length, ret = ecc_verify_hash(input + *inOutIdx, length,
digest, digestSz, &verify, ssl->peerEccDsaKey); digest, digestSz, &verify, ssl->peerEccDsaKey);
} }
if (ret != 0 || verify == 0) if (ret != 0 || verify == 0) {
#ifdef CYASSL_SMALL_STACK
#ifndef NO_SHA256
XFREE(hash256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
#ifdef CYASSL_SHA384
XFREE(hash384, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return VERIFY_SIGN_ERROR; return VERIFY_SIGN_ERROR;
}
} }
else else {
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
#ifdef CYASSL_SMALL_STACK
#ifndef NO_SHA256
XFREE(hash256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
#ifdef CYASSL_SHA384
XFREE(hash384, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ALGO_ID_E; return ALGO_ID_E;
}
/* signature length */ /* signature length */
*inOutIdx += length; *inOutIdx += length;
ssl->options.serverState = SERVER_KEYEXCHANGE_COMPLETE; ssl->options.serverState = SERVER_KEYEXCHANGE_COMPLETE;
#ifdef CYASSL_SMALL_STACK
#ifndef NO_SHA256
XFREE(hash256, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
#ifdef CYASSL_SHA384
XFREE(hash384, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
XFREE(hash, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
} }
if (ssl->keys.encryptionOn) { if (ssl->keys.encryptionOn) {