Security-57740.1.18.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / lib / SecKeychainPriv.h

diff --git a/OSX/libsecurity_keychain/lib/SecKeychainPriv.h b/OSX/libsecurity_keychain/lib/SecKeychainPriv.h
index e9650f9695bd8d1cdd4e2c0cd274908baefe12ec..d504b4a1eaf76ea725f23263c2fe9ae3c783ae22 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecKeychainPriv.h
+++ b/OSX/libsecurity_keychain/lib/SecKeychainPriv.h
@@ -114,10 +114,26 @@ OSStatus SecKeychainSystemKeychainCheckWouldDeadlock()
     __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_NA);
 OSStatus SecKeychainStoreUnlockKey(SecKeychainRef userKeychainRef, SecKeychainRef systemKeychainRef, CFStringRef username, CFStringRef password)
     __OSX_AVAILABLE_STARTING(__MAC_10_10, __IPHONE_NA);
     __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_NA);
 OSStatus SecKeychainStoreUnlockKey(SecKeychainRef userKeychainRef, SecKeychainRef systemKeychainRef, CFStringRef username, CFStringRef password)
     __OSX_AVAILABLE_STARTING(__MAC_10_10, __IPHONE_NA);

+OSStatus SecKeychainEraseUnlockKey(SecKeychainRef systemKeychainRef, CFStringRef username)
+    __OSX_AVAILABLE_STARTING(__MAC_10_12, __IPHONE_NA);

 
 

+/* Token login support */
+OSStatus SecKeychainStoreUnlockKeyWithPubKeyHash(CFDataRef pubKeyHash, CFStringRef tokenID, CFDataRef wrapPubKeyHash, SecKeychainRef userKeychain, CFStringRef password)
+    __OSX_AVAILABLE_STARTING(__MAC_10_12, __IPHONE_NA);
+OSStatus SecKeychainEraseUnlockKeyWithPubKeyHash(CFDataRef pubKeyHash)
+    __OSX_AVAILABLE_STARTING(__MAC_10_12, __IPHONE_NA);
+
+/* calls to interact with keychain versions */

 OSStatus SecKeychainGetKeychainVersion(SecKeychainRef keychain, UInt32* version)
     __OSX_AVAILABLE_STARTING(__MAC_10_11, __IPHONE_NA);
 
 OSStatus SecKeychainGetKeychainVersion(SecKeychainRef keychain, UInt32* version)
     __OSX_AVAILABLE_STARTING(__MAC_10_11, __IPHONE_NA);
 

+OSStatus SecKeychainAttemptMigrationWithMasterKey(SecKeychainRef keychain, UInt32 version, const char* masterKeyFilename)
+    __OSX_AVAILABLE_STARTING(__MAC_10_11, __IPHONE_NA);
+
+/* calls for testing only */
+OSStatus SecKeychainGetUserPromptAttempts(uint32_t* attempts)
+    __OSX_AVAILABLE_STARTING(__MAC_10_12, __IPHONE_NA);
+

 /*!
  @function SecKeychainMDSInstall
  Set up MDS.
 /*!
  @function SecKeychainMDSInstall
  Set up MDS.