Skip to content

src: handle DER decoding errors from system certificates #60787

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −3
Open

src: handle DER decoding errors from system certificates #60787

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
29 changes: 26 additions & 3 deletions src/crypto/crypto_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,11 @@ void ReadMacOSKeychainCertificates(
CFRelease(search);

if (ortn) {
fprintf(stderr, "ERROR: SecItemCopyMatching failed %d\n", ortn);
per_process::Debug(DebugCategory::CRYPTO,
"Cannot read certificates from system because "
"SecItemCopyMatching failed %d\n",
ortn);
return;
Copy link
Member Author

@joyeecheung joyeecheung Nov 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drive-by: I added a skip here too, otherwise the code operating on that array below can crash (I think it's possible on a super duper fresh machine with zero certificates, for example - though most consumer macOS machines seem to have at least some preinstalled, or when there's some permission issue going on)

}

CFIndex count = CFArrayGetCount(curr_anchors);
Expand All @@ -518,17 +522,29 @@ void ReadMacOSKeychainCertificates(

CFDataRef der_data = SecCertificateCopyData(cert_ref);
if (!der_data) {
fprintf(stderr, "ERROR: SecCertificateCopyData failed\n");
per_process::Debug(DebugCategory::CRYPTO,
"Skipping read of a system certificate "
"because SecCertificateCopyData failed\n");
continue;
}
auto data_buffer_pointer = CFDataGetBytePtr(der_data);

X509* cert =
d2i_X509(nullptr, &data_buffer_pointer, CFDataGetLength(der_data));
CFRelease(der_data);

if (cert == nullptr) {
per_process::Debug(DebugCategory::CRYPTO,
"Skipping read of a system certificate "
"because decoding failed\n");
continue;
}

bool is_valid = IsCertificateTrustedForPolicy(cert, cert_ref);
if (is_valid) {
system_root_certificates_X509->emplace_back(cert);
} else {
X509_free(cert);
}
}
CFRelease(curr_anchors);
Expand Down Expand Up @@ -638,7 +654,14 @@ void GatherCertsForLocation(std::vector<X509*>* vector,
reinterpret_cast<const unsigned char*>(cert_from_store->pbCertEncoded);
const size_t cert_size = cert_from_store->cbCertEncoded;

vector->emplace_back(d2i_X509(nullptr, &cert_data, cert_size));
X509* x509 = d2i_X509(nullptr, &cert_data, cert_size);
if (x509 == nullptr) {
per_process::Debug(DebugCategory::CRYPTO,
"Skipping read of a system certificate "
"because decoding failed\n");
} else {
vector->emplace_back(x509);
}
}
}

Expand Down
Loading