Changeset 261148 in webkit


Ignore:
Timestamp:
May 4, 2020 10:10:02 PM (4 years ago)
Author:
Darin Adler
Message:

Remove now-unneeded HAVE(SEC_TRUST_EVALUATE_WITH_ERROR)
​https://bugs.webkit.org/show_bug.cgi?id=211429

Reviewed by Alex Christensen.

Source/WebCore:

  • platform/network/cocoa/ResourceResponseCocoa.mm:

(WebCore::ResourceResponse::platformCertificateInfo const):
Remove HAVE(SEC_TRUST_EVALUATE_WITH_ERROR).

Source/WebKit:

  • UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:

(-[WKFullScreenWindowController _EVOrganizationName]):
Remove HAVE(SEC_TRUST_EVALUATE_WITH_ERROR).

Source/WTF:

  • wtf/PlatformHave.h: Don't set HAVE_SEC_TRUST_EVALUATE_WITH_ERROR.
Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r261110 r261148  
     12020-05-04  Darin Adler  <darin@apple.com>
     2
     3        Remove now-unneeded HAVE(SEC_TRUST_EVALUATE_WITH_ERROR)
     4        https://bugs.webkit.org/show_bug.cgi?id=211429
     5
     6        Reviewed by Alex Christensen.
     7
     8        * wtf/PlatformHave.h: Don't set HAVE_SEC_TRUST_EVALUATE_WITH_ERROR.
     9
    1102020-05-04  Darin Adler  <darin@apple.com>
    211

  • trunk/Source/WTF/wtf/PlatformHave.h

    r261098 r261148  
    544544#endif
    545545
    546 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(WATCHOS) || PLATFORM(APPLETV) || PLATFORM(MACCATALYST)
    547 #define HAVE_SEC_TRUST_EVALUATE_WITH_ERROR 1
    548 #endif
    549 
    550546#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
    551547#define HAVE_SUBVIEWS_IVAR_SPI 1

  • trunk/Source/WebCore/ChangeLog

    r261143 r261148  
     12020-05-04  Darin Adler  <darin@apple.com>
     2
     3        Remove now-unneeded HAVE(SEC_TRUST_EVALUATE_WITH_ERROR)
     4        https://bugs.webkit.org/show_bug.cgi?id=211429
     5
     6        Reviewed by Alex Christensen.
     7
     8        * platform/network/cocoa/ResourceResponseCocoa.mm:
     9        (WebCore::ResourceResponse::platformCertificateInfo const):
     10        Remove HAVE(SEC_TRUST_EVALUATE_WITH_ERROR).
     11
    1122020-05-04  Simon Fraser  <simon.fraser@apple.com>
    213

  • trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm

    r261013 r261148  
    9797
    9898    if (trustResultType == kSecTrustResultInvalid) {
    99 #if HAVE(SEC_TRUST_EVALUATE_WITH_ERROR)
    10099        if (!SecTrustEvaluateWithError(trust, nullptr))
    101100            return { };
    102 #else
    103         result = SecTrustEvaluate(trust, &trustResultType);
    104         if (result != errSecSuccess)
    105             return { };
    106 #endif
    107101    }
    108102

  • trunk/Source/WebKit/ChangeLog

    r261146 r261148  
     12020-05-04  Darin Adler  <darin@apple.com>
     2
     3        Remove now-unneeded HAVE(SEC_TRUST_EVALUATE_WITH_ERROR)
     4        https://bugs.webkit.org/show_bug.cgi?id=211429
     5
     6        Reviewed by Alex Christensen.
     7
     8        * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
     9        (-[WKFullScreenWindowController _EVOrganizationName]):
     10        Remove HAVE(SEC_TRUST_EVALUATE_WITH_ERROR).
     11
    1122020-05-04  Kate Cheney  <katherine_cheney@apple.com>
    213

  • trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm

    r260150 r261148  
    936936    // and the only way to get the information we need is to call SecTrustEvaluate ourselves.
    937937    if (!infoDictionary) {
    938 #if HAVE(SEC_TRUST_EVALUATE_WITH_ERROR)
    939938        if (!SecTrustEvaluateWithError(trust, nullptr))
    940939            return nil;
    941 #else
    942         SecTrustResultType result = kSecTrustResultProceed;
    943         OSStatus err = SecTrustEvaluate(trust, &result);
    944         if (err != noErr)
    945             return nil;
    946 #endif
    947940        infoDictionary = CFBridgingRelease(SecTrustCopyInfo(trust));
    948941        if (!infoDictionary)
Note: See TracChangeset for help on using the changeset viewer.