mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Move CRLSets to being part of CertVerifier::Config

Browse source 
1132706
This commit is contained in:
deepak1556 2018-10-25 22:15:18 +05:30
parent 6310d6c699
commit 0f9dd3736c
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/net/atom_cert_verifier.cc
View file

@ -14,7 +14,6 @@
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "net/base/net_errors.h" #include "net/base/net_errors.h"
#include "net/cert/cert_verify_result.h" #include "net/cert/cert_verify_result.h"
#include "net/cert/crl_set.h"
#include "net/cert/x509_certificate.h" #include "net/cert/x509_certificate.h"
using content::BrowserThread; using content::BrowserThread;
@ -78,9 +77,9 @@ class CertVerifierRequest : public AtomCertVerifier::Request {
delete response; delete response;
} }
void Start(net::CRLSet* crl_set, const net::NetLogWithSource& net_log) { void Start(const net::NetLogWithSource& net_log) {
int error = cert_verifier_->default_verifier()->Verify( int error = cert_verifier_->default_verifier()->Verify(
params_, crl_set, &result_, params_, &result_,
base::Bind(&CertVerifierRequest::OnDefaultVerificationDone, base::Bind(&CertVerifierRequest::OnDefaultVerificationDone,
weak_ptr_factory_.GetWeakPtr()), weak_ptr_factory_.GetWeakPtr()),
&default_verifier_request_, net_log); &default_verifier_request_, net_log);
@ -161,7 +160,6 @@ void AtomCertVerifier::SetVerifyProc(const VerifyProc& proc) {
} }
int AtomCertVerifier::Verify(const RequestParams& params, int AtomCertVerifier::Verify(const RequestParams& params,
net::CRLSet* crl_set,
net::CertVerifyResult* verify_result, net::CertVerifyResult* verify_result,
net::CompletionOnceCallback callback, net::CompletionOnceCallback callback,
std::unique_ptr<Request>* out_req, std::unique_ptr<Request>* out_req,
@ -171,13 +169,13 @@ int AtomCertVerifier::Verify(const RequestParams& params,
if (verify_proc_.is_null()) { if (verify_proc_.is_null()) {
ct_delegate_->ClearCTExcludedHostsList(); ct_delegate_->ClearCTExcludedHostsList();
return default_cert_verifier_->Verify( return default_cert_verifier_->Verify(
params, crl_set, verify_result, std::move(callback), out_req, net_log); params, verify_result, std::move(callback), out_req, net_log);
} else { } else {
CertVerifierRequest* request = FindRequest(params); CertVerifierRequest* request = FindRequest(params);
if (!request) { if (!request) {
out_req->reset(); out_req->reset();
auto new_request = std::make_unique<CertVerifierRequest>(params, this); auto new_request = std::make_unique<CertVerifierRequest>(params, this);
new_request->Start(crl_set, net_log); new_request->Start(net_log);
request = new_request.get(); request = new_request.get();
*out_req = std::move(new_request); *out_req = std::move(new_request);
inflight_requests_[params] = request; inflight_requests_[params] = request;

1
atom/browser/net/atom_cert_verifier.h
View file

@ -46,7 +46,6 @@ class AtomCertVerifier : public net::CertVerifier {
protected: protected:
// net::CertVerifier: // net::CertVerifier:
int Verify(const RequestParams& params, int Verify(const RequestParams& params,
net::CRLSet* crl_set,
net::CertVerifyResult* verify_result, net::CertVerifyResult* verify_result,
net::CompletionOnceCallback callback, net::CompletionOnceCallback callback,
std::unique_ptr<Request>* out_req, std::unique_ptr<Request>* out_req,