mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ssl: refactoring CyaSSL_CertManagerVerifyBuffer to reduce stack usage:

Browse Source 
--- variable cert moved to the heap (sizeof(DecodedCert) saved)
This commit is contained in:
Moisés Guimarães 2014-08-27 17:09:55 -03:00
parent d264a8f890
commit 82d2aca505
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/ssl.c
View File

@ -2412,17 +2412,27 @@ int CyaSSL_CertManagerVerifyBuffer(CYASSL_CERT_MANAGER* cm, const byte* buff,
long sz, int format) long sz, int format)
{ {
int ret = 0; int ret = 0;
int eccKey = 0; /* not used */ buffer der;
#ifdef CYASSL_SMALL_STACK
DecodedCert cert; DecodedCert* cert;
buffer der; #else
DecodedCert cert[1];
#endif
CYASSL_ENTER("CyaSSL_CertManagerVerifyBuffer"); CYASSL_ENTER("CyaSSL_CertManagerVerifyBuffer");
#ifdef CYASSL_SMALL_STACK
cert = (DecodedCert*)XMALLOC(sizeof(DecodedCert), NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (cert == NULL)
return MEMORY_E;
#endif
der.buffer = NULL; der.buffer = NULL;
der.length = 0; der.length = 0;
if (format == SSL_FILETYPE_PEM) { if (format == SSL_FILETYPE_PEM) {
int eccKey = 0; /* not used */
#ifdef CYASSL_SMALL_STACK #ifdef CYASSL_SMALL_STACK
EncryptedInfo* info; EncryptedInfo* info;
#else #else
@ -2432,36 +2442,44 @@ int CyaSSL_CertManagerVerifyBuffer(CYASSL_CERT_MANAGER* cm, const byte* buff,
#ifdef CYASSL_SMALL_STACK #ifdef CYASSL_SMALL_STACK
info = (EncryptedInfo*)XMALLOC(sizeof(EncryptedInfo), NULL, info = (EncryptedInfo*)XMALLOC(sizeof(EncryptedInfo), NULL,
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);
if (info == NULL) if (info == NULL) {
XFREE(cert, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return MEMORY_E; return MEMORY_E;
}
#endif #endif
info->set = 0; info->set = 0;
info->ctx = NULL; info->ctx = NULL;
info->consumed = 0; info->consumed = 0;
ret = PemToDer(buff, sz, CERT_TYPE, &der, cm->heap, info, &eccKey); ret = PemToDer(buff, sz, CERT_TYPE, &der, cm->heap, info, &eccKey);
InitDecodedCert(&cert, der.buffer, der.length, cm->heap);
if (ret == 0)
InitDecodedCert(cert, der.buffer, der.length, cm->heap);
#ifdef CYASSL_SMALL_STACK #ifdef CYASSL_SMALL_STACK
XFREE(info, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(info, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif #endif
} }
else else
InitDecodedCert(&cert, (byte*)buff, (word32)sz, cm->heap); InitDecodedCert(cert, (byte*)buff, (word32)sz, cm->heap);
if (ret == 0) if (ret == 0)
ret = ParseCertRelative(&cert, CERT_TYPE, 1, cm); ret = ParseCertRelative(cert, CERT_TYPE, 1, cm);
#ifdef HAVE_CRL #ifdef HAVE_CRL
if (ret == 0 && cm->crlEnabled) if (ret == 0 && cm->crlEnabled)
ret = CheckCertCRL(cm->crl, &cert); ret = CheckCertCRL(cm->crl, cert);
#endif #endif
FreeDecodedCert(&cert); FreeDecodedCert(cert);
XFREE(der.buffer, cm->heap, DYNAMIC_TYPE_CERT);
if (ret == 0) XFREE(der.buffer, cm->heap, DYNAMIC_TYPE_CERT);
return SSL_SUCCESS; #ifdef CYASSL_SMALL_STACK
return ret; XFREE(cert, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret == 0 ? SSL_SUCCESS : ret;
} }