| Index: net/base/cert_verify_proc_mac.cc
|
| diff --git a/net/base/cert_verify_proc_mac.cc b/net/base/cert_verify_proc_mac.cc
|
| index 49798b5afd00d28dedddb298d21e0bef15ab5bfc..6a38f8ed27ba53e8eaf4d3d86416c37169a2a286 100644
|
| --- a/net/base/cert_verify_proc_mac.cc
|
| +++ b/net/base/cert_verify_proc_mac.cc
|
| @@ -17,6 +17,7 @@
|
| #include "crypto/sha2.h"
|
| #include "net/base/asn1_util.h"
|
| #include "net/base/cert_status_flags.h"
|
| +#include "net/base/cert_verifier.h"
|
| #include "net/base/cert_verify_result.h"
|
| #include "net/base/crl_set.h"
|
| #include "net/base/net_errors.h"
|
| @@ -156,8 +157,7 @@ OSStatus CreateTrustPolicies(const std::string& hostname,
|
| // revocation checking policies and instead respect the application-level
|
| // revocation preference.
|
| status = x509_util::CreateRevocationPolicies(
|
| - (flags & X509Certificate::VERIFY_REV_CHECKING_ENABLED),
|
| - local_policies);
|
| + (flags & CertVerifier::VERIFY_REV_CHECKING_ENABLED), local_policies);
|
| if (status)
|
| return status;
|
|
|
| @@ -380,7 +380,7 @@ int CertVerifyProcMac::VerifyInternal(X509Certificate* cert,
|
| tp_action_data.ActionFlags = CSSM_TP_ACTION_FETCH_CERT_FROM_NET |
|
| CSSM_TP_ACTION_TRUST_SETTINGS;
|
|
|
| - if (flags & X509Certificate::VERIFY_REV_CHECKING_ENABLED) {
|
| + if (flags & CertVerifier::VERIFY_REV_CHECKING_ENABLED) {
|
| // Require a positive result from an OCSP responder or a CRL (or both)
|
| // for every certificate in the chain. The Apple TP automatically
|
| // excludes the self-signed root from this requirement. If a certificate
|
| @@ -533,7 +533,7 @@ int CertVerifyProcMac::VerifyInternal(X509Certificate* cert,
|
| if (IsCertStatusError(verify_result->cert_status))
|
| return MapCertStatusToNetError(verify_result->cert_status);
|
|
|
| - if (flags & X509Certificate::VERIFY_EV_CERT) {
|
| + if (flags & CertVerifier::VERIFY_EV_CERT) {
|
| // Determine the certificate's EV status using SecTrustCopyExtendedResult(),
|
| // which we need to look up because the function wasn't added until
|
| // Mac OS X 10.5.7.
|
|
|