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

Merge pull request #1417 from dgarske/asn_x509_header

Browse Source 
Cleanup of the ASN X509 header logic
This commit is contained in:
toddouska
2018-03-07 08:50:00 -08:00
committed by GitHub
parent 71ba87bb4d b879d138af
commit cd940ccb5c
1 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wolfcrypt/src/asn.c
View File

@@ -7264,6 +7264,8 @@ WOLFSSL_LOCAL int GetSerialNumber(const byte* input, word32* inOutIdx,
} }
/* Max X509 header length indicates the max length + 2 ('\n', '\0') */
#define MAX_X509_HEADER_SZ (37 + 2)
const char* const BEGIN_CERT = "-----BEGIN CERTIFICATE-----"; const char* const BEGIN_CERT = "-----BEGIN CERTIFICATE-----";
const char* const END_CERT = "-----END CERTIFICATE-----"; const char* const END_CERT = "-----END CERTIFICATE-----";
@@ -7318,12 +7320,11 @@ int wc_DerToPemEx(const byte* der, word32 derSz, byte* output, word32 outSz,
char* header = NULL; char* header = NULL;
char* footer = NULL; char* footer = NULL;
#else #else
char header[40 + HEADER_ENCRYPTED_KEY_SIZE]; char header[MAX_X509_HEADER_SZ + HEADER_ENCRYPTED_KEY_SIZE];
char footer[40]; char footer[MAX_X509_HEADER_SZ];
#endif #endif
int headerLen = MAX_X509_HEADER_SZ + HEADER_ENCRYPTED_KEY_SIZE;
int headerLen = 40 + HEADER_ENCRYPTED_KEY_SIZE; int footerLen = MAX_X509_HEADER_SZ;
int footerLen = 40;
int i; int i;
int err; int err;
int outLen; /* return length or error */ int outLen; /* return length or error */
@@ -7344,10 +7345,8 @@ int wc_DerToPemEx(const byte* der, word32 derSz, byte* output, word32 outSz,
#endif #endif
/* null term and leave room for \n */ /* null term and leave room for \n */
header[headerLen-1] = '\0'; header[--headerLen] = '\0';
footer[footerLen-1] = '\0'; footer[--footerLen] = '\0';
headerLen -= 2;
footerLen -= 2;
if (type == CERT_TYPE) { if (type == CERT_TYPE) {
XSTRNCPY(header, BEGIN_CERT, headerLen); XSTRNCPY(header, BEGIN_CERT, headerLen);