X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/fa7225c82381bac4432a6edf16f53b5370238d85..refs/heads/master:/OSX/libsecurity_keychain/lib/IdentityCursor.cpp

diff --git a/OSX/libsecurity_keychain/lib/IdentityCursor.cpp b/OSX/libsecurity_keychain/lib/IdentityCursor.cpp
index cbee7fa7..773800c8 100644
--- a/OSX/libsecurity_keychain/lib/IdentityCursor.cpp
+++ b/OSX/libsecurity_keychain/lib/IdentityCursor.cpp
@@ -55,7 +55,7 @@ IdentityCursorPolicyAndID::IdentityCursorPolicyAndID(const StorageManager::Keych
 	}
 }
 
-IdentityCursorPolicyAndID::~IdentityCursorPolicyAndID() throw()
+IdentityCursorPolicyAndID::~IdentityCursorPolicyAndID() _NOEXCEPT
 {
 	if (mPolicy) {
 		CFRelease(mPolicy);
@@ -238,7 +238,7 @@ IdentityCursorPolicyAndID::next(SecPointer<Identity> &identity)
 
 IdentityCursor::IdentityCursor(const StorageManager::KeychainList &searchList, CSSM_KEYUSE keyUsage) :
 	mSearchList(searchList),
-	mKeyCursor(mSearchList, CSSM_DL_DB_RECORD_PRIVATE_KEY, NULL),
+	mKeyCursor(mSearchList, (SecItemClass) CSSM_DL_DB_RECORD_PRIVATE_KEY, NULL),
 	mMutex(Mutex::recursive)
 {
 	StLock<Mutex>_(mMutex);
@@ -271,17 +271,17 @@ IdentityCursor::IdentityCursor(const StorageManager::KeychainList &searchList, C
 		mKeyCursor->add(CSSM_DB_EQUAL, KeySchema::Unwrap, true);
 }
 
-IdentityCursor::~IdentityCursor() throw()
+IdentityCursor::~IdentityCursor() _NOEXCEPT
 {
 }
 
-CFDataRef
+CFDataRef CF_RETURNS_RETAINED
 IdentityCursor::pubKeyHashForSystemIdentity(CFStringRef domain)
 {
 	StLock<Mutex>_(mMutex);
 
     CFDataRef entryValue = nil;
-	auto_ptr<Dictionary> identDict;
+	unique_ptr<Dictionary> identDict;
 	Dictionary* d = Dictionary::CreateDictionary("com.apple.security.systemidentities", Dictionary::US_System);
 	if (d)
 	{
@@ -322,7 +322,7 @@ IdentityCursor::next(SecPointer<Identity> &identity)
 			uniqueId->get(&dbAttributes, NULL);
 			const CssmData &keyHash = dbAttributes[0];
 
-			mCertificateCursor = KCCursor(mSearchList, CSSM_DL_DB_RECORD_X509_CERTIFICATE, NULL);
+			mCertificateCursor = KCCursor(mSearchList, (SecItemClass) CSSM_DL_DB_RECORD_X509_CERTIFICATE, NULL);
 			mCertificateCursor->add(CSSM_DB_EQUAL, Schema::kX509CertificatePublicKeyHash, keyHash);
 
             // if we have entries for the system identities, exclude their public key hashes in the search