Add error information to VerifyCertificateChain().

net/cert/internal/test_helpers.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/cert/internal/test_helpers.h"
 
 #include "base/base64.h"
 #include "base/base_paths.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
@@ skipping 86 matching lines @@
     }
   }
 
   return ::testing::AssertionSuccess();
 }
 
 void ReadVerifyCertChainTestFromFile(const std::string& file_name,
                                      ParsedCertificateList* chain,
                                      scoped_refptr<TrustAnchor>* trust_anchor,
                                      der::GeneralizedTime* time,
-                                     bool* verify_result) {
+                                     bool* verify_result,
+                                     std::string* expected_errors) {
   chain->clear();
   *trust_anchor = nullptr;
+  expected_errors->clear();
 
   std::string file_data = ReadTestFileToString(
       std::string("net/data/verify_certificate_chain_unittest/") + file_name);
 
   std::vector<std::string> pem_headers;
 
   // For details on the file format refer to:
   // net/data/verify_certificate_chain_unittest/README.
   const char kCertificateHeader[] = "CERTIFICATE";
   const char kTrustAnchorUnconstrained[] = "TRUST_ANCHOR_UNCONSTRAINED";
   const char kTrustAnchorConstrained[] = "TRUST_ANCHOR_CONSTRAINED";
   const char kTimeHeader[] = "TIME";
   const char kResultHeader[] = "VERIFY_RESULT";
+  const char kErrorsHeader[] = "ERRORS";
 
   pem_headers.push_back(kCertificateHeader);
   pem_headers.push_back(kTrustAnchorUnconstrained);
   pem_headers.push_back(kTrustAnchorConstrained);
   pem_headers.push_back(kTimeHeader);
   pem_headers.push_back(kResultHeader);
+  pem_headers.push_back(kErrorsHeader);
 
   bool has_time = false;
   bool has_result = false;
+  bool has_errors = false;
 
   PEMTokenizer pem_tokenizer(file_data, pem_headers);
   while (pem_tokenizer.GetNext()) {
     const std::string& block_type = pem_tokenizer.block_type();
     const std::string& block_data = pem_tokenizer.data();
 
     if (block_type == kCertificateHeader) {
       ASSERT_TRUE(net::ParsedCertificate::CreateAndAddToVector(
           reinterpret_cast<const uint8_t*>(block_data.data()),
           block_data.size(), net::ParsedCertificate::DataSource::INTERNAL_COPY,
@@ skipping 15 matching lines @@
     } else if (block_type == kTimeHeader) {
       ASSERT_FALSE(has_time) << "Duplicate " << kTimeHeader;
       has_time = true;
       ASSERT_TRUE(der::ParseUTCTime(der::Input(&block_data), time));
     } else if (block_type == kResultHeader) {
       ASSERT_FALSE(has_result) << "Duplicate " << kResultHeader;
       ASSERT_TRUE(block_data == "SUCCESS" || block_data == "FAIL")
           << "Unrecognized result: " << block_data;
       has_result = true;
       *verify_result = block_data == "SUCCESS";
+    } else if (block_type == kErrorsHeader) {
+      ASSERT_FALSE(has_errors) << "Duplicate " << kErrorsHeader;
+      has_errors = true;
+      *expected_errors = block_data;
     }
   }
 
   ASSERT_TRUE(has_time);
   ASSERT_TRUE(has_result);
   ASSERT_TRUE(*trust_anchor);
 }
 
 std::string ReadTestFileToString(const std::string& file_name) {
   // Compute the full path, relative to the src/ directory.
   base::FilePath src_root;
   PathService::Get(base::DIR_SOURCE_ROOT, &src_root);
   base::FilePath filepath = src_root.AppendASCII(file_name);
 
   // Read the full contents of the file.
   std::string file_data;
   if (!base::ReadFileToString(filepath, &file_data)) {
     ADD_FAILURE() << "Couldn't read file: " << filepath.value();
     return std::string();
   }
 
   return file_data;
 }
 
 }  // namespace net