Use SecItemImport instead of SecKeychainItemImport

runtime/bin/secure_socket_macos.cc

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_MACOS)
 
 #include "bin/secure_socket.h"
 #include "bin/secure_socket_macos.h"
 
@@ skipping 517 matching lines @@
 
 static OSStatus TryPEMImport(CFDataRef cfdata,
                              CFStringRef password,
                              CFArrayRef* out_certs,
                              SecKeyRef* out_key) {
   OSStatus status = noErr;
 
   SecExternalFormat format = kSecFormatPEMSequence;
   SecExternalItemType sitem_type = kSecItemTypeAggregate;
 
-  SecKeyImportExportParameters params;
+  SecItemImportExportKeyParameters params;
   memset(&params, 0, sizeof(params));
   params.version = SEC_KEY_IMPORT_EXPORT_PARAMS_VERSION;
   params.flags = kSecKeyNoAccessControl;
   params.passphrase = password;
-  params.keyAttributes = CSSM_KEYATTR_EXTRACTABLE;
 
   CFArrayRef items = NULL;
-  status = SecKeychainItemImport(
+  status = SecItemImport(
       cfdata, NULL, &format, &sitem_type, 0, &params, NULL, &items);
 
   if (status != noErr) {
     if (SSL_LOG_CERTS) {
       Log::Print("TrySecItemImport failed with: %ld, type = %d, format = %d\n",
           static_cast<intptr_t>(status), sitem_type, format);
     }
     return status;
   }
 
@@ skipping 66 matching lines @@
 static OSStatus TryPKCS12Import(CFDataRef cfdata,
                                 CFStringRef password,
                                 CFArrayRef* out_certs,
                                 SecKeyRef* out_key,
                                 SecKeychainRef* out_keychain) {
   OSStatus status = noErr;
 
   SecExternalFormat format = kSecFormatPKCS12;
   SecExternalItemType sitem_type = kSecItemTypeAggregate;
 
-  SecKeyImportExportParameters params;
+  SecItemImportExportKeyParameters params;
   memset(&params, 0, sizeof(params));
   params.version = SEC_KEY_IMPORT_EXPORT_PARAMS_VERSION;
   params.flags = kSecKeyNoAccessControl;
   params.passphrase = password;
-  params.keyAttributes = CSSM_KEYATTR_EXTRACTABLE;
 
   CFArrayRef items = NULL;
   if (SSL_LOG_CERTS) {
     Log::Print("Trying PKCS12 import with: type = %d, format = %d\n",
         sitem_type, format);
   }
 
   // The documentation for SecKeychainItemImport here:
   //
   // https://developer.apple.com/library/mac/documentation/Security/Reference/keychainservices/index.html
@@ skipping 20 matching lines @@
   SecKeychainRef keychain = NULL;
   if (out_key != NULL) {
     ASSERT(out_keychain != NULL);
     status = CreateKeychain(&keychain);
     if (status != noErr) {
       return status;
     }
     *out_keychain = keychain;
   }
 
-  status = SecKeychainItemImport(
+  status = SecItemImport(
       cfdata, NULL, &format, &sitem_type, 0, &params, keychain, &items);
   if (status != noErr) {
     if (SSL_LOG_CERTS) {
       Log::Print("TrySecItemImport failed with: %ld, it = %d, format = %d\n",
           static_cast<intptr_t>(status), sitem_type, format);
     }
     return status;
   }
 
   CFIndex items_length = (items == NULL) ? 0 : CFArrayGetCount(items);
@@ skipping 1377 matching lines @@
     }
   }
   *bytes_processed = static_cast<intptr_t>(bytes);
   return status;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_MACOS)