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

asn: refactoring MakeSignature to reduce stack usage:

Browse Source 
--- variable encSig moved to the heap (98 bytes saved)
--- variable md5 moved to util function (sizeof(Md5) bytes saved)
--- variable sha moved to util function (sizeof(Sha) bytes saved)
--- variable sha256 moved to util function (sizeof(Sha256) bytes saved)

add cast to variables that may not be used in some builds.
fix - put RSA code inside #ifndef NO_RSA
This commit is contained in:
Moisés Guimarães
2014-07-04 09:33:53 -03:00
parent de14fac069
commit 30977adc84
1 changed files with 64 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
ctaocrypt/src/asn.c
View File

@ -5505,73 +5505,86 @@ static int MakeSignature(const byte* buffer, int sz, byte* sig, int sigSz,
RsaKey* rsaKey, ecc_key* eccKey, RNG* rng, RsaKey* rsaKey, ecc_key* eccKey, RNG* rng,
int sigAlgoType) int sigAlgoType)
{ {
byte digest[SHA256_DIGEST_SIZE]; /* max size */ int encSigSz, digestSz, typeH = 0, ret = 0;
byte encSig[MAX_ENCODED_DIG_SZ + MAX_ALGO_SZ + MAX_SEQ_SZ]; byte digest[SHA256_DIGEST_SIZE]; /* max size */
int encSigSz, digestSz, typeH, ret = 0; DECLARE_ARRAY(byte, encSig, MAX_ENCODED_DIG_SZ + MAX_ALGO_SZ + MAX_SEQ_SZ);
(void)digest;
(void)digestSz;
(void)encSig;
(void)encSigSz;
(void)typeH;
(void)buffer;
(void)sz;
(void)sig;
(void)sigSz;
(void)rsaKey;
(void)eccKey; (void)eccKey;
(void)rng;
if (sigAlgoType == CTC_MD5wRSA) { switch (sigAlgoType) {
Md5 md5; #ifndef NO_MD5
case CTC_MD5wRSA:
InitMd5(&md5); if ((ret = Md5Hash(buffer, sz, digest)) == 0) {
Md5Update(&md5, buffer, sz); typeH = MD5h;
Md5Final(&md5, digest); digestSz = MD5_DIGEST_SIZE;
}
digestSz = MD5_DIGEST_SIZE; break;
typeH = MD5h; #endif
#ifndef NO_SHA
case CTC_SHAwRSA:
case CTC_SHAwECDSA:
if ((ret = ShaHash(buffer, sz, digest)) == 0) {
typeH = SHAh;
digestSz = SHA_DIGEST_SIZE;
}
break;
#endif
#ifndef NO_SHA256
case CTC_SHA256wRSA:
case CTC_SHA256wECDSA:
if ((ret = Sha256Hash(buffer, sz, digest)) == 0) {
typeH = SHA256h;
digestSz = SHA256_DIGEST_SIZE;
}
break;
#endif
default:
CYASSL_MSG("MakeSignautre called with unsupported type");
ret = ALGO_ID_E;
} }
else if (sigAlgoType == CTC_SHAwRSA || sigAlgoType == CTC_SHAwECDSA) {
Sha sha; if (ret != 0)
return ret;
ret = InitSha(&sha);
if (ret != 0) if (!CREATE_ARRAY(byte, encSig, MAX_ENCODED_DIG_SZ +
return ret; MAX_ALGO_SZ + MAX_SEQ_SZ)) {
return MEMORY_E;
ShaUpdate(&sha, buffer, sz);
ShaFinal(&sha, digest);
digestSz = SHA_DIGEST_SIZE;
typeH = SHAh;
} }
else if (sigAlgoType == CTC_SHA256wRSA || sigAlgoType == CTC_SHA256wECDSA) { #ifndef NO_RSA
Sha256 sha256; else if (rsaKey) {
ret = InitSha256(&sha256);
if (ret != 0)
return ret;
ret = Sha256Update(&sha256, buffer, sz);
if (ret != 0)
return ret;
ret = Sha256Final(&sha256, digest);
if (ret != 0)
return ret;
digestSz = SHA256_DIGEST_SIZE;
typeH = SHA256h;
}
else
return ALGO_ID_E;
if (rsaKey) {
/* signature */ /* signature */
encSigSz = EncodeSignature(encSig, digest, digestSz, typeH); encSigSz = EncodeSignature(encSig, digest, digestSz, typeH);
return RsaSSL_Sign(encSig, encSigSz, sig, sigSz, rsaKey, rng); ret = RsaSSL_Sign(encSig, encSigSz, sig, sigSz, rsaKey, rng);
} }
#endif
#ifdef HAVE_ECC #ifdef HAVE_ECC
else if (eccKey) { else if (eccKey) {
word32 outSz = sigSz; word32 outSz = sigSz;
ret = ecc_sign_hash(digest, digestSz, sig, &outSz, rng, eccKey); ret = ecc_sign_hash(digest, digestSz, sig, &outSz, rng, eccKey);
if (ret != 0) if (ret == 0)
return ret; ret = outSz;
return outSz;
} }
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
else {
ret = ALGO_ID_E;
}
return ALGO_ID_E; DESTROY_ARRAY(encSig);
return ret;
} }