Remove CertErrors::Add(); use CertErrors::AddError() instead.

BUG=634443

Review-Url: https://codereview.chromium.org/2341803002
Cr-Commit-Position: refs/heads/master@{#418671}

net/cert/internal/cert_errors.cc

@@ -96,10 +96,6 @@ void CertErrors::Add(CertErrorNodeType node_type,
   AddNode(base::MakeUnique<CertErrorNode>(node_type, id, std::move(params)));
 }
 
-void CertErrors::Add(CertErrorId id) {
-  AddError(id);
-}
-
 void CertErrors::AddError(CertErrorId id,
                           std::unique_ptr<CertErrorParams> params) {
   Add(CertErrorNodeType::TYPE_ERROR, id, std::move(params));

net/cert/internal/cert_errors.h

@@ -24,7 +24,7 @@
 //
 //   * [optional] Child nodes.
 //
-//     Error nodes are arranged in a tree. The parent/child hiearchy is used to
+//     Error nodes are arranged in a tree. The parent/child hierarchy is used to
 //     group errors that share some common state.
 //     For instance during path processing it is useful to group the
 //     errors/warnings that happened while processing certificate "i" as
@@ -125,10 +125,6 @@ class NET_EXPORT CertErrors {
            CertErrorId id,
            std::unique_ptr<CertErrorParams> params);
 
-  // TODO(crbug.com/634443): Eliminate this and use AddError() instead (which
-  // is less ambiguous).
-  void Add(CertErrorId id);
-
   void AddError(CertErrorId id, std::unique_ptr<CertErrorParams> params);
   void AddError(CertErrorId id);
 

net/cert/internal/signature_policy.cc

@@ -36,7 +36,7 @@ bool SignaturePolicy::IsAcceptableCurveForEcdsa(int curve_nid,
       return true;
   }
 
-  errors->Add(kUnacceptableCurveForEcdsa);
+  errors->AddError(kUnacceptableCurveForEcdsa);
   return false;
 }
 
@@ -45,7 +45,7 @@ bool SignaturePolicy::IsAcceptableModulusLengthForRsa(
     CertErrors* errors) const {
   if (modulus_length_bits < 2048) {
     // TODO(crbug.com/634443): Add a parameter for actual modulus size.
-    errors->Add(kRsaModulusLessThan2048);
+    errors->AddError(kRsaModulusLessThan2048);
     return false;
   }
 
@@ -61,7 +61,7 @@ bool SimpleSignaturePolicy::IsAcceptableModulusLengthForRsa(
   if (modulus_length_bits < min_rsa_modulus_length_bits_) {
     // TODO(crbug.com/634443): Add parameters for actual and expected modulus
     //                         size.
-    errors->Add(kRsaModulusTooSmall);
+    errors->AddError(kRsaModulusTooSmall);
     return false;
   }
 

net/cert/internal/verify_certificate_chain.cc

@@ -93,12 +93,12 @@ WARN_UNUSED_RESULT bool VerifyTimeValidity(const ParsedCertificate& cert,
                                            const der::GeneralizedTime time,
                                            CertErrors* errors) {
   if (time < cert.tbs().validity_not_before) {
-    errors->Add(kValidityFailedNotBefore);
+    errors->AddError(kValidityFailedNotBefore);
     return false;
   }
 
   if (cert.tbs().validity_not_after < time) {
-    errors->Add(kValidityFailedNotAfter);
+    errors->AddError(kValidityFailedNotAfter);
     return false;
   }
 
@@ -194,7 +194,7 @@ WARN_UNUSED_RESULT bool BasicCertificateProcessing(
   if (!VerifySignedData(cert.signature_algorithm(), cert.tbs_certificate_tlv(),
                         cert.signature_value(), working_spki, signature_policy,
                         errors)) {
-    errors->Add(kVerifySignedDataFailed);
+    errors->AddError(kVerifySignedDataFailed);
     return false;
   }
 
@@ -209,7 +209,7 @@ WARN_UNUSED_RESULT bool BasicCertificateProcessing(
   // Verify the certificate's issuer name matches the issuing certificate's
   // subject name. (RFC 5280 section 6.1.3 step a.4)
   if (cert.normalized_issuer() != working_normalized_issuer_name) {
-    errors->Add(kSubjectDoesNotMatchIssuer);
+    errors->AddError(kSubjectDoesNotMatchIssuer);
     return false;
   }
 
@@ -221,7 +221,7 @@ WARN_UNUSED_RESULT bool BasicCertificateProcessing(
     for (const NameConstraints* nc : name_constraints_list) {
       if (!nc->IsPermittedCert(cert.normalized_subject(),
                                cert.subject_alt_names())) {
-        errors->Add(kNotPermittedByNameConstraints);
+        errors->AddError(kNotPermittedByNameConstraints);
         return false;
       }
     }
@@ -280,12 +280,12 @@ WARN_UNUSED_RESULT bool PrepareForNextCertificate(
   // This code implicitly rejects non version 3 intermediates, since they
   // can't contain a BasicConstraints extension.
   if (!cert.has_basic_constraints()) {
-    errors->Add(kMissingBasicConstraints);
+    errors->AddError(kMissingBasicConstraints);
     return false;
   }
 
   if (!cert.basic_constraints().is_ca) {
-    errors->Add(kBasicConstraintsIndicatesNotCa);
+    errors->AddError(kBasicConstraintsIndicatesNotCa);
     return false;
   }
 
@@ -296,7 +296,7 @@ WARN_UNUSED_RESULT bool PrepareForNextCertificate(
   //    max_path_length by 1.
   if (!IsSelfIssued(cert)) {
     if (*max_path_length_ptr == 0) {
-      errors->Add(kMaxPathLengthViolated);
+      errors->AddError(kMaxPathLengthViolated);
       return false;
     }
     --(*max_path_length_ptr);
@@ -318,7 +318,7 @@ WARN_UNUSED_RESULT bool PrepareForNextCertificate(
   //    keyCertSign bit is set.
   if (cert.has_key_usage() &&
       !cert.key_usage().AssertsBit(KEY_USAGE_BIT_KEY_CERT_SIGN)) {
-    errors->Add(kKeyCertSignBitNotSet);
+    errors->AddError(kKeyCertSignBitNotSet);
     return false;
   }
 
@@ -376,7 +376,7 @@ WARN_UNUSED_RESULT bool VerifyTargetCertHasConsistentCaBits(
                     cert.key_usage().AssertsBit(KEY_USAGE_BIT_KEY_CERT_SIGN));
     if (!success) {
       // TODO(eroman): Add DER for basic constraints and key usage.
-      errors->Add(kTargetCertInconsistentCaBits);
+      errors->AddError(kTargetCertInconsistentCaBits);
     }
 
     return success;
@@ -493,7 +493,7 @@ bool VerifyCertificateChain(const ParsedCertificateList& certs,
 
   // An empty chain is necessarily invalid.
   if (certs.empty()) {
-    errors->Add(kChainIsEmpty);
+    errors->AddError(kChainIsEmpty);
     return false;
   }
 

net/cert/internal/verify_signed_data.cc

@@ -167,7 +167,7 @@ WARN_UNUSED_RESULT bool ParseRsaKeyFromSpki(const der::Input& public_key_spki,
   unsigned int modulus_length_bits = BN_num_bits(rsa->n);
 
   if (!policy->IsAcceptableModulusLengthForRsa(modulus_length_bits, errors)) {
-    errors->Add(kUnacceptableRsaModulusLength);
+    errors->AddError(kUnacceptableRsaModulusLength);
     return false;
   }
 
@@ -276,7 +276,7 @@ WARN_UNUSED_RESULT bool ParseEcKeyFromSpki(const der::Input& public_key_spki,
   int curve_nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec.get()));
 
   if (!policy->IsAcceptableCurveForEcdsa(curve_nid, errors)) {
-    errors->Add(kUnacceptableEcdsaCurve);
+    errors->AddError(kUnacceptableEcdsaCurve);
     return false;
   }
 
@@ -292,7 +292,7 @@ bool VerifySignedData(const SignatureAlgorithm& signature_algorithm,
                       const SignaturePolicy* policy,
                       CertErrors* errors) {
   if (!policy->IsAcceptableSignatureAlgorithm(signature_algorithm, errors)) {
-    errors->Add(kUnacceptableSignatureAlgorithm);
+    errors->AddError(kUnacceptableSignatureAlgorithm);
     return false;
   }
 
@@ -313,7 +313,7 @@ bool VerifySignedData(const SignatureAlgorithm& signature_algorithm,
 
   if (!DoVerify(signature_algorithm, signed_data, signature_value,
                 public_key.get())) {
-    errors->Add(kSignatureVerificationFailed);
+    errors->AddError(kSignatureVerificationFailed);
     return false;
   }