Changeset 248324 in webkit


Ignore:
Timestamp:
Aug 6, 2019 3:40:16 PM (5 years ago)
Author:
jiewen_tan@apple.com
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):

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r248319 r248324  
     12019-08-06  Jiewen Tan  <jiewen_tan@apple.com>
     2
     3        Unreviewed, a build fix after r248319
     4
     5        Use HAVE(DATA_PROTECTION_KEYCHAIN) instead of HAVE_DATA_PROTECTION_KEYCHAIN.
     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
    1142019-08-06  Jiewen Tan  <jiewen_tan@apple.com>
    215

  • trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm

    r248319 r248324  
    120120            (id)kSecReturnAttributes: @YES,
    121121            (id)kSecMatchLimit: (id)kSecMatchLimitAll,
    122 #if HAVE_DATA_PROTECTION_KEYCHAIN
     122#if HAVE(DATA_PROTECTION_KEYCHAIN)
    123123            (id)kSecUseDataProtectionKeychain: @YES
    124124#else
    … …  
    176176        (id)kSecAttrLabel: requestData().creationOptions.rp.id,
    177177        (id)kSecAttrApplicationTag: [NSData dataWithBytes:requestData().creationOptions.user.idVector.data() length:requestData().creationOptions.user.idVector.size()],
    178 #if HAVE_DATA_PROTECTION_KEYCHAIN
     178#if HAVE(DATA_PROTECTION_KEYCHAIN)
    179179        (id)kSecUseDataProtectionKeychain: @YES
    180180#else
    … …  
    236236            (id)kSecAttrLabel: label,
    237237            (id)kSecReturnAttributes: @YES,
    238 #if HAVE_DATA_PROTECTION_KEYCHAIN
     238#if HAVE(DATA_PROTECTION_KEYCHAIN)
    239239            (id)kSecUseDataProtectionKeychain: @YES
    240240#else
    … …  
    258258            (id)kSecAttrKeyClass: (id)kSecAttrKeyClassPrivate,
    259259            (id)kSecAttrApplicationLabel: nsAttributes[(id)kSecAttrApplicationLabel],
    260 #if HAVE_DATA_PROTECTION_KEYCHAIN
     260#if HAVE(DATA_PROTECTION_KEYCHAIN)
    261261            (id)kSecUseDataProtectionKeychain: @YES
    262262#else
    … …  
    365365        (id)kSecReturnAttributes: @YES,
    366366        (id)kSecMatchLimit: (id)kSecMatchLimitAll,
    367 #if HAVE_DATA_PROTECTION_KEYCHAIN
     367#if HAVE(DATA_PROTECTION_KEYCHAIN)
    368368        (id)kSecUseDataProtectionKeychain: @YES
    369369#else
    … …  
    448448            (id)kSecUseAuthenticationContext: context,
    449449            (id)kSecReturnRef: @YES,
    450 #if HAVE_DATA_PROTECTION_KEYCHAIN
     450#if HAVE(DATA_PROTECTION_KEYCHAIN)
    451451            (id)kSecUseDataProtectionKeychain: @YES
    452452#else

  • trunk/Tools/ChangeLog

    r248319 r248324  
     12019-08-06  Jiewen Tan  <jiewen_tan@apple.com>
     2
     3        Unreviewed, a build fix after r248319
     4
     5        Use HAVE(DATA_PROTECTION_KEYCHAIN) instead of HAVE_DATA_PROTECTION_KEYCHAIN.
     6
     7        * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
     8        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
     9        (WTR::TestController::addTestKeyToKeychain):
     10        (WTR::TestController::cleanUpKeychain):
     11        (WTR::TestController::keyExistsInKeychain):
     12
    1132019-08-06  Jiewen Tan  <jiewen_tan@apple.com>
    214

  • trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm

    r248319 r248324  
    349349        (id)kSecAttrLabel: attrLabel,
    350350        (id)kSecAttrApplicationTag: adoptNS([[NSData alloc] initWithBase64EncodedString:applicationTagBase64 options:NSDataBase64DecodingIgnoreUnknownCharacters]).get(),
    351 #if HAVE_DATA_PROTECTION_KEYCHAIN
     351#if HAVE(DATA_PROTECTION_KEYCHAIN)
    352352        (id)kSecUseDataProtectionKeychain: @YES
    353353#else
    … …  
    364364        (id)kSecClass: (id)kSecClassKey,
    365365        (id)kSecAttrLabel: attrLabel,
    366 #if HAVE_DATA_PROTECTION_KEYCHAIN
     366#if HAVE(DATA_PROTECTION_KEYCHAIN)
    367367        (id)kSecUseDataProtectionKeychain: @YES
    368368#else
    … …  
    380380        (id)kSecAttrLabel: attrLabel,
    381381        (id)kSecAttrApplicationTag: adoptNS([[NSData alloc] initWithBase64EncodedString:applicationTagBase64 options:NSDataBase64DecodingIgnoreUnknownCharacters]).get(),
    382 #if HAVE_DATA_PROTECTION_KEYCHAIN
     382#if HAVE(DATA_PROTECTION_KEYCHAIN)
    383383        (id)kSecUseDataProtectionKeychain: @YES
    384384#else
Note: See TracChangeset for help on using the changeset viewer.