Security-59306.120.7.tar.gz

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

diff --git a/OSX/libsecurity_keychain/lib/IdentityCursor.cpp b/OSX/libsecurity_keychain/lib/IdentityCursor.cpp
index cbee7fa710f1e277f52f832d893e113ad61ce374..519b47c2543c6ae49759fb57a6f8ae3f7089af58 100644 (file)
--- a/OSX/libsecurity_keychain/lib/IdentityCursor.cpp
+++ b/OSX/libsecurity_keychain/lib/IdentityCursor.cpp
@@ -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);
@@ -275,7 +275,7 @@ IdentityCursor::~IdentityCursor() throw()
 {
 }
 
-CFDataRef
+CFDataRef CF_RETURNS_RETAINED
 IdentityCursor::pubKeyHashForSystemIdentity(CFStringRef domain)
 {
        StLock<Mutex>_(mMutex);
@@ -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