mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-29 00:36:10 +03:00
Code Issues Projects Releases Wiki Activity

cert: Handle AIA response in PKCS#7 format

Browse Source
This commit is contained in:
klzgrad 2021-05-16 00:47:27 +08:00
parent ef642d56f3
commit 98b9e24d6f
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/net/cert/internal/cert_issuer_source_aia.cc
View File

@ -9,6 +9,7 @@
#include "net/cert/cert_net_fetcher.h"
#include "net/cert/internal/cert_errors.h"
#include "net/cert/pem.h"
#include "net/cert/x509_certificate.h"
#include "net/cert/x509_util.h"
#include "url/gurl.h"
@ -52,6 +53,28 @@ bool ParseCertFromPem(const uint8_t* data,
pem_tokenizer.data().size(), results);
}
bool ParseCertFromAuto(const uint8_t* data,
size_t length,
ParsedCertificateList* results) {
CertificateList certs = X509Certificate::CreateCertificateListFromBytes(
reinterpret_cast<const char*>(data), length,
X509Certificate::FORMAT_AUTO);
bool ok = false;
for (const auto& cert : certs) {
CertErrors errors;
auto parsed = ParsedCertificate::Create(
bssl::UpRef(cert->cert_buffer()),
x509_util::DefaultParseCertificateOptions(), &errors);
if (parsed) {
results->push_back(parsed);
ok = true;
} else {
LOG(ERROR) << errors.ToDebugString();
}
}
return ok;
}
class AiaRequest : public CertIssuerSource::Request {
public:
AiaRequest() = default;
@ -117,7 +140,9 @@ bool AiaRequest::AddCompletedFetchToResults(Error error,
// is not part of RFC 5280's profile.
return ParseCertFromDer(fetched_bytes.data(), fetched_bytes.size(),
results) ||
ParseCertFromPem(fetched_bytes.data(), fetched_bytes.size(), results);
ParseCertFromPem(fetched_bytes.data(), fetched_bytes.size(),
results) ||
ParseCertFromAuto(fetched_bytes.data(), fetched_bytes.size(), results);
}
} // namespace