Changeset 181134 in webkit


Ignore:
Timestamp:
Mar 5, 2015 8:43:12 PM (9 years ago)
Author:
oliver@apple.com
Message:

Block mixed mode content
​https://bugs.webkit.org/show_bug.cgi?id=142378

Reviewed by Darin Adler.

Source/WebCore:

Switched to blocking mixed mode content by default,
and modify the blocking rules to allow us to match
the behaviours of other browsers.

  • loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::willSendRequest):

  • loader/MixedContentChecker.cpp:

(WebCore::MixedContentChecker::canDisplayInsecureContent):
(WebCore::MixedContentChecker::canRunInsecureContent):
(WebCore::MixedContentChecker::logWarning):

  • loader/MixedContentChecker.h:
  • loader/cache/CachedResourceLoader.cpp:

(WebCore::contentTypeFromResourceType):
(WebCore::CachedResourceLoader::checkInsecureContent):

  • page/Settings.in:

LayoutTests:

Update test results to reflect the new reality.

  • http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt:
  • http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt:
  • http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt:
  • http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt:
  • http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt:
  • http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt:
  • http/tests/security/mixedContent/insecure-xhr-in-main-frame-expected.txt:
  • http/tests/security/mixedContent/insecure-xhr-in-main-frame.html:
  • http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt:
  • http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html:
  • http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt:
  • http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt:
  • http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html:
  • http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt:
  • http/tests/security/mixedContent/resources/frame-with-insecure-frame.html:
  • http/tests/security/mixedContent/resources/frame-with-redirect-http-to-https-frame.html:
  • http/tests/security/mixedContent/resources/frame-with-redirect-https-to-http-frame.html:
  • http/tests/xmlhttprequest/access-control-response-with-body.html:
Location:
trunk
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r181132 r181134  
     12015-03-05  Oliver Hunt  <oliver@apple.com>
     2
     3        Block mixed mode content
     4        https://bugs.webkit.org/show_bug.cgi?id=142378
     5
     6        Reviewed by Darin Adler.
     7
     8        Update test results to reflect the new reality.
     9
     10        * http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt:
     11        * http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt:
     12        * http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt:
     13        * http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt:
     14        * http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt:
     15        * http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt:
     16        * http/tests/security/mixedContent/insecure-xhr-in-main-frame-expected.txt:
     17        * http/tests/security/mixedContent/insecure-xhr-in-main-frame.html:
     18        * http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt:
     19        * http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html:
     20        * http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt:
     21        * http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt:
     22        * http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html:
     23        * http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt:
     24        * http/tests/security/mixedContent/resources/frame-with-insecure-frame.html:
     25        * http/tests/security/mixedContent/resources/frame-with-redirect-http-to-https-frame.html:
     26        * http/tests/security/mixedContent/resources/frame-with-redirect-https-to-http-frame.html:
     27        * http/tests/xmlhttprequest/access-control-response-with-body.html:
     28
    1292015-03-05  Benjamin Poulain  <bpoulain@apple.com>
    230

  • trunk/LayoutTests/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt

    r136657 r181134  
    22main frame - didFinishDocumentLoadForFrame
    33frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
    4 CONSOLE MESSAGE: line 4: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-css.html ran insecure content from http://127.0.0.1:8080/security/mixedContent/resources/style.css.
     4CONSOLE MESSAGE: line 4: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-css.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/style.css.
    55
    6 didRunInsecureContent
    76frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
    87frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame

  • trunk/LayoutTests/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt

    r136657 r181134  
    44main frame - didFinishLoadForFrame
    55main frame - didCommitLoadForFrame
    6 CONSOLE MESSAGE: line 4: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-css.html ran insecure content from http://127.0.0.1:8080/security/mixedContent/resources/style.css.
     6CONSOLE MESSAGE: line 4: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-css.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/style.css.
    77
    8 didRunInsecureContent
    98main frame - didFinishDocumentLoadForFrame
    109main frame - didHandleOnloadEventsForFrame

  • trunk/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt

    r104803 r181134  
    55main frame - didCommitLoadForFrame
    66frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
    7 CONSOLE MESSAGE: The page at about:blank displayed insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html.
     7CONSOLE MESSAGE: [blocked] The page at about:blank was not allowed to display insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html.
    88
    9 didDisplayInsecureContent
     9frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
    1010main frame - didFinishDocumentLoadForFrame
    11 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
    12 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
    13 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
    1411main frame - didHandleOnloadEventsForFrame
    15 frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
    1612main frame - didFinishLoadForFrame
    1713This test opens a window that loads an insecure iframe. We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content.

  • trunk/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt

    r136657 r181134  
    1 CONSOLE MESSAGE: line 1: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image.html displayed insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
     1CONSOLE MESSAGE: line 1: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image.html was allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
    22
    33This test opens a window that loads an insecure image. We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content.

  • trunk/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt

    r178527 r181134  
    1 CONSOLE MESSAGE: line 9: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-plugin.html ran insecure content from http://127.0.0.1:8000/security/mixedContent/resources/dummy.swf.
     1CONSOLE MESSAGE: line 9: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-plugin.html was not allowed to run insecure content from http://127.0.0.1:8000/security/mixedContent/resources/dummy.swf.
    22
    33This test loads a secure iframe that loads an insecure plugin. We should get a mixed content callback because the insecure plug-in can script the secure origin.

  • trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt

    r178648 r181134  
    1 CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-script.html ran insecure content from http://127.0.0.1:8080/security/mixedContent/resources/script.js.
     1CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-script.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/script.js.
    22
    33This test loads a secure iframe that loads an insecure script. We should trigger a mixed content callback even though the main frame is HTTP because the HTTPS frame's origin is contaminated with an insecure script.

  • trunk/LayoutTests/http/tests/security/mixedContent/insecure-xhr-in-main-frame-expected.txt

    r178527 r181134  
    1 CONSOLE MESSAGE: line 26: The page at https://127.0.0.1:8443/xmlhttprequest/access-control-response-with-body.html displayed insecure content from http://localhost:8000/xmlhttprequest/resources/access-control-allow-with-body.php.
    2 
    3 CONSOLE MESSAGE: The page at https://127.0.0.1:8443/xmlhttprequest/access-control-response-with-body.html displayed insecure content from http://localhost:8000/xmlhttprequest/resources/access-control-allow-with-body.php.
     1CONSOLE MESSAGE: line 26: [blocked] The page at https://127.0.0.1:8443/xmlhttprequest/access-control-response-with-body.html was not allowed to display insecure content from http://localhost:8000/xmlhttprequest/resources/access-control-allow-with-body.php.
    42
    53This test opens a HTTPS window that loads insecure data via XHR. We should trigger a mixed content callback because the main frame in the window is HTTPS but now has insecure data.

  • trunk/LayoutTests/http/tests/security/mixedContent/insecure-xhr-in-main-frame.html

    r121297 r181134  
    1212    if (window.testRunner)
    1313        testRunner.notifyDone();
     14    if (e.data == "done")
     15        throw "Should not load this"
    1416}, false);
    1517

  • trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt

    r153915 r181134  
    55main frame - didCommitLoadForFrame
    66frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
    7 CONSOLE MESSAGE: The page at about:blank displayed insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://127.0.0.1:8443/security/mixedContent/resources/boring.html.
     7CONSOLE MESSAGE: [blocked] The page at about:blank was not allowed to display insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://127.0.0.1:8443/security/mixedContent/resources/boring.html.
    88
    9 didDisplayInsecureContent
     9frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
    1010main frame - didFinishDocumentLoadForFrame
    11 frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame
    12 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
    13 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
    14 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
    1511main frame - didHandleOnloadEventsForFrame
    16 frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
    1712main frame - didFinishLoadForFrame
    1813This test opens a window that loads an insecure iframe (via a tricky redirect). We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying content that can be controlled by an active network attacker.

  • trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html

    r120174 r181134  
    1313  if (window.testRunner)
    1414      testRunner.notifyDone();
     15        if (e.data == "done")
     16            throw "should not have loaded insecure content"
    1517}, false);
    1618

  • trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt

    r178648 r181134  
    22main frame - didFinishDocumentLoadForFrame
    33frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
    4 CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-script.html ran insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://127.0.0.1:8443/security/mixedContent/resources/script.js.
     4CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-script.html was not allowed to run insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://127.0.0.1:8443/security/mixedContent/resources/script.js.
    55
    6 didRunInsecureContent
    76frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
    87frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame

  • trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt

    r179336 r181134  
    66frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
    77main frame - didFinishDocumentLoadForFrame
    8 CONSOLE MESSAGE: The page at about:blank displayed insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html.
     8CONSOLE MESSAGE: [blocked] The page at about:blank was not allowed to display insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html.
    99
    10 didDisplayInsecureContent
    11 frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame
    12 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
    13 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
    14 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
    1510main frame - didHandleOnloadEventsForFrame
    16 frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
     11frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
    1712main frame - didFinishLoadForFrame
    1813This test opens a window that loads an insecure iframe (via a tricky redirect). We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying content that can be controlled by an active network attacker.

  • trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html

    r179336 r181134  
    1111
    1212window.addEventListener("message", function (e) {
    13   if (window.testRunner)
    14       testRunner.notifyDone();
     13        if (window.testRunner)
     14                testRunner.notifyDone()
     15        if (e.data == "done")
     16            throw "should not have loaded insecure content"
    1517}, false);
    1618
    … …  
    2325window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-frame.html");
    2426</script>
     27
    2528</body>
    2629</html>

  • trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt

    r104803 r181134  
    22main frame - didFinishDocumentLoadForFrame
    33frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
    4 CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-script.html ran insecure content from http://127.0.0.1:8080/security/mixedContent/resources/script.js.
     4CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-script.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/script.js.
    55
    6 didRunInsecureContent
    76frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
    87frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame

  • trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-frame.html

    r48284 r181134  
    44    window.opener.postMessage('done', '*');
    55}
     6setTimeout(function(){
     7  if (window.opener)
     8    window.opener.postMessage('blocked', '*');
     9}, 100)
    610</script>
    711<iframe onload="frameLoaded()"

  • trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-redirect-http-to-https-frame.html

    r153915 r181134  
    44    window.opener.postMessage('done', '*');
    55}
     6setTimeout(function(){
     7  if (window.opener)
     8    window.opener.postMessage('blocked', '*');
     9}, 100)
    610</script>
    7 <iframe onload="frameLoaded()"
     11<iframe onload="frameLoaded()" onerror="frameLoaded()"
    812        src="http://127.0.0.1:8080/resources/redirect.php?url=https://127.0.0.1:8443/security/mixedContent/resources/boring.html"></iframe>

  • trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-redirect-https-to-http-frame.html

    r153915 r181134  
    44    window.opener.postMessage('done', '*');
    55}
     6
     7setTimeout(function(){
     8  if (window.opener)
     9    window.opener.postMessage('blocked', '*');
     10}, 100)
    611</script>
    7 <iframe onload="frameLoaded()"
     12<iframe onload="frameLoaded()" onerror="frameLoaded()"
    813        src="https://127.0.0.1:8443/resources/redirect.php?url=http://127.0.0.1:8080/security/mixedContent/resources/boring.html"></iframe>

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-response-with-body.html

    r120167 r181134  
    2525       xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
    2626       xhr.send(null);
     27       setTimeout(function(){
     28          if (window.testRunner)
     29              testRunner.notifyDone()
     30       }, 100)
    2731  };
    2832 

  • trunk/LayoutTests/imported/w3c/web-platform-tests/_certs/01.pem

    r179439 r181134  
    33        Version: 3 (0x2)
    44        Serial Number: 1 (0x1)
    5     Signature Algorithm: sha256WithRSAEncryption
     5        Signature Algorithm: sha256WithRSAEncryption
    66        Issuer: CN=web-platform-tests
    77        Validity
    8             Not Before: Jan 27 09:27:40 2015 GMT
    9             Not After : Feb 26 09:27:40 2015 GMT
     8            Not Before: Mar  6 02:47:26 2015 GMT
     9            Not After : Apr  5 02:47:26 2015 GMT
    1010        Subject: CN=web-platform-tests
    1111        Subject Public Key Info:
    1212            Public Key Algorithm: rsaEncryption
    13                 Public-Key: (2048 bit)
    14                 Modulus:
    15                     00:b2:d3:a2:d8:cd:93:82:4f:87:74:4b:35:77:23:
    16                     ef:d4:8b:f8:ad:00:da:cd:66:3f:0f:5d:17:75:44:
    17                     d0:ee:83:ca:8c:73:f4:55:20:a4:92:85:40:e4:a2:
    18                     5f:59:50:75:89:47:50:73:66:d7:40:aa:a3:cb:26:
    19                     ca:0c:b0:94:8e:3f:2e:c7:e2:53:ae:d1:c4:3f:c5:
    20                     d8:54:d7:27:2c:b6:f0:9f:18:06:30:b9:de:c4:3d:
    21                     6d:7b:62:84:f3:5a:39:b4:81:fd:87:f6:d9:cd:15:
    22                     e5:9c:3c:ec:7d:d0:50:e6:9f:4e:c2:75:ca:99:3a:
    23                     a2:4d:85:70:ad:51:d6:13:a4:5d:0e:69:f7:98:3a:
    24                     48:01:86:26:29:f8:8c:be:6b:23:cc:9e:00:c4:11:
    25                     2d:c2:bf:25:e2:12:0a:64:41:ad:a8:37:be:01:a8:
    26                     b7:77:f7:23:71:55:f2:67:30:e1:80:6f:48:ea:e3:
    27                     9a:be:b1:f9:52:0a:d4:38:4b:07:d7:8a:6c:86:54:
    28                     24:e7:01:c8:70:eb:b4:3f:5a:54:57:13:a0:d1:6d:
    29                     8b:a6:9b:bb:60:88:25:a1:f8:ce:7d:05:d6:52:2b:
    30                     6f:f4:14:e1:ed:6c:e4:00:1b:e6:1f:5c:f8:60:a7:
    31                     1e:f7:b7:90:9d:28:93:17:c9:5e:16:ed:9a:e9:68:
    32                     9f:af
     13            RSA Public Key: (2048 bit)
     14                Modulus (2048 bit):
     15                    00:ac:3a:b3:99:0b:ee:23:b3:9e:fb:e1:6e:a5:c5:
     16                    18:d4:1d:22:84:83:f9:52:71:26:a2:a4:e4:7f:c8:
     17                    5d:69:0e:a6:a2:32:44:9f:cf:4b:2f:b2:d0:ca:8e:
     18                    0a:46:93:bf:dc:62:aa:2b:62:59:b2:22:1a:13:0b:
     19                    84:74:68:9e:85:db:4e:1c:53:be:46:89:75:55:42:
     20                    84:f7:54:88:2a:01:fb:6d:af:0e:26:d2:45:69:e8:
     21                    88:7d:f1:b1:60:9a:ec:a1:64:51:9f:82:b2:c3:1c:
     22                    40:68:6b:ef:ba:81:9a:60:2a:66:17:a5:4a:14:fa:
     23                    de:dd:7a:0b:18:08:47:d0:f6:cc:74:b0:db:6c:b2:
     24                    6a:17:ef:ad:72:29:56:db:68:4d:88:e7:d7:b5:d8:
     25                    1d:c6:dd:08:e6:9c:17:1d:8b:bc:78:e3:d5:89:38:
     26                    26:89:f9:ce:cb:ed:b4:46:2d:a5:7f:90:84:a0:66:
     27                    c3:01:e5:96:17:c6:fb:8d:80:a3:22:af:6b:8b:72:
     28                    08:80:cd:7d:33:dc:c3:e8:d9:8d:de:4f:94:e9:70:
     29                    33:03:de:ec:f7:50:d0:e5:52:b4:48:43:bf:fe:fd:
     30                    34:44:7a:ed:a0:9c:c5:d3:51:53:3b:7e:7f:60:f4:
     31                    21:a5:b0:41:df:af:98:2a:05:67:c0:47:48:0e:cb:
     32                    75:55
    3333                Exponent: 65537 (0x10001)
    3434        X509v3 extensions:
    … …  
    3636                CA:TRUE
    3737            X509v3 Subject Key Identifier:
    38                 0E:31:C1:0D:6C:94:E1:F0:D9:8C:C4:E4:A5:DF:FD:1C:CB:3B:CC:58
     38                A8:E4:4B:32:2E:48:E8:EC:5C:0E:40:F9:9D:C6:B0:D0:59:1E:86:23
    3939            X509v3 Authority Key Identifier:
    40                 keyid:0E:31:C1:0D:6C:94:E1:F0:D9:8C:C4:E4:A5:DF:FD:1C:CB:3B:CC:58
     40                keyid:A8:E4:4B:32:2E:48:E8:EC:5C:0E:40:F9:9D:C6:B0:D0:59:1E:86:23
    4141                DirName:/CN=web-platform-tests
    4242                serial:01
    … …  
    4747                TLS Web Server Authentication
    4848    Signature Algorithm: sha256WithRSAEncryption
    49          32:a7:f6:ff:bd:ce:59:2c:93:94:e9:a1:57:87:7c:01:82:20:
    50          d6:25:6a:09:05:f6:74:d5:3f:37:78:a9:f9:5c:f6:3c:14:e6:
    51          5c:1e:96:74:9e:46:b8:5f:3b:88:bc:18:3c:c4:f6:68:e0:79:
    52          92:55:7c:c9:5b:b2:88:1e:77:54:ad:bc:e3:43:cb:2c:4c:f2:
    53          04:4d:06:b4:b2:1b:32:07:06:de:e8:b6:d1:fb:c6:b2:c5:45:
    54          fa:30:46:df:49:22:a8:ea:c5:0c:a1:ee:c2:fc:29:49:12:89:
    55          76:44:2f:92:53:cf:d3:5c:a0:3a:82:99:cd:1e:47:2f:98:2a:
    56          eb:64:98:db:b5:94:4f:cf:1c:0f:88:cb:fb:98:7a:cd:a7:5d:
    57          2d:57:99:4d:52:65:49:c8:9a:da:59:f3:d0:d3:75:c9:1b:9c:
    58          c6:8d:8a:f1:d5:29:63:f4:53:00:81:e0:19:8c:89:f3:f9:02:
    59          ad:44:48:0e:cd:fd:66:79:fc:25:c0:07:07:86:1c:24:98:37:
    60          72:fc:74:b5:7f:12:cd:08:27:70:d1:ce:01:01:01:16:ea:4b:
    61          bf:dd:3a:65:77:31:20:db:9e:1f:82:ae:ac:9c:5b:47:0e:b2:
    62          41:c0:b2:82:ba:59:aa:94:b8:c1:31:f5:07:56:76:94:60:f5:
    63          64:13:48:52
     49        95:42:33:cb:e6:60:1c:18:0d:ba:58:5a:77:f6:12:fb:d2:42:
     50        6a:58:ff:cc:33:93:bd:26:4f:c0:c5:09:62:34:16:25:e5:ea:
     51        6f:ce:c7:f9:c6:cd:f1:c3:cd:6d:80:93:1d:7f:80:a3:09:ca:
     52        bc:b9:64:29:02:e7:e4:b4:96:6d:9e:a6:4c:4c:18:67:42:a6:
     53        a2:b7:05:8f:f5:5f:af:13:8d:96:26:db:d5:73:b9:32:0e:61:
     54        99:73:3d:2e:8e:e4:fc:12:4d:9c:d9:3e:52:05:be:5b:cb:25:
     55        60:cd:4a:36:dd:de:75:f7:42:a5:eb:f1:3c:d7:d0:b8:f5:7f:
     56        09:c7:19:73:fe:5e:ba:20:31:27:70:78:c6:3a:fc:27:7f:90:
     57        8f:2c:2f:ea:a0:2b:60:f1:e5:d2:80:15:b0:0f:df:9f:80:5f:
     58        96:7f:13:21:31:be:48:28:d6:cf:47:f3:7c:61:e8:d8:db:82:
     59        4e:b4:19:fd:f8:cf:6e:ed:2e:02:bd:d9:90:91:06:ab:c5:40:
     60        f7:d4:56:83:88:71:89:ad:47:ac:08:7d:43:16:9d:04:be:67:
     61        ad:c7:1c:bc:c9:ef:82:02:e4:98:8c:b4:31:c2:5b:0d:8b:d8:
     62        f3:ee:78:71:bd:a9:0c:51:a8:2b:a4:2a:0f:91:cb:a5:cf:d0:
     63        e8:14:bc:83
    6464-----BEGIN CERTIFICATE-----
    6565MIIDTzCCAjegAwIBAgIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDDBJ3ZWIt
    66 cGxhdGZvcm0tdGVzdHMwHhcNMTUwMTI3MDkyNzQwWhcNMTUwMjI2MDkyNzQwWjAd
     66cGxhdGZvcm0tdGVzdHMwHhcNMTUwMzA2MDI0NzI2WhcNMTUwNDA1MDI0NzI2WjAd
    6767MRswGQYDVQQDDBJ3ZWItcGxhdGZvcm0tdGVzdHMwggEiMA0GCSqGSIb3DQEBAQUA
    68 A4IBDwAwggEKAoIBAQCy06LYzZOCT4d0SzV3I+/Ui/itANrNZj8PXRd1RNDug8qM
    69 c/RVIKSShUDkol9ZUHWJR1BzZtdAqqPLJsoMsJSOPy7H4lOu0cQ/xdhU1ycstvCf
    70 GAYwud7EPW17YoTzWjm0gf2H9tnNFeWcPOx90FDmn07CdcqZOqJNhXCtUdYTpF0O
    71 afeYOkgBhiYp+Iy+ayPMngDEES3CvyXiEgpkQa2oN74BqLd39yNxVfJnMOGAb0jq
    72 45q+sflSCtQ4SwfXimyGVCTnAchw67Q/WlRXE6DRbYumm7tgiCWh+M59BdZSK2/0
    73 FOHtbOQAG+YfXPhgpx73t5CdKJMXyV4W7ZrpaJ+vAgMBAAGjgZkwgZYwDAYDVR0T
    74 BAUwAwEB/zAdBgNVHQ4EFgQUDjHBDWyU4fDZjMTkpd/9HMs7zFgwRQYDVR0jBD4w
    75 PIAUDjHBDWyU4fDZjMTkpd/9HMs7zFihIaQfMB0xGzAZBgNVBAMMEndlYi1wbGF0
     68A4IBDwAwggEKAoIBAQCsOrOZC+4js5774W6lxRjUHSKEg/lScSaipOR/yF1pDqai
     69MkSfz0svstDKjgpGk7/cYqorYlmyIhoTC4R0aJ6F204cU75GiXVVQoT3VIgqAftt
     70rw4m0kVp6Ih98bFgmuyhZFGfgrLDHEBoa++6gZpgKmYXpUoU+t7degsYCEfQ9sx0
     71sNtssmoX761yKVbbaE2I59e12B3G3QjmnBcdi7x449WJOCaJ+c7L7bRGLaV/kISg
     72ZsMB5ZYXxvuNgKMir2uLcgiAzX0z3MPo2Y3eT5TpcDMD3uz3UNDlUrRIQ7/+/TRE
     73eu2gnMXTUVM7fn9g9CGlsEHfr5gqBWfAR0gOy3VVAgMBAAGjgZkwgZYwDAYDVR0T
     74BAUwAwEB/zAdBgNVHQ4EFgQUqORLMi5I6OxcDkD5ncaw0FkehiMwRQYDVR0jBD4w
     75PIAUqORLMi5I6OxcDkD5ncaw0FkehiOhIaQfMB0xGzAZBgNVBAMMEndlYi1wbGF0
    7676Zm9ybS10ZXN0c4IBATALBgNVHQ8EBAMCAgQwEwYDVR0lBAwwCgYIKwYBBQUHAwEw
    77 DQYJKoZIhvcNAQELBQADggEBADKn9v+9zlksk5TpoVeHfAGCINYlagkF9nTVPzd4
    78 qflc9jwU5lwelnSeRrhfO4i8GDzE9mjgeZJVfMlbsoged1StvONDyyxM8gRNBrSy
    79 GzIHBt7ottH7xrLFRfowRt9JIqjqxQyh7sL8KUkSiXZEL5JTz9NcoDqCmc0eRy+Y
    80 KutkmNu1lE/PHA+Iy/uYes2nXS1XmU1SZUnImtpZ89DTdckbnMaNivHVKWP0UwCB
    81 4BmMifP5Aq1ESA7N/WZ5/CXABweGHCSYN3L8dLV/Es0IJ3DRzgEBARbqS7/dOmV3
    82 MSDbnh+CrqycW0cOskHAsoK6WaqUuMEx9QdWdpRg9WQTSFI=
     77DQYJKoZIhvcNAQELBQADggEBAJVCM8vmYBwYDbpYWnf2EvvSQmpY/8wzk70mT8DF
     78CWI0FiXl6m/Ox/nGzfHDzW2Akx1/gKMJyry5ZCkC5+S0lm2epkxMGGdCpqK3BY/1
     79X68TjZYm29VzuTIOYZlzPS6O5PwSTZzZPlIFvlvLJWDNSjbd3nX3QqXr8TzX0Lj1
     80fwnHGXP+XrogMSdweMY6/Cd/kI8sL+qgK2Dx5dKAFbAP35+AX5Z/EyExvkgo1s9H
     8183xh6Njbgk60Gf34z27tLgK92ZCRBqvFQPfUVoOIcYmtR6wIfUMWnQS+Z63HHLzJ
     8274IC5JiMtDHCWw2L2PPueHG9qQxRqCukKg+Ry6XP0OgUvIM=
    8383-----END CERTIFICATE-----

  • trunk/LayoutTests/imported/w3c/web-platform-tests/_certs/02.pem

    r179439 r181134  
    33        Version: 3 (0x2)
    44        Serial Number: 2 (0x2)
    5     Signature Algorithm: sha256WithRSAEncryption
     5        Signature Algorithm: sha256WithRSAEncryption
    66        Issuer: CN=web-platform-tests
    77        Validity
    8             Not Before: Jan 27 09:27:41 2015 GMT
    9             Not After : Feb 26 09:27:41 2015 GMT
     8            Not Before: Mar  6 02:47:26 2015 GMT
     9            Not After : Apr  5 02:47:26 2015 GMT
    1010        Subject: CN=localhost
    1111        Subject Public Key Info:
    1212            Public Key Algorithm: rsaEncryption
    13                 Public-Key: (2048 bit)
    14                 Modulus:
    15                     00:e8:51:ec:61:80:b6:ac:66:ed:73:09:db:00:30:
    16                     48:04:83:e1:41:65:95:2d:8f:0d:50:63:d2:8c:2a:
    17                     50:93:4b:56:78:65:96:cf:79:4c:9c:3c:e8:86:ea:
    18                     c5:c2:e9:0a:9c:5f:15:8b:a5:fd:21:57:ea:13:23:
    19                     55:06:c2:8a:cc:3f:aa:ab:d4:dd:b9:ea:d9:8a:c9:
    20                     28:7a:de:14:d8:72:24:b8:a4:bf:c6:64:72:d7:a9:
    21                     d0:de:0e:df:4c:a6:50:18:26:f3:5b:ec:40:6a:1a:
    22                     27:0c:19:85:47:34:ad:49:37:af:73:8e:77:b3:43:
    23                     d3:83:3a:4b:76:16:b3:b8:e9:15:99:ff:07:aa:5f:
    24                     e1:26:b9:72:02:87:07:69:3b:86:85:8f:79:ad:ac:
    25                     ec:15:c4:16:2e:45:2a:a9:1a:82:24:de:ac:84:56:
    26                     88:bd:67:f3:f3:bb:84:d7:af:f9:65:23:01:e9:01:
    27                     d0:04:ce:a6:06:09:09:44:58:a7:ba:89:ab:b2:ca:
    28                     97:b6:18:6a:6c:84:a8:47:e7:f5:5f:8f:bf:71:7b:
    29                     4f:b9:ad:31:dd:73:bf:63:9f:b4:46:8c:93:85:24:
    30                     25:19:73:ed:03:19:f3:3f:1d:af:0e:8b:a4:76:90:
    31                     88:39:b5:27:f9:17:86:f1:4b:bb:7e:60:7f:f9:d7:
    32                     fb:65
     13            RSA Public Key: (2048 bit)
     14                Modulus (2048 bit):
     15                    00:d0:4d:a0:9d:12:39:8b:52:d8:60:1a:2f:ad:0f:
     16                    db:56:4a:86:61:e3:6c:f1:8e:59:9b:65:f8:a5:18:
     17                    21:73:05:87:ea:d8:49:f4:bb:85:9c:f6:78:4c:e5:
     18                    35:19:2e:20:5a:a2:ed:11:67:4a:5a:be:b1:55:2e:
     19                    83:91:c7:94:ee:b1:b8:00:2f:34:42:c5:ee:37:84:
     20                    69:5c:80:1b:f4:b0:1d:69:c8:9a:b1:d1:9a:ea:47:
     21                    11:0d:d3:f7:ca:57:35:0b:07:53:2f:cc:b3:87:dc:
     22                    ed:66:48:70:1a:86:95:65:be:f9:64:74:2d:7b:c5:
     23                    73:db:9b:e5:f4:04:ea:7f:a5:90:60:12:1e:2c:ef:
     24                    04:61:2d:79:8c:df:2e:f0:30:9a:be:f6:8d:1f:ab:
     25                    36:70:13:19:79:01:8e:3d:1b:c7:d2:39:53:d0:5a:
     26                    0d:d5:f5:03:df:1f:3b:a7:96:21:85:fa:e4:95:5a:
     27                    39:78:fa:af:ce:9d:de:de:9c:5b:4b:00:87:9a:0e:
     28                    0b:08:87:e6:8e:95:0b:47:ff:ce:7d:d6:34:04:bb:
     29                    d7:31:af:c8:76:db:89:e9:f1:ed:ce:6e:cf:64:78:
     30                    82:8a:0f:15:17:1c:73:cd:ba:2e:16:61:58:c7:bb:
     31                    0c:27:9c:c1:80:9b:75:e9:98:a3:e6:e5:80:c1:dc:
     32                    47:c5
    3333                Exponent: 65537 (0x10001)
    3434        X509v3 extensions:
    … …  
    3636                CA:FALSE
    3737            X509v3 Subject Key Identifier:
    38                 F6:CB:82:64:B0:C4:02:1A:85:53:0E:9A:6B:D8:C2:30:AC:05:61:C8
     38                31:CE:2F:B4:8D:F8:09:33:5F:C6:E7:6B:39:C6:C8:EE:8D:40:08:23
    3939            X509v3 Authority Key Identifier:
    40                 keyid:0E:31:C1:0D:6C:94:E1:F0:D9:8C:C4:E4:A5:DF:FD:1C:CB:3B:CC:58
     40                keyid:A8:E4:4B:32:2E:48:E8:EC:5C:0E:40:F9:9D:C6:B0:D0:59:1E:86:23
    4141
    4242            X509v3 Key Usage:
    … …  
    4747                DNS:localhost, DNS:www.localhost, DNS:xn--n8j6ds53lwwkrqhv28a.localhost, DNS:xn--lve-6lad.localhost, DNS:www2.localhost, DNS:www1.localhost
    4848    Signature Algorithm: sha256WithRSAEncryption
    49          80:b4:23:83:d9:5b:c8:5f:fe:16:25:2c:df:64:88:08:6b:1e:
    50          f9:15:46:58:54:ce:e0:28:88:af:f1:58:c3:7f:c2:08:7c:8b:
    51          d4:2f:da:f3:c5:bd:95:26:f6:0e:0f:66:34:4e:6a:35:3c:14:
    52          69:eb:15:2e:fe:0d:0d:c1:ff:30:2d:32:ce:28:c8:8b:57:ac:
    53          fc:54:89:9c:37:01:22:08:fe:db:bb:40:96:ec:8b:97:61:9f:
    54          68:c8:25:4d:19:77:f7:a6:86:51:2c:f0:b7:39:2b:a0:79:83:
    55          4b:42:75:6e:ca:c6:2a:0c:28:8b:69:83:46:3e:9e:0f:0f:7e:
    56          1a:17:09:1b:9b:02:ce:21:87:c2:e2:0d:68:91:1b:3a:5c:6d:
    57          c5:05:c8:2b:13:d1:28:a3:ed:94:73:ea:7d:b5:b7:b8:4d:be:
    58          85:3c:af:66:46:1b:0a:27:5d:71:b5:c6:9d:dc:ff:d6:e4:23:
    59          ed:89:11:64:69:16:4f:2f:c5:d6:81:41:d4:75:8d:8e:9b:4d:
    60          87:1d:02:bd:a7:d0:cf:a2:41:fb:27:cf:52:cb:2e:19:49:41:
    61          5c:d4:2f:c7:39:13:98:72:66:1d:47:97:cb:6b:dd:31:53:4e:
    62          b2:b0:af:6c:86:a7:38:1f:a1:a3:9f:54:6b:e1:c7:a2:15:f1:
    63          f0:d4:5a:57
     49        54:f1:f8:f3:7f:dc:fc:10:67:6a:d1:1f:68:c8:11:7f:b6:7a:
     50        5d:62:1d:34:db:60:d0:f4:28:b9:74:9c:9d:9d:8d:f0:50:89:
     51        87:a6:23:2e:da:f3:f3:bf:0c:56:05:a5:7a:39:00:77:93:ab:
     52        68:ff:98:1d:9c:83:e2:b5:ab:a4:d8:b9:96:f0:d4:e6:68:4f:
     53        d8:e8:01:8f:c9:95:5c:41:88:16:d7:e0:8f:f9:5e:a4:eb:8b:
     54        95:2d:3c:b3:fc:0b:eb:b5:6b:a2:bb:6f:bf:1e:09:33:9c:af:
     55        93:e8:98:16:5e:f6:87:71:21:0c:0d:2c:57:17:00:1a:dc:dd:
     56        f4:1c:4a:15:18:34:cf:4d:13:7a:11:52:48:37:4f:0f:00:50:
     57        45:18:af:66:99:72:a5:28:13:ea:d4:45:c6:e3:19:e3:30:45:
     58        4a:72:7c:5a:88:68:4f:5d:f6:e5:1c:c3:30:49:a5:ba:e4:33:
     59        3b:2a:9c:1d:94:8e:3c:41:06:99:17:36:04:56:d7:24:4e:75:
     60        25:a8:ae:14:5a:a5:82:a2:2e:c8:76:00:0b:86:5c:5d:2f:b5:
     61        49:e3:24:09:e8:67:8b:48:6b:b6:95:da:57:c6:50:c0:24:95:
     62        54:14:24:08:62:38:da:d3:c6:63:87:cf:82:c1:35:ab:16:a6:
     63        17:03:5c:a9
    6464-----BEGIN CERTIFICATE-----
    6565MIIDnTCCAoWgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDDBJ3ZWIt
    66 cGxhdGZvcm0tdGVzdHMwHhcNMTUwMTI3MDkyNzQxWhcNMTUwMjI2MDkyNzQxWjAU
     66cGxhdGZvcm0tdGVzdHMwHhcNMTUwMzA2MDI0NzI2WhcNMTUwNDA1MDI0NzI2WjAU
    6767MRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
    68 AoIBAQDoUexhgLasZu1zCdsAMEgEg+FBZZUtjw1QY9KMKlCTS1Z4ZZbPeUycPOiG
    69 6sXC6QqcXxWLpf0hV+oTI1UGworMP6qr1N256tmKySh63hTYciS4pL/GZHLXqdDe
    70 Dt9MplAYJvNb7EBqGicMGYVHNK1JN69zjnezQ9ODOkt2FrO46RWZ/weqX+EmuXIC
    71 hwdpO4aFj3mtrOwVxBYuRSqpGoIk3qyEVoi9Z/Pzu4TXr/llIwHpAdAEzqYGCQlE
    72 WKe6iauyype2GGpshKhH5/Vfj79xe0+5rTHdc79jn7RGjJOFJCUZc+0DGfM/Ha8O
    73 i6R2kIg5tSf5F4bxS7t+YH/51/tlAgMBAAGjgfAwge0wCQYDVR0TBAIwADAdBgNV
    74 HQ4EFgQU9suCZLDEAhqFUw6aa9jCMKwFYcgwHwYDVR0jBBgwFoAUDjHBDWyU4fDZ
    75 jMTkpd/9HMs7zFgwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMH4G
     68AoIBAQDQTaCdEjmLUthgGi+tD9tWSoZh42zxjlmbZfilGCFzBYfq2En0u4Wc9nhM
     695TUZLiBaou0RZ0pavrFVLoORx5TusbgALzRCxe43hGlcgBv0sB1pyJqx0ZrqRxEN
     700/fKVzULB1MvzLOH3O1mSHAahpVlvvlkdC17xXPbm+X0BOp/pZBgEh4s7wRhLXmM
     713y7wMJq+9o0fqzZwExl5AY49G8fSOVPQWg3V9QPfHzunliGF+uSVWjl4+q/Ond7e
     72nFtLAIeaDgsIh+aOlQtH/8591jQEu9cxr8h224np8e3Obs9keIKKDxUXHHPNui4W
     73YVjHuwwnnMGAm3XpmKPm5YDB3EfFAgMBAAGjgfAwge0wCQYDVR0TBAIwADAdBgNV
     74HQ4EFgQUMc4vtI34CTNfxudrOcbI7o1ACCMwHwYDVR0jBBgwFoAUqORLMi5I6Oxc
     75DkD5ncaw0FkehiMwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMH4G
    7676A1UdEQR3MHWCCWxvY2FsaG9zdIINd3d3LmxvY2FsaG9zdIIheG4tLW44ajZkczUz
    7777bHd3a3JxaHYyOGEubG9jYWxob3N0ghZ4bi0tbHZlLTZsYWQubG9jYWxob3N0gg53
    7878d3cyLmxvY2FsaG9zdIIOd3d3MS5sb2NhbGhvc3QwDQYJKoZIhvcNAQELBQADggEB
    79 AIC0I4PZW8hf/hYlLN9kiAhrHvkVRlhUzuAoiK/xWMN/wgh8i9Qv2vPFvZUm9g4P
    80 ZjROajU8FGnrFS7+DQ3B/zAtMs4oyItXrPxUiZw3ASII/tu7QJbsi5dhn2jIJU0Z
    81 d/emhlEs8Lc5K6B5g0tCdW7KxioMKItpg0Y+ng8PfhoXCRubAs4hh8LiDWiRGzpc
    82 bcUFyCsT0Sij7ZRz6n21t7hNvoU8r2ZGGwonXXG1xp3c/9bkI+2JEWRpFk8vxdaB
    83 QdR1jY6bTYcdAr2n0M+iQfsnz1LLLhlJQVzUL8c5E5hyZh1Hl8tr3TFTTrKwr2yG
    84 pzgfoaOfVGvhx6IV8fDUWlc=
     79AFTx+PN/3PwQZ2rRH2jIEX+2el1iHTTbYND0KLl0nJ2djfBQiYemIy7a8/O/DFYF
     80pXo5AHeTq2j/mB2cg+K1q6TYuZbw1OZoT9joAY/JlVxBiBbX4I/5XqTri5UtPLP8
     81C+u1a6K7b78eCTOcr5PomBZe9odxIQwNLFcXABrc3fQcShUYNM9NE3oRUkg3Tw8A
     82UEUYr2aZcqUoE+rURcbjGeMwRUpyfFqIaE9d9uUcwzBJpbrkMzsqnB2UjjxBBpkX
     83NgRW1yROdSWorhRapYKiLsh2AAuGXF0vtUnjJAnoZ4tIa7aV2lfGUMAklVQUJAhi
     84ONrTxmOHz4LBNasWphcDXKk=
    8585-----END CERTIFICATE-----

  • trunk/LayoutTests/imported/w3c/web-platform-tests/_certs/cacert.pem

    r179439 r181134  
    33        Version: 3 (0x2)
    44        Serial Number: 1 (0x1)
    5     Signature Algorithm: sha256WithRSAEncryption
     5        Signature Algorithm: sha256WithRSAEncryption
    66        Issuer: CN=web-platform-tests
    77        Validity
    8             Not Before: Jan 27 09:27:40 2015 GMT
    9             Not After : Feb 26 09:27:40 2015 GMT
     8            Not Before: Mar  6 02:47:26 2015 GMT
     9            Not After : Apr  5 02:47:26 2015 GMT
    1010        Subject: CN=web-platform-tests
    1111        Subject Public Key Info:
    1212            Public Key Algorithm: rsaEncryption
    13                 Public-Key: (2048 bit)
    14                 Modulus:
    15                     00:b2:d3:a2:d8:cd:93:82:4f:87:74:4b:35:77:23:
    16                     ef:d4:8b:f8:ad:00:da:cd:66:3f:0f:5d:17:75:44:
    17                     d0:ee:83:ca:8c:73:f4:55:20:a4:92:85:40:e4:a2:
    18                     5f:59:50:75:89:47:50:73:66:d7:40:aa:a3:cb:26:
    19                     ca:0c:b0:94:8e:3f:2e:c7:e2:53:ae:d1:c4:3f:c5:
    20                     d8:54:d7:27:2c:b6:f0:9f:18:06:30:b9:de:c4:3d:
    21                     6d:7b:62:84:f3:5a:39:b4:81:fd:87:f6:d9:cd:15:
    22                     e5:9c:3c:ec:7d:d0:50:e6:9f:4e:c2:75:ca:99:3a:
    23                     a2:4d:85:70:ad:51:d6:13:a4:5d:0e:69:f7:98:3a:
    24                     48:01:86:26:29:f8:8c:be:6b:23:cc:9e:00:c4:11:
    25                     2d:c2:bf:25:e2:12:0a:64:41:ad:a8:37:be:01:a8:
    26                     b7:77:f7:23:71:55:f2:67:30:e1:80:6f:48:ea:e3:
    27                     9a:be:b1:f9:52:0a:d4:38:4b:07:d7:8a:6c:86:54:
    28                     24:e7:01:c8:70:eb:b4:3f:5a:54:57:13:a0:d1:6d:
    29                     8b:a6:9b:bb:60:88:25:a1:f8:ce:7d:05:d6:52:2b:
    30                     6f:f4:14:e1:ed:6c:e4:00:1b:e6:1f:5c:f8:60:a7:
    31                     1e:f7:b7:90:9d:28:93:17:c9:5e:16:ed:9a:e9:68:
    32                     9f:af
     13            RSA Public Key: (2048 bit)
     14                Modulus (2048 bit):
     15                    00:ac:3a:b3:99:0b:ee:23:b3:9e:fb:e1:6e:a5:c5:
     16                    18:d4:1d:22:84:83:f9:52:71:26:a2:a4:e4:7f:c8:
     17                    5d:69:0e:a6:a2:32:44:9f:cf:4b:2f:b2:d0:ca:8e:
     18                    0a:46:93:bf:dc:62:aa:2b:62:59:b2:22:1a:13:0b:
     19                    84:74:68:9e:85:db:4e:1c:53:be:46:89:75:55:42:
     20                    84:f7:54:88:2a:01:fb:6d:af:0e:26:d2:45:69:e8:
     21                    88:7d:f1:b1:60:9a:ec:a1:64:51:9f:82:b2:c3:1c:
     22                    40:68:6b:ef:ba:81:9a:60:2a:66:17:a5:4a:14:fa:
     23                    de:dd:7a:0b:18:08:47:d0:f6:cc:74:b0:db:6c:b2:
     24                    6a:17:ef:ad:72:29:56:db:68:4d:88:e7:d7:b5:d8:
     25                    1d:c6:dd:08:e6:9c:17:1d:8b:bc:78:e3:d5:89:38:
     26                    26:89:f9:ce:cb:ed:b4:46:2d:a5:7f:90:84:a0:66:
     27                    c3:01:e5:96:17:c6:fb:8d:80:a3:22:af:6b:8b:72:
     28                    08:80:cd:7d:33:dc:c3:e8:d9:8d:de:4f:94:e9:70:
     29                    33:03:de:ec:f7:50:d0:e5:52:b4:48:43:bf:fe:fd:
     30                    34:44:7a:ed:a0:9c:c5:d3:51:53:3b:7e:7f:60:f4:
     31                    21:a5:b0:41:df:af:98:2a:05:67:c0:47:48:0e:cb:
     32                    75:55
    3333                Exponent: 65537 (0x10001)
    3434        X509v3 extensions:
    … …  
    3636                CA:TRUE
    3737            X509v3 Subject Key Identifier:
    38                 0E:31:C1:0D:6C:94:E1:F0:D9:8C:C4:E4:A5:DF:FD:1C:CB:3B:CC:58
     38                A8:E4:4B:32:2E:48:E8:EC:5C:0E:40:F9:9D:C6:B0:D0:59:1E:86:23
    3939            X509v3 Authority Key Identifier:
    40                 keyid:0E:31:C1:0D:6C:94:E1:F0:D9:8C:C4:E4:A5:DF:FD:1C:CB:3B:CC:58
     40                keyid:A8:E4:4B:32:2E:48:E8:EC:5C:0E:40:F9:9D:C6:B0:D0:59:1E:86:23
    4141                DirName:/CN=web-platform-tests
    4242                serial:01
    … …  
    4747                TLS Web Server Authentication
    4848    Signature Algorithm: sha256WithRSAEncryption
    49          32:a7:f6:ff:bd:ce:59:2c:93:94:e9:a1:57:87:7c:01:82:20:
    50          d6:25:6a:09:05:f6:74:d5:3f:37:78:a9:f9:5c:f6:3c:14:e6:
    51          5c:1e:96:74:9e:46:b8:5f:3b:88:bc:18:3c:c4:f6:68:e0:79:
    52          92:55:7c:c9:5b:b2:88:1e:77:54:ad:bc:e3:43:cb:2c:4c:f2:
    53          04:4d:06:b4:b2:1b:32:07:06:de:e8:b6:d1:fb:c6:b2:c5:45:
    54          fa:30:46:df:49:22:a8:ea:c5:0c:a1:ee:c2:fc:29:49:12:89:
    55          76:44:2f:92:53:cf:d3:5c:a0:3a:82:99:cd:1e:47:2f:98:2a:
    56          eb:64:98:db:b5:94:4f:cf:1c:0f:88:cb:fb:98:7a:cd:a7:5d:
    57          2d:57:99:4d:52:65:49:c8:9a:da:59:f3:d0:d3:75:c9:1b:9c:
    58          c6:8d:8a:f1:d5:29:63:f4:53:00:81:e0:19:8c:89:f3:f9:02:
    59          ad:44:48:0e:cd:fd:66:79:fc:25:c0:07:07:86:1c:24:98:37:
    60          72:fc:74:b5:7f:12:cd:08:27:70:d1:ce:01:01:01:16:ea:4b:
    61          bf:dd:3a:65:77:31:20:db:9e:1f:82:ae:ac:9c:5b:47:0e:b2:
    62          41:c0:b2:82:ba:59:aa:94:b8:c1:31:f5:07:56:76:94:60:f5:
    63          64:13:48:52
     49        95:42:33:cb:e6:60:1c:18:0d:ba:58:5a:77:f6:12:fb:d2:42:
     50        6a:58:ff:cc:33:93:bd:26:4f:c0:c5:09:62:34:16:25:e5:ea:
     51        6f:ce:c7:f9:c6:cd:f1:c3:cd:6d:80:93:1d:7f:80:a3:09:ca:
     52        bc:b9:64:29:02:e7:e4:b4:96:6d:9e:a6:4c:4c:18:67:42:a6:
     53        a2:b7:05:8f:f5:5f:af:13:8d:96:26:db:d5:73:b9:32:0e:61:
     54        99:73:3d:2e:8e:e4:fc:12:4d:9c:d9:3e:52:05:be:5b:cb:25:
     55        60:cd:4a:36:dd:de:75:f7:42:a5:eb:f1:3c:d7:d0:b8:f5:7f:
     56        09:c7:19:73:fe:5e:ba:20:31:27:70:78:c6:3a:fc:27:7f:90:
     57        8f:2c:2f:ea:a0:2b:60:f1:e5:d2:80:15:b0:0f:df:9f:80:5f:
     58        96:7f:13:21:31:be:48:28:d6:cf:47:f3:7c:61:e8:d8:db:82:
     59        4e:b4:19:fd:f8:cf:6e:ed:2e:02:bd:d9:90:91:06:ab:c5:40:
     60        f7:d4:56:83:88:71:89:ad:47:ac:08:7d:43:16:9d:04:be:67:
     61        ad:c7:1c:bc:c9:ef:82:02:e4:98:8c:b4:31:c2:5b:0d:8b:d8:
     62        f3:ee:78:71:bd:a9:0c:51:a8:2b:a4:2a:0f:91:cb:a5:cf:d0:
     63        e8:14:bc:83
    6464-----BEGIN CERTIFICATE-----
    6565MIIDTzCCAjegAwIBAgIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDDBJ3ZWIt
    66 cGxhdGZvcm0tdGVzdHMwHhcNMTUwMTI3MDkyNzQwWhcNMTUwMjI2MDkyNzQwWjAd
     66cGxhdGZvcm0tdGVzdHMwHhcNMTUwMzA2MDI0NzI2WhcNMTUwNDA1MDI0NzI2WjAd
    6767MRswGQYDVQQDDBJ3ZWItcGxhdGZvcm0tdGVzdHMwggEiMA0GCSqGSIb3DQEBAQUA
    68 A4IBDwAwggEKAoIBAQCy06LYzZOCT4d0SzV3I+/Ui/itANrNZj8PXRd1RNDug8qM
    69 c/RVIKSShUDkol9ZUHWJR1BzZtdAqqPLJsoMsJSOPy7H4lOu0cQ/xdhU1ycstvCf
    70 GAYwud7EPW17YoTzWjm0gf2H9tnNFeWcPOx90FDmn07CdcqZOqJNhXCtUdYTpF0O
    71 afeYOkgBhiYp+Iy+ayPMngDEES3CvyXiEgpkQa2oN74BqLd39yNxVfJnMOGAb0jq
    72 45q+sflSCtQ4SwfXimyGVCTnAchw67Q/WlRXE6DRbYumm7tgiCWh+M59BdZSK2/0
    73 FOHtbOQAG+YfXPhgpx73t5CdKJMXyV4W7ZrpaJ+vAgMBAAGjgZkwgZYwDAYDVR0T
    74 BAUwAwEB/zAdBgNVHQ4EFgQUDjHBDWyU4fDZjMTkpd/9HMs7zFgwRQYDVR0jBD4w
    75 PIAUDjHBDWyU4fDZjMTkpd/9HMs7zFihIaQfMB0xGzAZBgNVBAMMEndlYi1wbGF0
     68A4IBDwAwggEKAoIBAQCsOrOZC+4js5774W6lxRjUHSKEg/lScSaipOR/yF1pDqai
     69MkSfz0svstDKjgpGk7/cYqorYlmyIhoTC4R0aJ6F204cU75GiXVVQoT3VIgqAftt
     70rw4m0kVp6Ih98bFgmuyhZFGfgrLDHEBoa++6gZpgKmYXpUoU+t7degsYCEfQ9sx0
     71sNtssmoX761yKVbbaE2I59e12B3G3QjmnBcdi7x449WJOCaJ+c7L7bRGLaV/kISg
     72ZsMB5ZYXxvuNgKMir2uLcgiAzX0z3MPo2Y3eT5TpcDMD3uz3UNDlUrRIQ7/+/TRE
     73eu2gnMXTUVM7fn9g9CGlsEHfr5gqBWfAR0gOy3VVAgMBAAGjgZkwgZYwDAYDVR0T
     74BAUwAwEB/zAdBgNVHQ4EFgQUqORLMi5I6OxcDkD5ncaw0FkehiMwRQYDVR0jBD4w
     75PIAUqORLMi5I6OxcDkD5ncaw0FkehiOhIaQfMB0xGzAZBgNVBAMMEndlYi1wbGF0
    7676Zm9ybS10ZXN0c4IBATALBgNVHQ8EBAMCAgQwEwYDVR0lBAwwCgYIKwYBBQUHAwEw
    77 DQYJKoZIhvcNAQELBQADggEBADKn9v+9zlksk5TpoVeHfAGCINYlagkF9nTVPzd4
    78 qflc9jwU5lwelnSeRrhfO4i8GDzE9mjgeZJVfMlbsoged1StvONDyyxM8gRNBrSy
    79 GzIHBt7ottH7xrLFRfowRt9JIqjqxQyh7sL8KUkSiXZEL5JTz9NcoDqCmc0eRy+Y
    80 KutkmNu1lE/PHA+Iy/uYes2nXS1XmU1SZUnImtpZ89DTdckbnMaNivHVKWP0UwCB
    81 4BmMifP5Aq1ESA7N/WZ5/CXABweGHCSYN3L8dLV/Es0IJ3DRzgEBARbqS7/dOmV3
    82 MSDbnh+CrqycW0cOskHAsoK6WaqUuMEx9QdWdpRg9WQTSFI=
     77DQYJKoZIhvcNAQELBQADggEBAJVCM8vmYBwYDbpYWnf2EvvSQmpY/8wzk70mT8DF
     78CWI0FiXl6m/Ox/nGzfHDzW2Akx1/gKMJyry5ZCkC5+S0lm2epkxMGGdCpqK3BY/1
     79X68TjZYm29VzuTIOYZlzPS6O5PwSTZzZPlIFvlvLJWDNSjbd3nX3QqXr8TzX0Lj1
     80fwnHGXP+XrogMSdweMY6/Cd/kI8sL+qgK2Dx5dKAFbAP35+AX5Z/EyExvkgo1s9H
     8183xh6Njbgk60Gf34z27tLgK92ZCRBqvFQPfUVoOIcYmtR6wIfUMWnQS+Z63HHLzJ
     8274IC5JiMtDHCWw2L2PPueHG9qQxRqCukKg+Ry6XP0OgUvIM=
    8383-----END CERTIFICATE-----

  • trunk/LayoutTests/imported/w3c/web-platform-tests/_certs/cakey.pem

    r179439 r181134  
    1 -----BEGIN ENCRYPTED PRIVATE KEY-----
    2 MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIXrcK+dDfs0ECAggA
    3 MBQGCCqGSIb3DQMHBAghxNev6rS0zQSCBMj7vW5cvmHitzd/sa+a1VuHobeP0j7V
    4 iYTbKsKrI+JGr8RocKNKMhAGPSUId/H21hGn1TjOZ/fyST+jcXv2wVuDEB/8xTvj
    5 qOsvFGi38fFjpkZyYsQ6pUQVJpz+WwbOYg8ebMGI7y7KSN6iWNGo0EmxOwOvfJRz
    6 //rucK6uv1WE2gjZZPE/6AMIczynacXraLlOtBJlIZ2NnAxU+W822JNl8TYhRw4w
    7 Pw8C8xXG5wJTbaGu0YdxMjeCrKntC5H3EX1sgzB/dhDVZtag324o2n1Bmp8cGfyx
    8 YqLFSdyzRdBDwe7hcp8YNH4CBbJSA96ECvIvaVUr5wb4omDeyw3xNaRy2W5tFdTU
    9 sJMg2WYlXMYXlRYQNjrdHSeG3W4TWJXvA9XqmOhDSe7EGvqEL05obruX3eAUFoAa
    10 CMbK0vvrcWm8MLXB+0qWcOatdaEsoA9WdnRXWo5pvJ8BYbYMoKANLEsuq3/m0phw
    11 Ldvk72Z1ME54n2lMXv2G0AF5Dn0a+fmlToajmod065hmilQzsYw/pgrnLepS7aBp
    12 8EWeg660wA53xiZyhd1DJN6LzfJ7TcJ3UYWAS8tVY9cBhVivvXBgRvLDXKKa4SPG
    13 YbrR6nHUKXDmIgOUbJOcPRgVCzbwB0mdr4RWR+WfepEOJQZRm6YOJQjh2+mtMs6+
    14 mANDWyDkBSPeq4HU6CLmMjPcFFGmqvy3d2CWtszPBJVUrq5SqX7HHvwtCp6DiMgM
    15 ssVUVc/w/PMDcXKkb1kYwW/vD6FBO0UcxbVDpTHDHHilAV4mEvS04iAZFRP4ef03
    16 33KBhn9eTmNh/T9W0oqDzmYcyJeK2izkdmJaHt0hCJDTMb4tGuULMXL8KJXwRtBY
    17 WYZkjboZkix1m5tkexHNKaa8ntU+u8kmwsehDcged+ULTp5nalHU2Pt5CFaImBTc
    18 MyhPXmftfFEiHT4ncf9RBOVNIvLRQvz6vDqsjUu3ulm26nyMHddF8xeQXvW17Ul9
    19 R7D52DLgq6efzKNYqUDAbToYQmzilNWjlumvUOhPfdN5znFUvOQO3hhiIVi63AhX
    20 JqstoWtFgXIr7mmpGFE88wMGejQNgt+cDdhI6e3SV7Sga/Vp8MmEbNTm84MfVuH8
    21 rUWYbOoUTA/NX8ngqArDwsc0LmPsUzVAPqXmQwVBbjoxTA9FKk4bQExmHBgYxPhD
    22 HllMhKtkRFNvDA4bw9VUYVh9yKWT6oR99DKl4kA6IKhmChNLgdmgdyW2fx9fac/T
    23 MTHqH/oOkn5lJXFkBMZcE86c6TLqSFdrc+vHbwky3CwMnfA1Ms9Yf3JEJVob13LU
    24 Z06vsaSUI+MiQkkMpfGFBOl6XeM5EKjPfF4tV8ijYCk993MNhxDuH7JgA3RKNIHV
    25 bKo+1vxsUKkcEp1YOidyIiCWbQXp79cFEyXdxyt0Paqn8+qpVMK5N17ORE4t020p
    26 ah/VppwT7REDGRP/s+uHw+o1o27IOORb4EPsqqe7PvuMja6iyu1DfCBebOhzIYdN
    27 d3yY9DmQu11dTH3RErH4Gh80vpwAiYv5mxgiuTKnNS95Zn1HZmxMKRFI3aki/aIE
    28 U/qA3YfZaE2lrB66NCtVaG33u+ZJpdhFMOuUuGr2qzovYiUJVZcKll2w/XuBbPD2
    29 F6k=
    30 -----END ENCRYPTED PRIVATE KEY-----
     1-----BEGIN RSA PRIVATE KEY-----
     2Proc-Type: 4,ENCRYPTED
     3DEK-Info: DES-EDE3-CBC,4924EC27AB2AA561
     4
     5cbZ9opvaJiln7KpzyLiOTe+OioTRp5kUX4x3Ec0whTzHClB0Ga4HWYaiisaeqb2W
     6M5FEF+J8QqzezRj8dEb60CYCFsY9P4vpLxA9WdczZHjBVYVWs0jJCfpeWlWBC67h
     7NBrNS05tqBHF6WKQlgTN7AEVnineJTTykCs86bUqISLnlER1EfJFp/+JcS1UJGzt
     8QNAts1AAWsVsmmqpf9Mat4NWrs/2IP75i4LDzbSgV6MQVts+okNGHyFWvYtVlPPm
     94Xn+OCRyKFXmK7MHZzxAzi1ZOi6BdDiRwn3X6QRbF0NVsQ+0A1G62OkMd4W9zB9u
     10Hs99gNbPLzZy7w95FfQrBsI7/GeknHicYvhwGltAn1mMmZzVnqeCBF3s2plW04pI
     11S9tRW8qLejXK7geZq7w3Lq+p8TSVNZU65KNnDvjlEDakGg/ffq/eXFpAmMHyBQmf
     12WshXN3NmWDJ9/azo34W8fhEDEIl6yc5gPuwAuGoRfnEQ17F1WxLAeq550QZPQnaM
     13LdmMpu6RBP7Mxv1yHX/OeZx2Kk/+t0fV3AL2cEzXFHNCEiiBk+kn/2dhcWWimp/V
     14J7070iObbbPizfNrOmC6MnSAbboWeRcb+dj58h3EaUk1F3K2rB1xhuEZ5mlVkv94
     15jBAnCSTO++ytE6P8xPWBK8xWyPf+A0CTV1h+z0zWqQbNq5FedqiCOzny+XCvIHT1
     16GEqkdaUduU4RX+D5GOrpLj4mIq7+ZX48cUEkuycOFJveQ1le3YIHZBSq+0rLCvNO
     17NIcOpUjErU8NMUg31lHRijzJ2e8QExBHkHR3mOoWCtrH3Szq1qD1GFlg88FVuNmp
     18xk0KXPENTW9E+crfdU4lXt2M6XfkJVbe0gm5NnsfNqi3s0b/62E3ax4COPOQAnfC
     19o0+lXDMi5cu99O9EnXR3FAG1U1t0tUTA66R6A2TzXI6NnkYYzszgFgpAA3LmkCIi
     20LeP8h8JH529V7Zeb7FbWoKpLtKHqzsF/zyOsJvzeWgMjIOn8Xv94HHQW13xwWh8m
     212MbqpTaZoXuXxo3pptsw3gE9QVROYf+1UJ7u3JP8gzRFlMbmRfFzY7TX0/pwVmD0
     22KW0UCcHUdJCuYtRbu3yQcO87tXrBrXn0REkFXmW1BJVNvO6zop5yr+rCEOUF96hV
     23++Cgud76yh5mZ8uhy0sxZMMOgP2rrJnUvEK+mo2i5caSDCSpDHUGXVWZ6+dA81Ys
     24amUv2yjhouENjiq6xuVwL8zOWl6nFj6+d1WY2MgM8bIZou2iyjBq2Mvr9e+42B7c
     25cSHZBc8V7cIcq9hj/BAZEqLS2CYm03rFdahqc/ImrGvudYD2k13OiRQJxoVIVLvP
     26GM7VlLQYpT/Kh2W+BTNF/1wVCr7pzHLxpr547vDiUU/bPvkuWNOXPAZb1tBpWRtl
     27viqgywcqXc+JdFmPtgb70wEw/q6kGYxlNKd0zqt/QRZ/ZOsHLnfuNxJHvCgDwDRY
     28v8cG6XEFVdN8IE7iqnOHBrA3a/+r+dyzDmGpHVZC1OvmPcRrFUF0QGW5GyAc/QKi
     29X6EeMXwqeSyu1g9EZvPa8Od3q8nEPzvMXCmWQ15hxYq0KjZLUc0jW+nBPnvoyhvy
     30-----END RSA PRIVATE KEY-----

  • trunk/LayoutTests/imported/w3c/web-platform-tests/_certs/index.txt.old

    r179439 r181134  
    1 V       150226092740Z           01      unknown /CN=web-platform-tests
     1V       150405024726Z           01      unknown /CN=web-platform-tests

  • trunk/LayoutTests/imported/w3c/web-platform-tests/_certs/localhost.key

    r179439 r181134  
    1 -----BEGIN PRIVATE KEY-----
    2 MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDoUexhgLasZu1z
    3 CdsAMEgEg+FBZZUtjw1QY9KMKlCTS1Z4ZZbPeUycPOiG6sXC6QqcXxWLpf0hV+oT
    4 I1UGworMP6qr1N256tmKySh63hTYciS4pL/GZHLXqdDeDt9MplAYJvNb7EBqGicM
    5 GYVHNK1JN69zjnezQ9ODOkt2FrO46RWZ/weqX+EmuXIChwdpO4aFj3mtrOwVxBYu
    6 RSqpGoIk3qyEVoi9Z/Pzu4TXr/llIwHpAdAEzqYGCQlEWKe6iauyype2GGpshKhH
    7 5/Vfj79xe0+5rTHdc79jn7RGjJOFJCUZc+0DGfM/Ha8Oi6R2kIg5tSf5F4bxS7t+
    8 YH/51/tlAgMBAAECggEAGImel+XKZYcxiTb/RJPU53Uuc4PRL9CuLVF9yYQmoogQ
    9 iALi3OMI7m+Yd7eQT7fhgQah9fAAPmdUt9TBhEdD9bK7yg5fpOVjOL9qYR/Xv8y+
    10 iCoOf1vYrWKoRuv3NddTGlny1kCrxQkiGqsPYqfzrYoOI/xmNC7zxiaAFebr8Jmq
    11 OsJWj5rD+J3JKMWSRk4zJHTEhcaI/74pPFACDEO6RzGasQhbCEMElMXIor6sBQOF
    12 yeuirgpHpEHq+LlXZdU61BxvsGKsFyw8fZ+swDcJnskt7h3yuXu1Isp32I3wCnNx
    13 jUZT6Goo8josTrEe3FSIwqyvttzdfYET2bKhtuCFuQKBgQD9S+LH8Eatn+IDTCyn
    14 kJuV+Unu+vDvJlK5TKMt5KiYTpDGg5N/IexGJAZ4KFhxEWIYg1ucsor95VjkuV1W
    15 0m9OkxSda3L60qGZKVd1zysEbPqZfqVYEZEpTeeT8K9f3Jb4Gp9m0HPe0/gtoESl
    16 b8fZB7OcyT53zsq7F1PkYCg1cwKBgQDqzLiRBNSAZr+yhP1u3bYAkxR3JpoCLTyD
    17 n2LhUMTPeIS2WDnmcz5BTzaDh8uO/u4mXdR7TaSQu/YR9BPLbThxoxqBnvSQJwEH
    18 NcizDJeNT/5a+zObr2RNNXc70DauDzygIrVqEBqHDZxZ0480YIdB08reHuNT1iYe
    19 s0qdK/wVxwKBgQCJCQUoJlYWmOkt34hJH3MNMFFPeXPf7lvS5CNkMNEFlXu96nFh
    20 1nh9egAGAc3XXhA0MtzdabrIocv18lMNJcwSNoBwqjEKgenrcvJeSjZ7rnnlkR7j
    21 Bp4COqOO5if7NNx4Xe7fMOd/Ji6egJai6la0k/YYXMfvCXGkxnock+ktAQKBgQCG
    22 150jQ3faaaermS6GbfNo7w6wws1tdJctK+q4ZQ8x6w+kPJS74PEexqQS83iWnZcd
    23 F4PAcD2TFS7i7p4zlHz23emKCUSASLYRcvTYxuF+OTNlAqCHxzk+EfdwtUnBumRh
    24 vq0axTbG2q0w9Qtn1Au5ZS07VNfOvMxVkzfFfY4e3wKBgBy4QqTatz4YaONV0V9E
    25 CFGscH8W3ZkhSaqGcU0cVsmb1sJ1W66FfpAaY0RiXX6+WxOGUeXrBKZtNGqpEF/h
    26 5rHiyJN1vllgzrMUm/4v1PKC6wU9PvsRjUioedtB4U0+oi2Qz6p7fkJ8zCzHrX/z
    27 j2XhXbp+RQAr8IG74ff6Rpo5
    28 -----END PRIVATE KEY-----
     1-----BEGIN RSA PRIVATE KEY-----
     2MIIEpAIBAAKCAQEA0E2gnRI5i1LYYBovrQ/bVkqGYeNs8Y5Zm2X4pRghcwWH6thJ
     39LuFnPZ4TOU1GS4gWqLtEWdKWr6xVS6DkceU7rG4AC80QsXuN4RpXIAb9LAdacia
     4sdGa6kcRDdP3ylc1CwdTL8yzh9ztZkhwGoaVZb75ZHQte8Vz25vl9ATqf6WQYBIe
     5LO8EYS15jN8u8DCavvaNH6s2cBMZeQGOPRvH0jlT0FoN1fUD3x87p5YhhfrklVo5
     6ePqvzp3e3pxbSwCHmg4LCIfmjpULR//OfdY0BLvXMa/IdtuJ6fHtzm7PZHiCig8V
     7FxxzzbouFmFYx7sMJ5zBgJt16Zij5uWAwdxHxQIDAQABAoIBABaLYEe/sjSvCbYU
     8/3X2kmGbfUHY8HCQXIhiF/AeVXhyb8xuDksLhKGBV3HTGNUZ1eyZV5kbmcOKgfzb
     9JOhBNpBC8cwrT7euXmLp1NFrGBt6eCR7zqpSKjcS6/iYKWhf2eDQsSMqP4AD3DnG
     10u0NTr5Wsfqdtn4KW0zxAejnX0l1wJtNK3C3JgzQtkGWV3N4Zb4jL85HolZYhn4Dt
     11J9QONze+d47aW0CDYUI1QA3BsbIgGsbVl3D7/9NNC73Ucf8wwaJ9n5l1MW60IHKG
     12QH69Km/YhnvgJiJ+32oj/faSZGSaxlEFjP586CR9X3WVBNPED1UdEkUK9G5qBjk0
     1380IlEd0CgYEA7+1Jd4Oiw3VCyGVshK2voioiTuM8Bx7GPI80RSc5EcND8FJqRMRD
     14AMiaPdwdavbR+jQAQmjQiUHjQbpFb4p4ERabWtO0jQdT4mIVWfxEcnIOhLUNCcP8
     15WsUoLI3IsoYv5X5pHzmcXzKW8kl+zeKoBojwzJZ5C2kTioKlP5a43hMCgYEA3kH/
     16tdUpIvC5scxg7XbcutsVH4bi6exOt4CR9Y+ofCsfItb6gD2GNGeHCgecGlwiD8YS
     17GJuboWVSPAXoRPLIK+cNaT8nxc7N/CgeiPh36HGLx+peUHNix06IItMiFvxFHYpD
     18dwltgalW2M1Dwml2qw8VXgvWEIL1LXyI2s7ynccCgYBhT7etfrmEV0oX53MlOSD0
     19P+ycXHPbW3MB2v9TUP5HoxAqJ/MsIwIeDj7o+h8AZE10EqVMSiDSmuOmo/tHqzzZ
     20iXbHVvhy/tbaCfgpADVuya3zy08Xd+MhmbeaooMVTXGdvjC61m4C+ozYhlClBtop
     21lF8+S4WayCqB0k1dxi8C+wKBgQCSU2tRwEv79/aZixAJZub9kj0+62Q7U9ujTl9K
     22B1GKpi0yl8yGX3sax0oNnWL1q9C1B9dkIhZ9VKKmZ9E6i4ij9tNKhkzeG0BcEeHA
     23la0D+LVpYfDEEKNoylgwbUaVUXMDdsLh/O/+nIlT5RgGR77b8etEZpCBgGaAkuva
     24+sKagwKBgQCB4cyoXt8v2OQwFLUC2fUMkQgTwv1h+n6CIABAEpYmyiLMxpSWU4K4
     25cEcCafSan5FtnR8Hmtu9u8Jyleci3V2BeOrTWgXmot5scDnOX2wgKVG8KEaZmmdu
     26b26aklDLVGvMCsD5SPFmwbL3jxW57d8QPWuU6TfwXoGrM4Ri7uE+pg==
     27-----END RSA PRIVATE KEY-----

  • trunk/LayoutTests/imported/w3c/web-platform-tests/_certs/localhost.pem

    r179439 r181134  
    33        Version: 3 (0x2)
    44        Serial Number: 2 (0x2)
    5     Signature Algorithm: sha256WithRSAEncryption
     5        Signature Algorithm: sha256WithRSAEncryption
    66        Issuer: CN=web-platform-tests
    77        Validity
    8             Not Before: Jan 27 09:27:41 2015 GMT
    9             Not After : Feb 26 09:27:41 2015 GMT
     8            Not Before: Mar  6 02:47:26 2015 GMT
     9            Not After : Apr  5 02:47:26 2015 GMT
    1010        Subject: CN=localhost
    1111        Subject Public Key Info:
    1212            Public Key Algorithm: rsaEncryption
    13                 Public-Key: (2048 bit)
    14                 Modulus:
    15                     00:e8:51:ec:61:80:b6:ac:66:ed:73:09:db:00:30:
    16                     48:04:83:e1:41:65:95:2d:8f:0d:50:63:d2:8c:2a:
    17                     50:93:4b:56:78:65:96:cf:79:4c:9c:3c:e8:86:ea:
    18                     c5:c2:e9:0a:9c:5f:15:8b:a5:fd:21:57:ea:13:23:
    19                     55:06:c2:8a:cc:3f:aa:ab:d4:dd:b9:ea:d9:8a:c9:
    20                     28:7a:de:14:d8:72:24:b8:a4:bf:c6:64:72:d7:a9:
    21                     d0:de:0e:df:4c:a6:50:18:26:f3:5b:ec:40:6a:1a:
    22                     27:0c:19:85:47:34:ad:49:37:af:73:8e:77:b3:43:
    23                     d3:83:3a:4b:76:16:b3:b8:e9:15:99:ff:07:aa:5f:
    24                     e1:26:b9:72:02:87:07:69:3b:86:85:8f:79:ad:ac:
    25                     ec:15:c4:16:2e:45:2a:a9:1a:82:24:de:ac:84:56:
    26                     88:bd:67:f3:f3:bb:84:d7:af:f9:65:23:01:e9:01:
    27                     d0:04:ce:a6:06:09:09:44:58:a7:ba:89:ab:b2:ca:
    28                     97:b6:18:6a:6c:84:a8:47:e7:f5:5f:8f:bf:71:7b:
    29                     4f:b9:ad:31:dd:73:bf:63:9f:b4:46:8c:93:85:24:
    30                     25:19:73:ed:03:19:f3:3f:1d:af:0e:8b:a4:76:90:
    31                     88:39:b5:27:f9:17:86:f1:4b:bb:7e:60:7f:f9:d7:
    32                     fb:65
     13            RSA Public Key: (2048 bit)
     14                Modulus (2048 bit):
     15                    00:d0:4d:a0:9d:12:39:8b:52:d8:60:1a:2f:ad:0f:
     16                    db:56:4a:86:61:e3:6c:f1:8e:59:9b:65:f8:a5:18:
     17                    21:73:05:87:ea:d8:49:f4:bb:85:9c:f6:78:4c:e5:
     18                    35:19:2e:20:5a:a2:ed:11:67:4a:5a:be:b1:55:2e:
     19                    83:91:c7:94:ee:b1:b8:00:2f:34:42:c5:ee:37:84:
     20                    69:5c:80:1b:f4:b0:1d:69:c8:9a:b1:d1:9a:ea:47:
     21                    11:0d:d3:f7:ca:57:35:0b:07:53:2f:cc:b3:87:dc:
     22                    ed:66:48:70:1a:86:95:65:be:f9:64:74:2d:7b:c5:
     23                    73:db:9b:e5:f4:04:ea:7f:a5:90:60:12:1e:2c:ef:
     24                    04:61:2d:79:8c:df:2e:f0:30:9a:be:f6:8d:1f:ab:
     25                    36:70:13:19:79:01:8e:3d:1b:c7:d2:39:53:d0:5a:
     26                    0d:d5:f5:03:df:1f:3b:a7:96:21:85:fa:e4:95:5a:
     27                    39:78:fa:af:ce:9d:de:de:9c:5b:4b:00:87:9a:0e:
     28                    0b:08:87:e6:8e:95:0b:47:ff:ce:7d:d6:34:04:bb:
     29                    d7:31:af:c8:76:db:89:e9:f1:ed:ce:6e:cf:64:78:
     30                    82:8a:0f:15:17:1c:73:cd:ba:2e:16:61:58:c7:bb:
     31                    0c:27:9c:c1:80:9b:75:e9:98:a3:e6:e5:80:c1:dc:
     32                    47:c5
    3333                Exponent: 65537 (0x10001)
    3434        X509v3 extensions:
    … …  
    3636                CA:FALSE
    3737            X509v3 Subject Key Identifier:
    38                 F6:CB:82:64:B0:C4:02:1A:85:53:0E:9A:6B:D8:C2:30:AC:05:61:C8
     38                31:CE:2F:B4:8D:F8:09:33:5F:C6:E7:6B:39:C6:C8:EE:8D:40:08:23
    3939            X509v3 Authority Key Identifier:
    40                 keyid:0E:31:C1:0D:6C:94:E1:F0:D9:8C:C4:E4:A5:DF:FD:1C:CB:3B:CC:58
     40                keyid:A8:E4:4B:32:2E:48:E8:EC:5C:0E:40:F9:9D:C6:B0:D0:59:1E:86:23
    4141
    4242            X509v3 Key Usage:
    … …  
    4747                DNS:localhost, DNS:www.localhost, DNS:xn--n8j6ds53lwwkrqhv28a.localhost, DNS:xn--lve-6lad.localhost, DNS:www2.localhost, DNS:www1.localhost
    4848    Signature Algorithm: sha256WithRSAEncryption
    49          80:b4:23:83:d9:5b:c8:5f:fe:16:25:2c:df:64:88:08:6b:1e:
    50          f9:15:46:58:54:ce:e0:28:88:af:f1:58:c3:7f:c2:08:7c:8b:
    51          d4:2f:da:f3:c5:bd:95:26:f6:0e:0f:66:34:4e:6a:35:3c:14:
    52          69:eb:15:2e:fe:0d:0d:c1:ff:30:2d:32:ce:28:c8:8b:57:ac:
    53          fc:54:89:9c:37:01:22:08:fe:db:bb:40:96:ec:8b:97:61:9f:
    54          68:c8:25:4d:19:77:f7:a6:86:51:2c:f0:b7:39:2b:a0:79:83:
    55          4b:42:75:6e:ca:c6:2a:0c:28:8b:69:83:46:3e:9e:0f:0f:7e:
    56          1a:17:09:1b:9b:02:ce:21:87:c2:e2:0d:68:91:1b:3a:5c:6d:
    57          c5:05:c8:2b:13:d1:28:a3:ed:94:73:ea:7d:b5:b7:b8:4d:be:
    58          85:3c:af:66:46:1b:0a:27:5d:71:b5:c6:9d:dc:ff:d6:e4:23:
    59          ed:89:11:64:69:16:4f:2f:c5:d6:81:41:d4:75:8d:8e:9b:4d:
    60          87:1d:02:bd:a7:d0:cf:a2:41:fb:27:cf:52:cb:2e:19:49:41:
    61          5c:d4:2f:c7:39:13:98:72:66:1d:47:97:cb:6b:dd:31:53:4e:
    62          b2:b0:af:6c:86:a7:38:1f:a1:a3:9f:54:6b:e1:c7:a2:15:f1:
    63          f0:d4:5a:57
     49        54:f1:f8:f3:7f:dc:fc:10:67:6a:d1:1f:68:c8:11:7f:b6:7a:
     50        5d:62:1d:34:db:60:d0:f4:28:b9:74:9c:9d:9d:8d:f0:50:89:
     51        87:a6:23:2e:da:f3:f3:bf:0c:56:05:a5:7a:39:00:77:93:ab:
     52        68:ff:98:1d:9c:83:e2:b5:ab:a4:d8:b9:96:f0:d4:e6:68:4f:
     53        d8:e8:01:8f:c9:95:5c:41:88:16:d7:e0:8f:f9:5e:a4:eb:8b:
     54        95:2d:3c:b3:fc:0b:eb:b5:6b:a2:bb:6f:bf:1e:09:33:9c:af:
     55        93:e8:98:16:5e:f6:87:71:21:0c:0d:2c:57:17:00:1a:dc:dd:
     56        f4:1c:4a:15:18:34:cf:4d:13:7a:11:52:48:37:4f:0f:00:50:
     57        45:18:af:66:99:72:a5:28:13:ea:d4:45:c6:e3:19:e3:30:45:
     58        4a:72:7c:5a:88:68:4f:5d:f6:e5:1c:c3:30:49:a5:ba:e4:33:
     59        3b:2a:9c:1d:94:8e:3c:41:06:99:17:36:04:56:d7:24:4e:75:
     60        25:a8:ae:14:5a:a5:82:a2:2e:c8:76:00:0b:86:5c:5d:2f:b5:
     61        49:e3:24:09:e8:67:8b:48:6b:b6:95:da:57:c6:50:c0:24:95:
     62        54:14:24:08:62:38:da:d3:c6:63:87:cf:82:c1:35:ab:16:a6:
     63        17:03:5c:a9
    6464-----BEGIN CERTIFICATE-----
    6565MIIDnTCCAoWgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDDBJ3ZWIt
    66 cGxhdGZvcm0tdGVzdHMwHhcNMTUwMTI3MDkyNzQxWhcNMTUwMjI2MDkyNzQxWjAU
     66cGxhdGZvcm0tdGVzdHMwHhcNMTUwMzA2MDI0NzI2WhcNMTUwNDA1MDI0NzI2WjAU
    6767MRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
    68 AoIBAQDoUexhgLasZu1zCdsAMEgEg+FBZZUtjw1QY9KMKlCTS1Z4ZZbPeUycPOiG
    69 6sXC6QqcXxWLpf0hV+oTI1UGworMP6qr1N256tmKySh63hTYciS4pL/GZHLXqdDe
    70 Dt9MplAYJvNb7EBqGicMGYVHNK1JN69zjnezQ9ODOkt2FrO46RWZ/weqX+EmuXIC
    71 hwdpO4aFj3mtrOwVxBYuRSqpGoIk3qyEVoi9Z/Pzu4TXr/llIwHpAdAEzqYGCQlE
    72 WKe6iauyype2GGpshKhH5/Vfj79xe0+5rTHdc79jn7RGjJOFJCUZc+0DGfM/Ha8O
    73 i6R2kIg5tSf5F4bxS7t+YH/51/tlAgMBAAGjgfAwge0wCQYDVR0TBAIwADAdBgNV
    74 HQ4EFgQU9suCZLDEAhqFUw6aa9jCMKwFYcgwHwYDVR0jBBgwFoAUDjHBDWyU4fDZ
    75 jMTkpd/9HMs7zFgwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMH4G
     68AoIBAQDQTaCdEjmLUthgGi+tD9tWSoZh42zxjlmbZfilGCFzBYfq2En0u4Wc9nhM
     695TUZLiBaou0RZ0pavrFVLoORx5TusbgALzRCxe43hGlcgBv0sB1pyJqx0ZrqRxEN
     700/fKVzULB1MvzLOH3O1mSHAahpVlvvlkdC17xXPbm+X0BOp/pZBgEh4s7wRhLXmM
     713y7wMJq+9o0fqzZwExl5AY49G8fSOVPQWg3V9QPfHzunliGF+uSVWjl4+q/Ond7e
     72nFtLAIeaDgsIh+aOlQtH/8591jQEu9cxr8h224np8e3Obs9keIKKDxUXHHPNui4W
     73YVjHuwwnnMGAm3XpmKPm5YDB3EfFAgMBAAGjgfAwge0wCQYDVR0TBAIwADAdBgNV
     74HQ4EFgQUMc4vtI34CTNfxudrOcbI7o1ACCMwHwYDVR0jBBgwFoAUqORLMi5I6Oxc
     75DkD5ncaw0FkehiMwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMH4G
    7676A1UdEQR3MHWCCWxvY2FsaG9zdIINd3d3LmxvY2FsaG9zdIIheG4tLW44ajZkczUz
    7777bHd3a3JxaHYyOGEubG9jYWxob3N0ghZ4bi0tbHZlLTZsYWQubG9jYWxob3N0gg53
    7878d3cyLmxvY2FsaG9zdIIOd3d3MS5sb2NhbGhvc3QwDQYJKoZIhvcNAQELBQADggEB
    79 AIC0I4PZW8hf/hYlLN9kiAhrHvkVRlhUzuAoiK/xWMN/wgh8i9Qv2vPFvZUm9g4P
    80 ZjROajU8FGnrFS7+DQ3B/zAtMs4oyItXrPxUiZw3ASII/tu7QJbsi5dhn2jIJU0Z
    81 d/emhlEs8Lc5K6B5g0tCdW7KxioMKItpg0Y+ng8PfhoXCRubAs4hh8LiDWiRGzpc
    82 bcUFyCsT0Sij7ZRz6n21t7hNvoU8r2ZGGwonXXG1xp3c/9bkI+2JEWRpFk8vxdaB
    83 QdR1jY6bTYcdAr2n0M+iQfsnz1LLLhlJQVzUL8c5E5hyZh1Hl8tr3TFTTrKwr2yG
    84 pzgfoaOfVGvhx6IV8fDUWlc=
     79AFTx+PN/3PwQZ2rRH2jIEX+2el1iHTTbYND0KLl0nJ2djfBQiYemIy7a8/O/DFYF
     80pXo5AHeTq2j/mB2cg+K1q6TYuZbw1OZoT9joAY/JlVxBiBbX4I/5XqTri5UtPLP8
     81C+u1a6K7b78eCTOcr5PomBZe9odxIQwNLFcXABrc3fQcShUYNM9NE3oRUkg3Tw8A
     82UEUYr2aZcqUoE+rURcbjGeMwRUpyfFqIaE9d9uUcwzBJpbrkMzsqnB2UjjxBBpkX
     83NgRW1yROdSWorhRapYKiLsh2AAuGXF0vtUnjJAnoZ4tIa7aV2lfGUMAklVQUJAhi
     84ONrTxmOHz4LBNasWphcDXKk=
    8585-----END CERTIFICATE-----

  • trunk/LayoutTests/imported/w3c/web-platform-tests/_certs/serial

    r179439 r181134  
    1 01
     103

  • trunk/Source/WebCore/ChangeLog

    r181133 r181134  
     12015-03-05  Oliver Hunt  <oliver@apple.com>
     2
     3        Block mixed mode content
     4        https://bugs.webkit.org/show_bug.cgi?id=142378
     5
     6        Reviewed by Darin Adler.
     7
     8        Switched to blocking mixed mode content by default,
     9        and modify the blocking rules to allow us to match
     10        the behaviours of other browsers.
     11
     12        * loader/DocumentLoader.cpp:
     13        (WebCore::DocumentLoader::willSendRequest):
     14        * loader/MixedContentChecker.cpp:
     15        (WebCore::MixedContentChecker::canDisplayInsecureContent):
     16        (WebCore::MixedContentChecker::canRunInsecureContent):
     17        (WebCore::MixedContentChecker::logWarning):
     18        * loader/MixedContentChecker.h:
     19        * loader/cache/CachedResourceLoader.cpp:
     20        (WebCore::contentTypeFromResourceType):
     21        (WebCore::CachedResourceLoader::checkInsecureContent):
     22        * page/Settings.in:
     23
    1242015-03-05  Chris Dumez  <cdumez@apple.com>
    225

  • trunk/Source/WebCore/loader/DocumentLoader.cpp

    r181037 r181134  
    543543    Frame& topFrame = m_frame->tree().top();
    544544    if (&topFrame != m_frame) {
    545         if (!frameLoader()->mixedContentChecker().canDisplayInsecureContent(topFrame.document()->securityOrigin(), newRequest.url())) {
     545        if (!frameLoader()->mixedContentChecker().canDisplayInsecureContent(topFrame.document()->securityOrigin(), MixedContentChecker::ContentType::Active, newRequest.url())) {
    546546            cancelMainResourceLoad(frameLoader()->cancelledError(newRequest));
    547547            return;

  • trunk/Source/WebCore/loader/MixedContentChecker.cpp

    r173142 r181134  
    6161}
    6262
    63 bool MixedContentChecker::canDisplayInsecureContent(SecurityOrigin* securityOrigin, const URL& url) const
     63bool MixedContentChecker::canDisplayInsecureContent(SecurityOrigin* securityOrigin, ContentType type, const URL& url) const
    6464{
    6565    if (!isMixedContent(securityOrigin, url))
    6666        return true;
    6767
    68     bool allowed = m_frame.settings().allowDisplayOfInsecureContent();
    69     logWarning(allowed, "displayed", url);
     68    bool allowed = m_frame.settings().allowDisplayOfInsecureContent() || type == ContentType::ActiveCanWarn;
     69    logWarning(allowed, "display", url);
    7070
    7171    if (allowed)
    … …  
    8181
    8282    bool allowed = m_frame.settings().allowRunningOfInsecureContent();
    83     logWarning(allowed, "ran", url);
     83    logWarning(allowed, "run", url);
    8484
    8585    if (allowed)
    … …  
    9191void MixedContentChecker::logWarning(bool allowed, const String& action, const URL& target) const
    9292{
    93     String message = makeString((allowed ? String() : "[blocked] "), "The page at ", m_frame.document()->url().stringCenterEllipsizedToLength(), ' ', action, " insecure content from ", target.stringCenterEllipsizedToLength(), ".\n");
     93    const char* errorString = allowed ? " was allowed to " : " was not allowed to ";
     94    String message = makeString((allowed ? String() : "[blocked] "), "The page at ", m_frame.document()->url().stringCenterEllipsizedToLength(), errorString, action, " insecure content from ", target.stringCenterEllipsizedToLength(), ".\n");
    9495    m_frame.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Warning, message);
    9596}

  • trunk/Source/WebCore/loader/MixedContentChecker.h

    r158958 r181134  
    4545    WTF_MAKE_NONCOPYABLE(MixedContentChecker);
    4646public:
     47    enum class ContentType {
     48        Active,
     49        ActiveCanWarn,
     50    };
     51
    4752    MixedContentChecker(Frame&);
    4853
    49     bool canDisplayInsecureContent(SecurityOrigin*, const URL&) const;
     54    bool canDisplayInsecureContent(SecurityOrigin*, ContentType, const URL&) const;
    5055    bool canRunInsecureContent(SecurityOrigin*, const URL&) const;
    5156    static bool isMixedContent(SecurityOrigin*, const URL&);

  • trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

    r180978 r181134  
    272272}
    273273
     274static MixedContentChecker::ContentType contentTypeFromResourceType(CachedResource::Type type)
     275{
     276    switch (type) {
     277    case CachedResource::ImageResource:
     278            return MixedContentChecker::ContentType::ActiveCanWarn;
     279
     280    case CachedResource::CSSStyleSheet:
     281    case CachedResource::Script:
     282    case CachedResource::FontResource:
     283        return MixedContentChecker::ContentType::Active;
     284
     285#if ENABLE(SVG_FONTS)
     286    case CachedResource::SVGFontResource:
     287        return MixedContentChecker::ContentType::Active;
     288#endif
     289
     290    case CachedResource::RawResource:
     291    case CachedResource::SVGDocumentResource:
     292        return MixedContentChecker::ContentType::Active;
     293#if ENABLE(XSLT)
     294    case CachedResource::XSLStyleSheet:
     295        return MixedContentChecker::ContentType::Active;
     296#endif
     297
     298#if ENABLE(LINK_PREFETCH)
     299    case CachedResource::LinkPrefetch:
     300    case CachedResource::LinkSubresource:
     301        return MixedContentChecker::ContentType::Active;
     302#endif
     303
     304#if ENABLE(VIDEO_TRACK)
     305    case CachedResource::TextTrackResource:
     306        return MixedContentChecker::ContentType::Active;
     307#endif
     308    default:
     309        ASSERT_NOT_REACHED();
     310        return MixedContentChecker::ContentType::Active;
     311    }
     312}
     313
    274314bool CachedResourceLoader::checkInsecureContent(CachedResource::Type type, const URL& url) const
    275315{
    … …  
    299339        if (Frame* f = frame()) {
    300340            Frame& topFrame = f->tree().top();
    301             if (!topFrame.loader().mixedContentChecker().canDisplayInsecureContent(topFrame.document()->securityOrigin(), url))
     341            if (!topFrame.loader().mixedContentChecker().canDisplayInsecureContent(topFrame.document()->securityOrigin(), contentTypeFromResourceType(type), url))
    302342                return false;
    303343        }

  • trunk/Source/WebCore/page/Settings.in

    r180570 r181134  
    123123shouldInjectUserScriptsInInitialEmptyDocument initial=false
    124124fixedElementsLayoutRelativeToFrame initial=false
    125 allowDisplayOfInsecureContent initial=true
    126 allowRunningOfInsecureContent initial=true
     125allowDisplayOfInsecureContent initial=false
     126allowRunningOfInsecureContent initial=false
    127127mediaPlaybackRequiresUserGesture initial=defaultMediaPlaybackRequiresUserGesture
    128128mediaPlaybackAllowsInline initial=defaultMediaPlaybackAllowsInline
Note: See TracChangeset for help on using the changeset viewer.