Skip to content

Harden PKCS7 and OCSP error handling #3237

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

Merged
prasden merged 3 commits into from
May 11, 2026
+7 −1
Merged

Harden PKCS7 and OCSP error handling #3237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd2dae8
Harden PKCS7 and OCSP from pen-test findings
prasden May 8, 2026
3516461
pr feedback
prasden May 11, 2026
390a727
Merge branch 'main' into penpal-hardening-fixes
prasden May 11, 2026
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
2 changes: 2 additions & 0 deletions crypto/ocsp/ocsp_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ int OCSP_parse_url(const char *url, char **phost, char **pport, char **ppath,
*phost = NULL;
*pport = NULL;
*ppath = NULL;
*pssl = 0;
Comment thread
justsmth marked this conversation as resolved.

// Duplicate into the buffer since the contents are going to be changed.
buffer = OPENSSL_strdup(url);
Expand Down Expand Up @@ -232,6 +233,7 @@ int OCSP_parse_url(const char *url, char **phost, char **pport, char **ppath,
OPENSSL_free(buffer);
OPENSSL_free(*ppath);
*ppath = NULL;
*pssl = 0;
OPENSSL_free(*pport);
*pport = NULL;
OPENSSL_free(*phost);
Expand Down
1 change: 1 addition & 0 deletions crypto/ocsp/ocsp_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1632,6 +1632,7 @@ TEST_P(OCSPURLTest, OCSPParseURL) {
EXPECT_FALSE(host);
EXPECT_FALSE(port);
EXPECT_FALSE(path);
EXPECT_EQ(is_ssl, 0);
}
}

Expand Down
5 changes: 4 additions & 1 deletion crypto/pkcs7/pkcs7.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,9 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio) {
}
xalg->parameter->type = V_ASN1_OCTET_STRING;
xalg->parameter->value.octet_string = ASN1_OCTET_STRING_new();
if (xalg->parameter->value.octet_string == NULL) {
goto err;
}
// Set |p7|'s parameter value to the IV
if (!ASN1_OCTET_STRING_set(xalg->parameter->value.octet_string, iv,
ivlen)) {
Expand Down Expand Up @@ -1595,7 +1598,7 @@ static int pkcs7_signature_verify(BIO *in_bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
goto out;
}
if (message_digest->length != (int)md_len ||
OPENSSL_memcmp(message_digest->data, md_data, md_len) != 0) {
CRYPTO_memcmp(message_digest->data, md_data, md_len) != 0) {
OPENSSL_PUT_ERROR(PKCS7, PKCS7_R_DIGEST_FAILURE);
goto out;
}
Expand Down
Loading