- Revision
- 248324
- Author
- [email protected]
- Date
- 2019-08-06 15:40:16 -0700 (Tue, 06 Aug 2019)
Log Message
Unreviewed, a build fix after r248319
Use HAVE(DATA_PROTECTION_KEYCHAIN) instead of HAVE_DATA_PROTECTION_KEYCHAIN.
Source/WebKit:
* UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:
(WebKit::LocalAuthenticator::makeCredential):
(WebKit::LocalAuthenticator::continueMakeCredentialAfterUserConsented):
(WebKit::LocalAuthenticator::continueMakeCredentialAfterAttested):
(WebKit::LocalAuthenticator::getAssertion):
(WebKit::LocalAuthenticator::continueGetAssertionAfterUserConsented):
Tools:
* WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
* WebKitTestRunner/cocoa/TestControllerCocoa.mm:
(WTR::TestController::addTestKeyToKeychain):
(WTR::TestController::cleanUpKeychain):
(WTR::TestController::keyExistsInKeychain):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (248323 => 248324)
--- trunk/Source/WebKit/ChangeLog 2019-08-06 22:28:01 UTC (rev 248323)
+++ trunk/Source/WebKit/ChangeLog 2019-08-06 22:40:16 UTC (rev 248324)
@@ -1,5 +1,18 @@
2019-08-06 Jiewen Tan <[email protected]>
+ Unreviewed, a build fix after r248319
+
+ Use HAVE(DATA_PROTECTION_KEYCHAIN) instead of HAVE_DATA_PROTECTION_KEYCHAIN.
+
+ * UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:
+ (WebKit::LocalAuthenticator::makeCredential):
+ (WebKit::LocalAuthenticator::continueMakeCredentialAfterUserConsented):
+ (WebKit::LocalAuthenticator::continueMakeCredentialAfterAttested):
+ (WebKit::LocalAuthenticator::getAssertion):
+ (WebKit::LocalAuthenticator::continueGetAssertionAfterUserConsented):
+
+2019-08-06 Jiewen Tan <[email protected]>
+
Unreviewed, a build fix after r248308
Use kSecUseDataProtectionKeychain for iOS 13 and macOS Catalina or newer.
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm (248323 => 248324)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm 2019-08-06 22:28:01 UTC (rev 248323)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm 2019-08-06 22:40:16 UTC (rev 248324)
@@ -119,7 +119,7 @@
(id)kSecAttrLabel: requestData().creationOptions.rp.id,
(id)kSecReturnAttributes: @YES,
(id)kSecMatchLimit: (id)kSecMatchLimitAll,
-#if HAVE_DATA_PROTECTION_KEYCHAIN
+#if HAVE(DATA_PROTECTION_KEYCHAIN)
(id)kSecUseDataProtectionKeychain: @YES
#else
(id)kSecAttrNoLegacy: @YES
@@ -175,7 +175,7 @@
(id)kSecClass: (id)kSecClassKey,
(id)kSecAttrLabel: requestData().creationOptions.rp.id,
(id)kSecAttrApplicationTag: [NSData dataWithBytes:requestData().creationOptions.user.idVector.data() length:requestData().creationOptions.user.idVector.size()],
-#if HAVE_DATA_PROTECTION_KEYCHAIN
+#if HAVE(DATA_PROTECTION_KEYCHAIN)
(id)kSecUseDataProtectionKeychain: @YES
#else
(id)kSecAttrNoLegacy: @YES
@@ -235,7 +235,7 @@
(id)kSecAttrKeyClass: (id)kSecAttrKeyClassPrivate,
(id)kSecAttrLabel: label,
(id)kSecReturnAttributes: @YES,
-#if HAVE_DATA_PROTECTION_KEYCHAIN
+#if HAVE(DATA_PROTECTION_KEYCHAIN)
(id)kSecUseDataProtectionKeychain: @YES
#else
(id)kSecAttrNoLegacy: @YES
@@ -257,7 +257,7 @@
(id)kSecClass: (id)kSecClassKey,
(id)kSecAttrKeyClass: (id)kSecAttrKeyClassPrivate,
(id)kSecAttrApplicationLabel: nsAttributes[(id)kSecAttrApplicationLabel],
-#if HAVE_DATA_PROTECTION_KEYCHAIN
+#if HAVE(DATA_PROTECTION_KEYCHAIN)
(id)kSecUseDataProtectionKeychain: @YES
#else
(id)kSecAttrNoLegacy: @YES
@@ -364,7 +364,7 @@
(id)kSecAttrLabel: requestData().requestOptions.rpId,
(id)kSecReturnAttributes: @YES,
(id)kSecMatchLimit: (id)kSecMatchLimitAll,
-#if HAVE_DATA_PROTECTION_KEYCHAIN
+#if HAVE(DATA_PROTECTION_KEYCHAIN)
(id)kSecUseDataProtectionKeychain: @YES
#else
(id)kSecAttrNoLegacy: @YES
@@ -447,7 +447,7 @@
(id)kSecAttrApplicationLabel: [NSData dataWithBytes:credentialId.data() length:credentialId.size()],
(id)kSecUseAuthenticationContext: context,
(id)kSecReturnRef: @YES,
-#if HAVE_DATA_PROTECTION_KEYCHAIN
+#if HAVE(DATA_PROTECTION_KEYCHAIN)
(id)kSecUseDataProtectionKeychain: @YES
#else
(id)kSecAttrNoLegacy: @YES
Modified: trunk/Tools/ChangeLog (248323 => 248324)
--- trunk/Tools/ChangeLog 2019-08-06 22:28:01 UTC (rev 248323)
+++ trunk/Tools/ChangeLog 2019-08-06 22:40:16 UTC (rev 248324)
@@ -1,5 +1,17 @@
2019-08-06 Jiewen Tan <[email protected]>
+ Unreviewed, a build fix after r248319
+
+ Use HAVE(DATA_PROTECTION_KEYCHAIN) instead of HAVE_DATA_PROTECTION_KEYCHAIN.
+
+ * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
+ * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+ (WTR::TestController::addTestKeyToKeychain):
+ (WTR::TestController::cleanUpKeychain):
+ (WTR::TestController::keyExistsInKeychain):
+
+2019-08-06 Jiewen Tan <[email protected]>
+
Unreviewed, a build fix after r248308
Use kSecUseDataProtectionKeychain for iOS 13 and macOS Catalina or newer.
Modified: trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (248323 => 248324)
--- trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2019-08-06 22:28:01 UTC (rev 248323)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2019-08-06 22:40:16 UTC (rev 248324)
@@ -348,7 +348,7 @@
(id)kSecClass: (id)kSecClassKey,
(id)kSecAttrLabel: attrLabel,
(id)kSecAttrApplicationTag: adoptNS([[NSData alloc] initWithBase64EncodedString:applicationTagBase64 options:NSDataBase64DecodingIgnoreUnknownCharacters]).get(),
-#if HAVE_DATA_PROTECTION_KEYCHAIN
+#if HAVE(DATA_PROTECTION_KEYCHAIN)
(id)kSecUseDataProtectionKeychain: @YES
#else
(id)kSecAttrNoLegacy: @YES
@@ -363,7 +363,7 @@
NSDictionary* deleteQuery = @{
(id)kSecClass: (id)kSecClassKey,
(id)kSecAttrLabel: attrLabel,
-#if HAVE_DATA_PROTECTION_KEYCHAIN
+#if HAVE(DATA_PROTECTION_KEYCHAIN)
(id)kSecUseDataProtectionKeychain: @YES
#else
(id)kSecAttrNoLegacy: @YES
@@ -379,7 +379,7 @@
(id)kSecAttrKeyClass: (id)kSecAttrKeyClassPrivate,
(id)kSecAttrLabel: attrLabel,
(id)kSecAttrApplicationTag: adoptNS([[NSData alloc] initWithBase64EncodedString:applicationTagBase64 options:NSDataBase64DecodingIgnoreUnknownCharacters]).get(),
-#if HAVE_DATA_PROTECTION_KEYCHAIN
+#if HAVE(DATA_PROTECTION_KEYCHAIN)
(id)kSecUseDataProtectionKeychain: @YES
#else
(id)kSecAttrNoLegacy: @YES
