Changeset 248319 in webkit
- Timestamp:
- Aug 6, 2019 3:12:48 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r248316 r248319 1 2019-08-06 Jiewen Tan <jiewen_tan@apple.com> 2 3 Unreviewed, a build fix after r248308 4 5 Use kSecUseDataProtectionKeychain for iOS 13 and macOS Catalina or newer. 6 7 * wtf/Platform.h: 8 1 9 2019-08-06 Chris Dumez <cdumez@apple.com> 2 10 -
trunk/Source/WTF/wtf/Platform.h
r248308 r248319 1629 1629 #define HAVE_DEVICE_IDENTITY 1 1630 1630 #endif 1631 1632 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) 1633 #define HAVE_DATA_PROTECTION_KEYCHAIN 1 1634 #endif -
trunk/Source/WebKit/ChangeLog
r248318 r248319 1 2019-08-06 Jiewen Tan <jiewen_tan@apple.com> 2 3 Unreviewed, a build fix after r248308 4 5 Use kSecUseDataProtectionKeychain for iOS 13 and macOS Catalina or newer. 6 7 * UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm: 8 (WebKit::LocalAuthenticator::makeCredential): 9 (WebKit::LocalAuthenticator::continueMakeCredentialAfterUserConsented): 10 (WebKit::LocalAuthenticator::continueMakeCredentialAfterAttested): 11 (WebKit::LocalAuthenticator::getAssertion): 12 (WebKit::LocalAuthenticator::continueGetAssertionAfterUserConsented): 13 1 14 2019-08-06 Chris Dumez <cdumez@apple.com> 2 15 -
trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm
r248318 r248319 120 120 (id)kSecReturnAttributes: @YES, 121 121 (id)kSecMatchLimit: (id)kSecMatchLimitAll, 122 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 122 #if HAVE_DATA_PROTECTION_KEYCHAIN 123 (id)kSecUseDataProtectionKeychain: @YES 124 #else 123 125 (id)kSecAttrNoLegacy: @YES 124 ALLOW_DEPRECATED_DECLARATIONS_END 126 #endif 125 127 }; 126 128 CFTypeRef attributesArrayRef = nullptr; … … 174 176 (id)kSecAttrLabel: requestData().creationOptions.rp.id, 175 177 (id)kSecAttrApplicationTag: [NSData dataWithBytes:requestData().creationOptions.user.idVector.data() length:requestData().creationOptions.user.idVector.size()], 178 #if HAVE_DATA_PROTECTION_KEYCHAIN 179 (id)kSecUseDataProtectionKeychain: @YES 180 #else 176 181 (id)kSecAttrNoLegacy: @YES 182 #endif 177 183 }; 178 184 OSStatus status = SecItemDelete((__bridge CFDictionaryRef)deleteQuery); … … 230 236 (id)kSecAttrLabel: label, 231 237 (id)kSecReturnAttributes: @YES, 238 #if HAVE_DATA_PROTECTION_KEYCHAIN 239 (id)kSecUseDataProtectionKeychain: @YES 240 #else 232 241 (id)kSecAttrNoLegacy: @YES 242 #endif 233 243 }; 234 244 CFTypeRef attributesRef = nullptr; … … 248 258 (id)kSecAttrKeyClass: (id)kSecAttrKeyClassPrivate, 249 259 (id)kSecAttrApplicationLabel: nsAttributes[(id)kSecAttrApplicationLabel], 260 #if HAVE_DATA_PROTECTION_KEYCHAIN 261 (id)kSecUseDataProtectionKeychain: @YES 262 #else 250 263 (id)kSecAttrNoLegacy: @YES 264 #endif 251 265 }; 252 266 NSDictionary *updateParams = @{ … … 351 365 (id)kSecReturnAttributes: @YES, 352 366 (id)kSecMatchLimit: (id)kSecMatchLimitAll, 367 #if HAVE_DATA_PROTECTION_KEYCHAIN 368 (id)kSecUseDataProtectionKeychain: @YES 369 #else 353 370 (id)kSecAttrNoLegacy: @YES 371 #endif 354 372 }; 355 373 CFTypeRef attributesArrayRef = nullptr; … … 430 448 (id)kSecUseAuthenticationContext: context, 431 449 (id)kSecReturnRef: @YES, 450 #if HAVE_DATA_PROTECTION_KEYCHAIN 451 (id)kSecUseDataProtectionKeychain: @YES 452 #else 432 453 (id)kSecAttrNoLegacy: @YES 454 #endif 433 455 }; 434 456 CFTypeRef privateKeyRef = nullptr; -
trunk/Tools/ChangeLog
r248317 r248319 1 2019-08-06 Jiewen Tan <jiewen_tan@apple.com> 2 3 Unreviewed, a build fix after r248308 4 5 Use kSecUseDataProtectionKeychain for iOS 13 and macOS Catalina or newer. 6 7 * WebKitTestRunner/cocoa/TestControllerCocoa.mm: 8 (WTR::TestController::addTestKeyToKeychain): 9 (WTR::TestController::cleanUpKeychain): 10 (WTR::TestController::keyExistsInKeychain): 11 1 12 2019-08-06 Keith Rollin <krollin@apple.com> 2 13 -
trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
r248308 r248319 349 349 (id)kSecAttrLabel: attrLabel, 350 350 (id)kSecAttrApplicationTag: adoptNS([[NSData alloc] initWithBase64EncodedString:applicationTagBase64 options:NSDataBase64DecodingIgnoreUnknownCharacters]).get(), 351 #if HAVE_DATA_PROTECTION_KEYCHAIN 352 (id)kSecUseDataProtectionKeychain: @YES 353 #else 351 354 (id)kSecAttrNoLegacy: @YES 355 #endif 352 356 }; 353 357 OSStatus status = SecItemAdd((__bridge CFDictionaryRef)addQuery, NULL); … … 360 364 (id)kSecClass: (id)kSecClassKey, 361 365 (id)kSecAttrLabel: attrLabel, 366 #if HAVE_DATA_PROTECTION_KEYCHAIN 367 (id)kSecUseDataProtectionKeychain: @YES 368 #else 362 369 (id)kSecAttrNoLegacy: @YES 370 #endif 363 371 }; 364 372 SecItemDelete((__bridge CFDictionaryRef)deleteQuery); … … 372 380 (id)kSecAttrLabel: attrLabel, 373 381 (id)kSecAttrApplicationTag: adoptNS([[NSData alloc] initWithBase64EncodedString:applicationTagBase64 options:NSDataBase64DecodingIgnoreUnknownCharacters]).get(), 382 #if HAVE_DATA_PROTECTION_KEYCHAIN 383 (id)kSecUseDataProtectionKeychain: @YES 384 #else 374 385 (id)kSecAttrNoLegacy: @YES 386 #endif 375 387 }; 376 388 OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)query, NULL);
Note: See TracChangeset
for help on using the changeset viewer.