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

Merge pull request #462 from cconlon/bug-fixes

Browse Source 
PemToDer Bug Fixes
This commit is contained in:
toddouska
2016-06-28 09:58:18 -07:00
committed by GitHub
parent 7da797dd4c 9c7bea46d2
commit 981cf9cbcb
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ssl.c
View File

@@ -3456,6 +3456,9 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
headerEnd += XSTRLEN(header); headerEnd += XSTRLEN(header);
if ((headerEnd + 1) >= bufferEnd)
return SSL_BAD_FILE;
/* eat end of line */ /* eat end of line */
if (headerEnd[0] == '\n') if (headerEnd[0] == '\n')
headerEnd++; headerEnd++;
@@ -3534,7 +3537,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
/* eat end of line */ /* eat end of line */
if (consumedEnd[0] == '\n') if (consumedEnd[0] == '\n')
consumedEnd++; consumedEnd++;
else if (consumedEnd[1] == '\n') else if ((consumedEnd + 1 < bufferEnd) && consumedEnd[1] == '\n')
consumedEnd += 2; consumedEnd += 2;
else { else {
if (info) if (info)
@@ -3548,7 +3551,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
/* set up der buffer */ /* set up der buffer */
neededSz = (long)(footerEnd - headerEnd); neededSz = (long)(footerEnd - headerEnd);
if (neededSz > sz || neededSz < 0) if (neededSz > sz || neededSz <= 0)
return SSL_BAD_FILE; return SSL_BAD_FILE;
ret = AllocDer(pDer, (word32)neededSz, type, heap); ret = AllocDer(pDer, (word32)neededSz, type, heap);
@@ -4358,6 +4361,13 @@ int wolfSSL_CertManagerVerifyBuffer(WOLFSSL_CERT_MANAGER* cm, const byte* buff,
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);
if (ret != 0) {
FreeDer(&der);
#ifdef WOLFSSL_SMALL_STACK
XFREE(info, cm->heap, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret;
}
InitDecodedCert(cert, der->buffer, der->length, cm->heap); InitDecodedCert(cert, der->buffer, der->length, cm->heap);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK