| Index: net/cert/cert_verify_proc.cc
|
| diff --git a/net/cert/cert_verify_proc.cc b/net/cert/cert_verify_proc.cc
|
| index a32173c9162258146d820924a210061596277a12..4b1afadae749f590f7bd68ebfa3112cf0f32744e 100644
|
| --- a/net/cert/cert_verify_proc.cc
|
| +++ b/net/cert/cert_verify_proc.cc
|
| @@ -15,13 +15,13 @@
|
| #include "base/strings/stringprintf.h"
|
| #include "base/time/time.h"
|
| #include "build/build_config.h"
|
| +#include "crypto/sha2.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
|
| #include "net/base/url_util.h"
|
| #include "net/cert/asn1_util.h"
|
| #include "net/cert/cert_status_flags.h"
|
| #include "net/cert/cert_verifier.h"
|
| -#include "net/cert/cert_verify_proc_whitelist.h"
|
| #include "net/cert/cert_verify_result.h"
|
| #include "net/cert/crl_set.h"
|
| #include "net/cert/internal/parse_ocsp.h"
|
| @@ -582,12 +582,6 @@ int CertVerifyProc::Verify(X509Certificate* cert,
|
| rv = MapCertStatusToNetError(verify_result->cert_status);
|
| }
|
|
|
| - if (IsNonWhitelistedCertificate(*verify_result->verified_cert,
|
| - verify_result->public_key_hashes, hostname)) {
|
| - verify_result->cert_status |= CERT_STATUS_AUTHORITY_INVALID;
|
| - rv = MapCertStatusToNetError(verify_result->cert_status);
|
| - }
|
| -
|
| // Check for weak keys in the entire verified chain.
|
| bool weak_key = ExaminePublicKeys(verify_result->verified_cert,
|
| verify_result->is_issued_by_known_root);
|
|
|