CertVerifyProcMac: Add Keychain re-ordering hack, check CRLsets in path pruning loop.

net/cert/test_keychain_search_list_mac.h

Index: net/cert/test_keychain_search_list_mac.h
diff --git a/net/cert/test_keychain_search_list_mac.h b/net/cert/test_keychain_search_list_mac.h
new file mode 100644
index 0000000000000000000000000000000000000000..d0faffdbf54e4b0d19d6edc8fe96f7257fe91b9e
--- /dev/null
+++ b/net/cert/test_keychain_search_list_mac.h
@@ -0,0 +1,46 @@
+// 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.
+
+#ifndef NET_CERT_KEYCHAIN_SEARCH_LIST_MAC_H_
+#define NET_CERT_KEYCHAIN_SEARCH_LIST_MAC_H_
+
+#include <CoreServices/CoreServices.h>
+#include <Security/Security.h>
+
+#include "base/mac/scoped_cftyperef.h"
+#include "net/base/net_export.h"
+
+namespace net {
+
+class NET_EXPORT TestKeychainSearchList {

[Ryan Sleevi, 2016/06/30 01:50:00]

For this, do we need a dedicated class? Or can this logic be part of
FixupSecTrustRef on the TestRootCerts?

[mattm, 2016/06/30 03:20:53]

The keychain reordering hack in CertVerifyProcMac needs to see the test keychain
list, so I don't see a way to do it. If it wasn't for that it would work.

+ public:
+  ~TestKeychainSearchList();
+
+  // Creates a TestKeychainSearchList, which will be used by HasInstance and
+  // GetInstance.
+  // Only one TestKeychainSearchList object may exist at a time, returns nullptr
+  // if one exists already.
+  static std::unique_ptr<TestKeychainSearchList> Create();
+
+  // Returns true if a TestKeychainSearchList currently exists.
+  static bool HasInstance();
+
+  // Returns the current TestKeychainSearchList instance, if any.
+  static TestKeychainSearchList* GetInstance();
+
+  // Copies the test keychain search list into |keychain_search_list|.
+  OSStatus CopySearchList(CFArrayRef* keychain_search_list) const;
+
+  // Adds |keychain| to the end of the test keychain search list.
+  void AddKeychain(SecKeychainRef keychain);
+
+ private:
+  TestKeychainSearchList();
+
+  base::ScopedCFTypeRef<CFMutableArrayRef> scoped_keychain_search_list;
+};
+
+}  // namespace net
+
+#endif  // NET_CERT_KEYCHAIN_SEARCH_LIST_MAC_H_