Add X509CertificateBytes which uses CRYPTO_BUFFER instead of macOS-native certificate types.

net/ssl/ssl_platform_key_mac_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/ssl/ssl_platform_key_mac.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Security/SecCertificate.h>
 #include <Security/SecImportExport.h>
 #include <Security/SecKeychain.h>
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/ref_counted.h"
+#include "net/cert/x509_util_mac.h"
 #include "net/ssl/ssl_private_key.h"
 #include "net/ssl/ssl_private_key_test_util.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/test_data_directory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/boringssl/src/include/openssl/bytestring.h"
 #include "third_party/boringssl/src/include/openssl/ec_key.h"
 #include "third_party/boringssl/src/include/openssl/evp.h"
 #include "third_party/boringssl/src/include/openssl/mem.h"
 #include "third_party/boringssl/src/include/openssl/rsa.h"
@@ skipping 40 matching lines @@
   base::ScopedTempDir keychain_dir;
   ASSERT_TRUE(keychain_dir.CreateUniqueTempDir());
   base::FilePath keychain_path =
       keychain_dir.GetPath().AppendASCII("test_keychain.keychain");
   base::ScopedCFTypeRef<SecKeychainRef> keychain;
   ASSERT_EQ(noErr,
             SecKeychainCreate(keychain_path.value().c_str(), 0, "", FALSE,
                               nullptr, keychain.InitializeInto()));
 
   // Insert the certificate into the keychain.
-  ASSERT_EQ(noErr,
-            SecCertificateAddToKeychain(cert->os_cert_handle(), keychain));
+  base::ScopedCFTypeRef<SecCertificateRef> sec_cert(
+      x509_util::CreateSecCertificateFromX509Certificate(cert.get()));
+  ASSERT_TRUE(sec_cert);
+  ASSERT_EQ(noErr, SecCertificateAddToKeychain(sec_cert, keychain));
 
   // Import the key into the keychain. Apple doesn't accept unencrypted PKCS#8,
   // but it accepts the low-level RSAPrivateKey and ECPrivateKey types as
   // "kSecFormatOpenSSL", so produce those. There doesn't appear to be a way to
   // tell it which key type we have, so leave this unspecified and have it
   // guess.
   CBS cbs;
   CBS_init(&cbs, reinterpret_cast<const uint8_t*>(pkcs8.data()), pkcs8.size());
   bssl::UniquePtr<EVP_PKEY> openssl_key(EVP_parse_private_key(&cbs));
   ASSERT_TRUE(openssl_key);
@@ skipping 37 matching lines @@
 
   TestSSLPrivateKeyMatches(key.get(), pkcs8);
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         SSLPlatformKeyMacTest,
                         testing::ValuesIn(kTestKeys),
                         TestKeyToString);
 
 }  // namespace net