runtime/bin/secure_socket_macos.cc - Issue 1820183002: Use SecItemImport instead of SecKeychainItemImport

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: runtime/bin/secure_socket_macos.cc

Issue 1820183002: Use SecItemImport instead of SecKeychainItemImport (Closed) Base URL: git@github.com:dart-lang/sdk.git@master

Patch Set: Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: runtime/bin/secure_socket_macos.cc

diff --git a/runtime/bin/secure_socket_macos.cc b/runtime/bin/secure_socket_macos.cc

index 7b0dbd42c450f90f770022be21a4387a54b15874..53c9ae78889340d9a027f4eefc3365e29ee1e549 100644

--- a/runtime/bin/secure_socket_macos.cc

+++ b/runtime/bin/secure_socket_macos.cc

@@ -535,15 +535,14 @@ static OSStatus TryPEMImport(CFDataRef cfdata,

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) {

@@ -630,12 +629,11 @@ static OSStatus TryPKCS12Import(CFDataRef cfdata,

SecExternalFormat format = kSecFormatPKCS12;