Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / lib / SecImportExportCrypto.cpp

diff --git a/OSX/libsecurity_keychain/lib/SecImportExportCrypto.cpp b/OSX/libsecurity_keychain/lib/SecImportExportCrypto.cpp
index 71a4b3158a520697da754c1f1a89d57eea14b737..f3cf841e36a83ba8fb032eb3da01ae7c160dc6f2 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecImportExportCrypto.cpp
+++ b/OSX/libsecurity_keychain/lib/SecImportExportCrypto.cpp
@@ -25,7 +25,7 @@
  *                                                        keys.
  */
 
  *                                                        keys.
  */
 

-#include "SecImportExport.h"
+#include <Security/SecImportExport.h>

 #include "SecImportExportCrypto.h"
 #include "SecImportExportUtils.h"
 #include "Keychains.h"
 #include "SecImportExportCrypto.h"
 #include "SecImportExportUtils.h"
 #include "Keychains.h"


@@ -41,6 +41,7 @@
 #include <security_cdsa_client/securestorage.h>
 #include <security_cdsa_client/dlclient.h>
 #include <Security/cssmapi.h>
 #include <security_cdsa_client/securestorage.h>
 #include <security_cdsa_client/dlclient.h>
 #include <Security/cssmapi.h>

+#include <security_keychain/KeyItem.h>

 
 /*
  * Key attrribute names and values.
 
 /*
  * Key attrribute names and values.


@@ -562,8 +563,14 @@ OSStatus impExpImportKeyCommon(
                        KeychainCore::Access::required(accessRef) :
                        new KeychainCore::Access("Imported Private Key"));
                try {
                        KeychainCore::Access::required(accessRef) :
                        new KeychainCore::Access("Imported Private Key"));
                try {

-                       CssmClient::KeyAclBearer bearer(cspHand, unwrappedKey, Allocator::standard());
-                       theAccess->setAccess(bearer, maker);
+            if(secKeyRef != NULL) {
+                // setAccess using the new secKeyRef, not the old unwrappedKey.
+                // At this point, we might have duplicate keys registered with securityd. Use the newest one.
+                theAccess->setAccess(*KeyItem::required(secKeyRef)->key(), maker);
+            } else {
+                CssmClient::KeyAclBearer bearer(cspHand, unwrappedKey, Allocator::standard());
+                theAccess->setAccess(bearer, maker);
+            }

                }
                catch (const CssmError &e) {
                        /* not implemented means we're talking to the raw CSP which does
                }
                catch (const CssmError &e) {
                        /* not implemented means we're talking to the raw CSP which does