Mercurial > hg > jdk9-shenandoah > jdk
changeset 12729:f98d9515afea
8136425: KeystoreImpl.m using wrong type for cert format
Reviewed-by: vinnie
author | weijun |
---|---|
date | Sun, 13 Sep 2015 10:55:58 +0800 |
parents | b10b64263b56 |
children | 13a89c1302be 298cca968b4f |
files | src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m Fri Sep 11 13:00:20 2015 -0700 +++ b/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m Sun Sep 13 10:55:58 2015 +0800 @@ -508,7 +508,7 @@ SecKeychainRef defaultKeychain = NULL; SecKeychainCopyDefault(&defaultKeychain); - SecExternalItemType dataType = (isCertificate == JNI_TRUE ? kSecFormatX509Cert : kSecFormatWrappedPKCS8); + SecExternalFormat dataFormat = (isCertificate == JNI_TRUE ? kSecFormatX509Cert : kSecFormatWrappedPKCS8); // Convert the password obj into a CFStringRef that the keychain importer can use for encryption. SecKeyImportExportParameters paramBlock; @@ -533,7 +533,7 @@ paramBlock.keyUsage = CSSM_KEYUSE_ANY; paramBlock.keyAttributes = CSSM_KEYATTR_RETURN_DEFAULT; - err = SecKeychainItemImport(cfDataToImport, NULL, &dataType, NULL, + err = SecKeychainItemImport(cfDataToImport, NULL, &dataFormat, NULL, 0, ¶mBlock, defaultKeychain, &createdItems); if (err == noErr) {