Allow the TrustStore interface to return matching intermediates, and identify distrusted certs.

net/cert/internal/trust_store_collection_unittest.cc

 // Copyright 2016 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/trust_store_collection.h"
 
 #include "net/cert/internal/test_helpers.h"
 #include "net/cert/internal/trust_store_in_memory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 41 matching lines @@
   scoped_refptr<TrustAnchor> newroot_;
   scoped_refptr<TrustAnchor> newrootrollover_;
 
   scoped_refptr<ParsedCertificate> target_;
   scoped_refptr<ParsedCertificate> oldintermediate_;
   scoped_refptr<ParsedCertificate> newintermediate_;
 };
 
 // Collection contains no stores, should return no results.
 TEST_F(TrustStoreCollectionTest, NoStores) {
-  TrustAnchors matches;
+  TrustAnchors anchors;
+  ParsedCertificateList intermediates;
 
   TrustStoreCollection collection;
-  collection.FindTrustAnchorsForCert(target_, &matches);
+  collection.FindIssuers(target_, &anchors, &intermediates);
 
-  EXPECT_TRUE(matches.empty());
+  EXPECT_TRUE(anchors.empty());
+  EXPECT_TRUE(intermediates.empty());
 }
 
 // Collection contains only one store.
 TEST_F(TrustStoreCollectionTest, OneStore) {
-  TrustAnchors matches;
+  TrustAnchors anchors;
+  ParsedCertificateList intermediates;
 
   TrustStoreCollection collection;
   TrustStoreInMemory in_memory;
   in_memory.AddTrustAnchor(newroot_);
   collection.AddTrustStore(&in_memory);
-  collection.FindTrustAnchorsForCert(newintermediate_, &matches);
+  collection.FindIssuers(newintermediate_, &anchors, &intermediates);

[mattm, 2017/04/20 03:19:07]

These tests should all check the returned intermediates too.

 
-  ASSERT_EQ(1U, matches.size());
-  EXPECT_EQ(newroot_, matches[0]);
+  ASSERT_EQ(1U, anchors.size());
+  EXPECT_EQ(newroot_, anchors[0]);
+}
+
+// LookupCert() should append to its output parameters rather than assign them.
+TEST_F(TrustStoreCollectionTest, OutputVectorsAppendedTo) {
+  TrustAnchors anchors;
+  ParsedCertificateList intermediates;
+
+  // Populate the out-parameters with some values.
+  anchors.resize(3);
+  intermediates.resize(5);
+
+  TrustStoreCollection collection;
+  TrustStoreInMemory in_memory;
+  in_memory.AddTrustAnchor(newroot_);
+  collection.AddTrustStore(&in_memory);
+  collection.FindIssuers(newintermediate_, &anchors, &intermediates);
+
+  ASSERT_EQ(4U, anchors.size());
+  EXPECT_EQ(newroot_, anchors[3]);
 }
 
 // Collection contains two stores.
 TEST_F(TrustStoreCollectionTest, TwoStores) {
-  TrustAnchors matches;
+  TrustAnchors anchors;
+  ParsedCertificateList intermediates;
 
   TrustStoreCollection collection;
   TrustStoreInMemory in_memory1;
   TrustStoreInMemory in_memory2;
   in_memory1.AddTrustAnchor(newroot_);
   in_memory2.AddTrustAnchor(oldroot_);
   collection.AddTrustStore(&in_memory1);
   collection.AddTrustStore(&in_memory2);
-  collection.FindTrustAnchorsForCert(newintermediate_, &matches);
+  collection.FindIssuers(newintermediate_, &anchors, &intermediates);
 
-  ASSERT_EQ(2U, matches.size());
-  EXPECT_EQ(newroot_, matches[0]);
-  EXPECT_EQ(oldroot_, matches[1]);
+  ASSERT_EQ(2U, anchors.size());
+  EXPECT_EQ(newroot_, anchors[0]);
+  EXPECT_EQ(oldroot_, anchors[1]);
 }
 
 }  // namespace
 
 }  // namespace net