wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

asn: refactoring DerToPem to reduce stack usage: 160 bytes - pointers size moved to the heap.

Browse Source 
--- variable header moved to the heap (80 bytes saved)
--- variable footer moved to the heap (80 bytes saved)
This commit is contained in:
Moisés Guimarães
2014-06-27 11:14:35 -03:00
parent e077cd067b
commit 171d7bf920
1 changed files with 63 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
ctaocrypt/src/asn.c
View File

@@ -4383,11 +4383,16 @@ CYASSL_LOCAL int SetSerialNumber(const byte* sn, word32 snSz, byte* output)
int DerToPem(const byte* der, word32 derSz, byte* output, word32 outSz, int DerToPem(const byte* der, word32 derSz, byte* output, word32 outSz,
int type) int type)
{ {
#ifdef CYASSL_SMALL_STACK
char* header = NULL;
char* footer = NULL;
#else
char header[80]; char header[80];
char footer[80]; char footer[80];
#endif
int headerLen; int headerLen = 80;
int footerLen; int footerLen = 80;
int i; int i;
int err; int err;
int outLen; /* return length or error */ int outLen; /* return length or error */
@@ -4395,56 +4400,99 @@ int DerToPem(const byte* der, word32 derSz, byte* output, word32 outSz,
if (der == output) /* no in place conversion */ if (der == output) /* no in place conversion */
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#ifdef CYASSL_SMALL_STACK
header = (char*)XMALLOC(headerLen, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (header == NULL)
return MEMORY_E;
footer = (char*)XMALLOC(footerLen, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (footer == NULL) {
XFREE(header, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return MEMORY_E;
}
#endif
if (type == CERT_TYPE) { if (type == CERT_TYPE) {
XSTRNCPY(header, "-----BEGIN CERTIFICATE-----\n", sizeof(header)); XSTRNCPY(header, "-----BEGIN CERTIFICATE-----\n", headerLen);
XSTRNCPY(footer, "-----END CERTIFICATE-----\n", sizeof(footer)); XSTRNCPY(footer, "-----END CERTIFICATE-----\n", footerLen);
} }
else if (type == PRIVATEKEY_TYPE) { else if (type == PRIVATEKEY_TYPE) {
XSTRNCPY(header, "-----BEGIN RSA PRIVATE KEY-----\n", sizeof(header)); XSTRNCPY(header, "-----BEGIN RSA PRIVATE KEY-----\n", headerLen);
XSTRNCPY(footer, "-----END RSA PRIVATE KEY-----\n", sizeof(footer)); XSTRNCPY(footer, "-----END RSA PRIVATE KEY-----\n", footerLen);
} }
#ifdef HAVE_ECC #ifdef HAVE_ECC
else if (type == ECC_PRIVATEKEY_TYPE) { else if (type == ECC_PRIVATEKEY_TYPE) {
XSTRNCPY(header, "-----BEGIN EC PRIVATE KEY-----\n", sizeof(header)); XSTRNCPY(header, "-----BEGIN EC PRIVATE KEY-----\n", headerLen);
XSTRNCPY(footer, "-----END EC PRIVATE KEY-----\n", sizeof(footer)); XSTRNCPY(footer, "-----END EC PRIVATE KEY-----\n", footerLen);
} }
#endif #endif
#ifdef CYASSL_CERT_REQ #ifdef CYASSL_CERT_REQ
else if (type == CERTREQ_TYPE) else if (type == CERTREQ_TYPE)
{ {
XSTRNCPY(header, XSTRNCPY(header,
"-----BEGIN CERTIFICATE REQUEST-----\n", sizeof(header)); "-----BEGIN CERTIFICATE REQUEST-----\n", headerLen);
XSTRNCPY(footer, "-----END CERTIFICATE REQUEST-----\n", sizeof(footer)); XSTRNCPY(footer, "-----END CERTIFICATE REQUEST-----\n", footerLen);
} }
#endif #endif
else else {
#ifdef CYASSL_SMALL_STACK
XFREE(header, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(footer, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
}
headerLen = (int)XSTRLEN(header); headerLen = (int)XSTRLEN(header);
footerLen = (int)XSTRLEN(footer); footerLen = (int)XSTRLEN(footer);
if (!der || !output) if (!der || !output) {
#ifdef CYASSL_SMALL_STACK
XFREE(header, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(footer, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
}
/* don't even try if outSz too short */ /* don't even try if outSz too short */
if (outSz < headerLen + footerLen + derSz) if (outSz < headerLen + footerLen + derSz) {
#ifdef CYASSL_SMALL_STACK
XFREE(header, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(footer, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
}
/* header */ /* header */
XMEMCPY(output, header, headerLen); XMEMCPY(output, header, headerLen);
i = headerLen; i = headerLen;
#ifdef CYASSL_SMALL_STACK
XFREE(header, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
/* body */ /* body */
outLen = outSz - (headerLen + footerLen); /* input to Base64_Encode */ outLen = outSz - (headerLen + footerLen); /* input to Base64_Encode */
if ( (err = Base64_Encode(der, derSz, output + i, (word32*)&outLen)) < 0) if ( (err = Base64_Encode(der, derSz, output + i, (word32*)&outLen)) < 0) {
#ifdef CYASSL_SMALL_STACK
XFREE(footer, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return err; return err;
}
i += outLen; i += outLen;
/* footer */ /* footer */
if ( (i + footerLen) > (int)outSz) if ( (i + footerLen) > (int)outSz) {
#ifdef CYASSL_SMALL_STACK
XFREE(footer, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
}
XMEMCPY(output + i, footer, footerLen); XMEMCPY(output + i, footer, footerLen);
#ifdef CYASSL_SMALL_STACK
XFREE(footer, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return outLen + headerLen + footerLen; return outLen + headerLen + footerLen;
} }