| Index: net/cert/x509_cert_types.cc
|
| diff --git a/net/cert/x509_cert_types.cc b/net/cert/x509_cert_types.cc
|
| index cfa09923f600e07860df015faf544623746ce4d6..1cb34149764642603d31594281cad0ece9d1463a 100644
|
| --- a/net/cert/x509_cert_types.cc
|
| +++ b/net/cert/x509_cert_types.cc
|
| @@ -27,13 +27,13 @@ int ParseIntAndAdvance(const char** field, size_t field_len, bool* ok) {
|
| *field += field_len;
|
| return result;
|
| }
|
| -
|
| }
|
|
|
| CertPrincipal::CertPrincipal() {
|
| }
|
|
|
| -CertPrincipal::CertPrincipal(const std::string& name) : common_name(name) {}
|
| +CertPrincipal::CertPrincipal(const std::string& name) : common_name(name) {
|
| +}
|
|
|
| CertPrincipal::~CertPrincipal() {
|
| }
|
| @@ -60,8 +60,8 @@ CertPolicy::~CertPolicy() {
|
| // allowance, we consider a given |cert| to be a match to a saved allowed
|
| // cert if the |error| is an exact match to or subset of the errors in the
|
| // saved CertStatus.
|
| -CertPolicy::Judgment CertPolicy::Check(
|
| - X509Certificate* cert, CertStatus error) const {
|
| +CertPolicy::Judgment CertPolicy::Check(X509Certificate* cert,
|
| + CertStatus error) const {
|
| // It shouldn't matter which set we check first, but we check denied first
|
| // in case something strange has happened.
|
| bool denied = false;
|
| @@ -72,8 +72,7 @@ CertPolicy::Judgment CertPolicy::Check(
|
|
|
| std::map<SHA1HashValue, CertStatus, SHA1HashValueLessThan>::const_iterator
|
| allowed_iter = allowed_.find(cert->fingerprint());
|
| - if ((allowed_iter != allowed_.end()) &&
|
| - (allowed_iter->second & error) &&
|
| + if ((allowed_iter != allowed_.end()) && (allowed_iter->second & error) &&
|
| !(~(allowed_iter->second & error) ^ ~error)) {
|
| DCHECK(!denied);
|
| return ALLOWED;
|
| @@ -121,12 +120,12 @@ bool ParseCertificateDate(const base::StringPiece& raw_date,
|
| bool valid = true;
|
| base::Time::Exploded exploded = {0};
|
|
|
| - exploded.year = ParseIntAndAdvance(&field, year_length, &valid);
|
| - exploded.month = ParseIntAndAdvance(&field, 2, &valid);
|
| + exploded.year = ParseIntAndAdvance(&field, year_length, &valid);
|
| + exploded.month = ParseIntAndAdvance(&field, 2, &valid);
|
| exploded.day_of_month = ParseIntAndAdvance(&field, 2, &valid);
|
| - exploded.hour = ParseIntAndAdvance(&field, 2, &valid);
|
| - exploded.minute = ParseIntAndAdvance(&field, 2, &valid);
|
| - exploded.second = ParseIntAndAdvance(&field, 2, &valid);
|
| + exploded.hour = ParseIntAndAdvance(&field, 2, &valid);
|
| + exploded.minute = ParseIntAndAdvance(&field, 2, &valid);
|
| + exploded.second = ParseIntAndAdvance(&field, 2, &valid);
|
| if (valid && year_length == 2)
|
| exploded.year += exploded.year < 50 ? 2000 : 1900;
|
|
|
|
|