Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: net/base/cert_verify_proc_nss.cc

Issue 10855168: Rename X509Certificate::VerifyFlags to CertVerifier::VerifyFlags (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compile fix Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/cert_verify_proc_nss.cc
diff --git a/net/base/cert_verify_proc_nss.cc b/net/base/cert_verify_proc_nss.cc
index 3108555455e1023d385ec0fb621b4d64c7d2f182..5dde718d11c4ce0ac712f770b56d8aba9e080f84 100644
--- a/net/base/cert_verify_proc_nss.cc
+++ b/net/base/cert_verify_proc_nss.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/ev_root_ca_metadata.h"
@@ -642,8 +643,8 @@ bool VerifyEV(CERTCertificate* cert_handle, int flags, CRLSet* crl_set) {
SECStatus status = PKIXVerifyCert(
cert_handle,
- flags & X509Certificate::VERIFY_REV_CHECKING_ENABLED,
- flags & X509Certificate::VERIFY_CERT_IO_ENABLED,
+ flags & CertVerifier::VERIFY_REV_CHECKING_ENABLED,
+ flags & CertVerifier::VERIFY_CERT_IO_ENABLED,
metadata->GetPolicyOIDs(),
metadata->NumPolicyOIDs(),
cvout);
@@ -718,9 +719,9 @@ int CertVerifyProcNSS::VerifyInternal(X509Certificate* cert,
cvout[cvout_index].type = cert_po_end;
ScopedCERTValOutParam scoped_cvout(cvout);
- bool cert_io_enabled = flags & X509Certificate::VERIFY_CERT_IO_ENABLED;
+ bool cert_io_enabled = flags & CertVerifier::VERIFY_CERT_IO_ENABLED;
bool check_revocation =
- (flags & X509Certificate::VERIFY_REV_CHECKING_ENABLED) &&
+ (flags & CertVerifier::VERIFY_REV_CHECKING_ENABLED) &&
cert_io_enabled;
if (check_revocation)
verify_result->cert_status |= CERT_STATUS_REV_CHECKING_ENABLED;
@@ -770,7 +771,7 @@ int CertVerifyProcNSS::VerifyInternal(X509Certificate* cert,
verify_result->is_issued_by_known_root =
IsKnownRoot(cvout[cvout_trust_anchor_index].value.pointer.cert);
- if ((flags & X509Certificate::VERIFY_EV_CERT) &&
+ if ((flags & CertVerifier::VERIFY_EV_CERT) &&
VerifyEV(cert_handle, flags, crl_set)) {
verify_result->cert_status |= CERT_STATUS_IS_EV;
}

Powered by Google App Engine
This is Rietveld 408576698