Skip to content

wolfSSL_PEM_X509_X509_CRL_X509_PKEY_read_bio: avoid quadratic PEM marker scanning #11405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
per-allansson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

wolfSSL_PEM_X509_X509_CRL_X509_PKEY_read_bio: avoid quadratic PEM marker scanning #11405

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions src/x509.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14210,6 +14210,7 @@ int wolfSSL_write_X509_CRL(WOLFSSL_X509_CRL* crl, const char* path, int type)
const char* headerEnd = NULL;
const char* footer = NULL;
const char* footerEnd = NULL;
long searchPos = 0;
#ifdef HAVE_CRL
DerBuffer* der = NULL;
#endif
Expand Down Expand Up @@ -14252,16 +14253,21 @@ int wolfSSL_write_X509_CRL(WOLFSSL_X509_CRL* crl, const char* path, int type)
while (i < l && wolfSSL_BIO_read(bio, &pem[i], 1) == 1) {
i++;
if (!header) {
header = XSTRNSTR(pem, "-----BEGIN ", i);
header = XSTRNSTR(pem + searchPos, "-----BEGIN ",
(size_t)(i - searchPos));
if (header == NULL) {
searchPos = i > (long)(XSTR_SIZEOF("-----BEGIN ") - 1)
? i - (XSTR_SIZEOF("-----BEGIN ") - 1) : 0;
}
}
else if (!headerEnd) {
headerEnd = XSTRNSTR(header + XSTR_SIZEOF("-----BEGIN "),
"-----",
i - (header + XSTR_SIZEOF("-----BEGIN ") - pem));
if (headerEnd) {
headerEnd += XSTR_SIZEOF("-----");
/* Read in the newline */
if (wolfSSL_BIO_read(bio, &pem[i], 1) != 1) {
if (i >= l ||
wolfSSL_BIO_read(bio, &pem[i], 1) != 1) {
WOLFSSL_MSG("wolfSSL_BIO_read error");
goto err;
}
Expand All @@ -14270,11 +14276,16 @@ int wolfSSL_write_X509_CRL(WOLFSSL_X509_CRL* crl, const char* path, int type)
WOLFSSL_MSG("Missing newline after header");
goto err;
}
searchPos = headerEnd - pem;
}
}
else if (!footer) {
footer = XSTRNSTR(headerEnd, "-----END ",
i - (headerEnd - pem));
footer = XSTRNSTR(pem + searchPos, "-----END ",
(size_t)(i - searchPos));
if (footer == NULL) {
if (i > (long)(XSTR_SIZEOF("-----END ") - 1))
searchPos = i - (XSTR_SIZEOF("-----END ") - 1);
}
}
else if (!footerEnd) {
footerEnd = XSTRNSTR(footer + XSTR_SIZEOF("-----"),
Expand Down