mirror of
https://github.com/klzgrad/naiveproxy.git
synced 2024-11-29 00:36:10 +03:00
cert: Handle AIA response in PKCS#7 format
This commit is contained in:
parent
ef642d56f3
commit
98b9e24d6f
@ -9,6 +9,7 @@
|
|||||||
#include "net/cert/cert_net_fetcher.h"
|
#include "net/cert/cert_net_fetcher.h"
|
||||||
#include "net/cert/internal/cert_errors.h"
|
#include "net/cert/internal/cert_errors.h"
|
||||||
#include "net/cert/pem.h"
|
#include "net/cert/pem.h"
|
||||||
|
#include "net/cert/x509_certificate.h"
|
||||||
#include "net/cert/x509_util.h"
|
#include "net/cert/x509_util.h"
|
||||||
#include "url/gurl.h"
|
#include "url/gurl.h"
|
||||||
|
|
||||||
@ -52,6 +53,28 @@ bool ParseCertFromPem(const uint8_t* data,
|
|||||||
pem_tokenizer.data().size(), results);
|
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 {
|
class AiaRequest : public CertIssuerSource::Request {
|
||||||
public:
|
public:
|
||||||
AiaRequest() = default;
|
AiaRequest() = default;
|
||||||
@ -117,7 +140,9 @@ bool AiaRequest::AddCompletedFetchToResults(Error error,
|
|||||||
// is not part of RFC 5280's profile.
|
// is not part of RFC 5280's profile.
|
||||||
return ParseCertFromDer(fetched_bytes.data(), fetched_bytes.size(),
|
return ParseCertFromDer(fetched_bytes.data(), fetched_bytes.size(),
|
||||||
results) ||
|
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
|
} // namespace
|
||||||
|
Loading…
Reference in New Issue
Block a user