X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/5c19dc3ae3bd8e40a9c028b0deddd50ff337692c..0d4552ce43ff8bf2e8666a9c5c44c3590eb117a8:/OSX/libsecurity_keychain/lib/SecImportExportUtils.cpp?ds=inline

diff --git a/OSX/libsecurity_keychain/lib/SecImportExportUtils.cpp b/OSX/libsecurity_keychain/lib/SecImportExportUtils.cpp
index e0f17768..d89931d8 100644
--- a/OSX/libsecurity_keychain/lib/SecImportExportUtils.cpp
+++ b/OSX/libsecurity_keychain/lib/SecImportExportUtils.cpp
@@ -26,9 +26,10 @@
 #include "SecImportExportUtils.h"
 #include "SecImportExportAgg.h"
 #include "SecImportExportCrypto.h"
-#include "SecIdentityPriv.h"
-#include "SecItem.h"
+#include <Security/SecIdentityPriv.h>
+#include <Security/SecItem.h>
 #include <security_cdsa_utils/cuCdsaUtils.h>
+#include <security_utilities/casts.h>
 #include <Security/SecBase.h>
 #pragma mark --- Debug support ---
 
@@ -504,7 +505,7 @@ bool impExpImportGuessByExamination(
 		}
 		CSSM_HANDLE cacheHand;
 		CSSM_RETURN crtn;
-		CSSM_DATA cdata = { CFDataGetLength(inData),
+		CSSM_DATA cdata = { int_cast<CFIndex,CSSM_SIZE>(CFDataGetLength(inData)),
 						    (uint8 *)CFDataGetBytePtr(inData) };
 		crtn = CSSM_CL_CertCache(clHand, &cdata, &cacheHand);
 		bool brtn = false;
@@ -759,6 +760,7 @@ static CSSM_RETURN impExpCreatePassKey(
 		&ccHand);
 	if(crtn) {
 		SecImpExpDbg("impExpCreatePassKey: CSSM_CSP_CreateKeyGenContext error");
+		free(ourKey);
 		return crtn;
 	}
 	/* subsequent errors to errOut: */