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

Merge pull request #2851 from JacobBarthelmeh/SanityChecks

Browse Source 
add space for null terminator and check on header pointer
This commit is contained in:
toddouska
2020-03-19 16:00:57 -07:00
committed by GitHub
parent 00630baa53 aff80ab0d3
commit f4a8430115
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/api.c
View File

@@ -5046,13 +5046,9 @@ static void test_wolfSSL_PKCS8(void)
AssertIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, buffer, bytes, AssertIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, buffer, bytes,
WOLFSSL_FILETYPE_ASN1), WOLFSSL_SUCCESS); WOLFSSL_FILETYPE_ASN1), WOLFSSL_SUCCESS);
#else #else
#ifdef OPENSSL_EXTRA /* if HAVE_ECC is not defined then BEGIN EC PRIVATE KEY is not found */
AssertIntGT((bytes = wc_KeyPemToDer(buffer, bytes, der,
(word32)sizeof(der), NULL)), 0);
#else
AssertIntEQ((bytes = wc_KeyPemToDer(buffer, bytes, der, AssertIntEQ((bytes = wc_KeyPemToDer(buffer, bytes, der,
(word32)sizeof(der), NULL)), ASN_NO_PEM_HEADER); (word32)sizeof(der), NULL)), ASN_NO_PEM_HEADER);
#endif
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
wolfSSL_CTX_free(ctx); wolfSSL_CTX_free(ctx);

7
wolfcrypt/src/asn.c
View File

@@ -10434,8 +10434,8 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
#endif #endif
#endif #endif
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
char beginBuf[PEM_LINE_LEN]; char beginBuf[PEM_LINE_LEN + 1]; /* add 1 for null terminator */
char endBuf[PEM_LINE_LEN]; char endBuf[PEM_LINE_LEN + 1]; /* add 1 for null terminator */
#endif #endif
WOLFSSL_ENTER("PemToDer"); WOLFSSL_ENTER("PemToDer");
@@ -10506,7 +10506,8 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
XSTR_SIZEOF(BEGIN_PRIV_KEY_PREFIX)) != 0) { XSTR_SIZEOF(BEGIN_PRIV_KEY_PREFIX)) != 0) {
headerEnd--; headerEnd--;
} }
if (XSTRNCMP(headerEnd, BEGIN_PRIV_KEY_PREFIX, if (headerEnd <= (char*)buff ||
XSTRNCMP(headerEnd, BEGIN_PRIV_KEY_PREFIX,
XSTR_SIZEOF(BEGIN_PRIV_KEY_PREFIX)) != 0 || XSTR_SIZEOF(BEGIN_PRIV_KEY_PREFIX)) != 0 ||
beginEnd - headerEnd > PEM_LINE_LEN) { beginEnd - headerEnd > PEM_LINE_LEN) {
WOLFSSL_MSG("Couldn't find PEM header"); WOLFSSL_MSG("Couldn't find PEM header");