<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[208858] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/208858">208858</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-11-17 13:20:20 -0800 (Thu, 17 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>keygen element should not support < 2048 RSA key lengths
https://bugs.webkit.org/show_bug.cgi?id=164874
<rdar://problem/22618141>
Reviewed by Dean Jackson.
Source/WebCore:
Remove the two insecure RSA choices (512-bit and 1024-bit) so that users
do not accidentally select a bad key length.
Tested by fast/html/keygen.html
* platform/LocalizedStrings.cpp:
(WebCore::keygenMenuItem512): Deleted.
(WebCore::keygenMenuItem1024): Deleted.
* platform/LocalizedStrings.h:
* platform/mac/SSLKeyGeneratorMac.mm:
(WebCore::signedPublicKeyAndChallengeString): ASSERT on bad key size.
(WebCore::getSupportedKeySizes): Remove bad key sizes.
(WebCore::signedPublicKeyAndChallengeString): Ditto.
* platform/win/SSLKeyGeneratorWin.cpp:
(WebCore::WebCore::getSupportedKeySizes): Ditto.
LayoutTests:
* platform/mac/fast/html/keygen-expected.txt:
* platform/mac-elcapitan/fast/html/keygen-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasthtmlkeygenexpectedtxt">trunk/LayoutTests/platform/mac/fast/html/keygen-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacelcapitanfasthtmlkeygenexpectedtxt">trunk/LayoutTests/platform/mac-elcapitan/fast/html/keygen-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformLocalizedStringscpp">trunk/Source/WebCore/platform/LocalizedStrings.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLocalizedStringsh">trunk/Source/WebCore/platform/LocalizedStrings.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacSSLKeyGeneratorMacmm">trunk/Source/WebCore/platform/mac/SSLKeyGeneratorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformwinSSLKeyGeneratorWincpp">trunk/Source/WebCore/platform/win/SSLKeyGeneratorWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208857 => 208858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-17 20:25:24 UTC (rev 208857)
+++ trunk/LayoutTests/ChangeLog 2016-11-17 21:20:20 UTC (rev 208858)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-17 Brent Fulgham <bfulgham@apple.com>
+
+ keygen element should not support < 2048 RSA key lengths
+ https://bugs.webkit.org/show_bug.cgi?id=164874
+ <rdar://problem/22618141>
+
+ Reviewed by Dean Jackson.
+
+ * platform/mac/fast/html/keygen-expected.txt:
+ * platform/mac-elcapitan/fast/html/keygen-expected.txt:
+
</ins><span class="cx"> 2016-11-17 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Shift clicking on named color value only shows its hex form
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasthtmlkeygenexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/html/keygen-expected.txt (208857 => 208858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/html/keygen-expected.txt 2016-11-17 20:25:24 UTC (rev 208857)
+++ trunk/LayoutTests/platform/mac/fast/html/keygen-expected.txt 2016-11-17 21:20:20 UTC (rev 208858)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><del>- RenderBlock {KEYGEN} at (2,2) size 145x18
- RenderMenuList {SELECT} at (0,0) size 145x18 [bgcolor=#FFFFFF]
- RenderBlock (anonymous) at (0,0) size 145x18
</del><ins>+ RenderBlock {KEYGEN} at (2,2) size 128x18
+ RenderMenuList {SELECT} at (0,0) size 128x18 [bgcolor=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 128x18
</ins><span class="cx"> RenderText at (8,2) size 99x13
</span><span class="cx"> text run at (8,2) width 99: "2048 (High Grade)"
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacelcapitanfasthtmlkeygenexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-elcapitan/fast/html/keygen-expected.txt (208857 => 208858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-elcapitan/fast/html/keygen-expected.txt 2016-11-17 20:25:24 UTC (rev 208857)
+++ trunk/LayoutTests/platform/mac-elcapitan/fast/html/keygen-expected.txt 2016-11-17 21:20:20 UTC (rev 208858)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><del>- RenderBlock {KEYGEN} at (2,2) size 146x18
- RenderMenuList {SELECT} at (0,0) size 146x18 [bgcolor=#FFFFFF]
- RenderBlock (anonymous) at (0,0) size 146x18
</del><ins>+ RenderBlock {KEYGEN} at (2,2) size 128x18
+ RenderMenuList {SELECT} at (0,0) size 128x18 [bgcolor=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 128x18
</ins><span class="cx"> RenderText at (8,2) size 97x13
</span><span class="cx"> text run at (8,2) width 97: "2048 (High Grade)"
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208857 => 208858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-17 20:25:24 UTC (rev 208857)
+++ trunk/Source/WebCore/ChangeLog 2016-11-17 21:20:20 UTC (rev 208858)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-11-17 Brent Fulgham <bfulgham@apple.com>
+
+ keygen element should not support < 2048 RSA key lengths
+ https://bugs.webkit.org/show_bug.cgi?id=164874
+ <rdar://problem/22618141>
+
+ Reviewed by Dean Jackson.
+
+ Remove the two insecure RSA choices (512-bit and 1024-bit) so that users
+ do not accidentally select a bad key length.
+
+ Tested by fast/html/keygen.html
+
+ * platform/LocalizedStrings.cpp:
+ (WebCore::keygenMenuItem512): Deleted.
+ (WebCore::keygenMenuItem1024): Deleted.
+ * platform/LocalizedStrings.h:
+ * platform/mac/SSLKeyGeneratorMac.mm:
+ (WebCore::signedPublicKeyAndChallengeString): ASSERT on bad key size.
+ (WebCore::getSupportedKeySizes): Remove bad key sizes.
+ (WebCore::signedPublicKeyAndChallengeString): Ditto.
+ * platform/win/SSLKeyGeneratorWin.cpp:
+ (WebCore::WebCore::getSupportedKeySizes): Ditto.
+
</ins><span class="cx"> 2016-11-17 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream][Mac] Use AVCapturePreview object for camera/microphone rendering
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (208857 => 208858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2016-11-17 20:25:24 UTC (rev 208857)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2016-11-17 21:20:20 UTC (rev 208858)
</span><span class="lines">@@ -867,16 +867,6 @@
</span><span class="cx"> return WEB_UI_STRING("PostScript", "Description of the PostScript type supported by the PDF pseudo plug-in. Visible in the Installed Plug-ins page in Safari.");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String keygenMenuItem512()
-{
- return WEB_UI_STRING("512 (Low Grade)", "Menu item title for KEYGEN pop-up menu");
-}
-
-String keygenMenuItem1024()
-{
- return WEB_UI_STRING("1024 (Medium Grade)", "Menu item title for KEYGEN pop-up menu");
-}
-
</del><span class="cx"> String keygenMenuItem2048()
</span><span class="cx"> {
</span><span class="cx"> return WEB_UI_STRING("2048 (High Grade)", "Menu item title for KEYGEN pop-up menu");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.h (208857 => 208858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.h 2016-11-17 20:25:24 UTC (rev 208857)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h 2016-11-17 21:20:20 UTC (rev 208858)
</span><span class="lines">@@ -224,8 +224,6 @@
</span><span class="cx"> WEBCORE_EXPORT String builtInPDFPluginName();
</span><span class="cx"> WEBCORE_EXPORT String pdfDocumentTypeDescription();
</span><span class="cx"> WEBCORE_EXPORT String postScriptDocumentTypeDescription();
</span><del>- String keygenMenuItem512();
- String keygenMenuItem1024();
</del><span class="cx"> String keygenMenuItem2048();
</span><span class="cx"> String keygenKeychainItemName(const String& host);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacSSLKeyGeneratorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/SSLKeyGeneratorMac.mm (208857 => 208858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/SSLKeyGeneratorMac.mm 2016-11-17 20:25:24 UTC (rev 208857)
+++ trunk/Source/WebCore/platform/mac/SSLKeyGeneratorMac.mm 2016-11-17 21:20:20 UTC (rev 208858)
</span><span class="lines">@@ -124,6 +124,8 @@
</span><span class="cx">
</span><span class="cx"> static String signedPublicKeyAndChallengeString(unsigned keySize, const CString& challenge, const String& keyDescription)
</span><span class="cx"> {
</span><ins>+ ASSERT(keySize >= 2048);
+
</ins><span class="cx"> SignedPublicKeyAndChallenge signedPublicKeyAndChallenge { };
</span><span class="cx">
</span><span class="cx"> RetainPtr<SecAccessRef> access;
</span><span class="lines">@@ -215,8 +217,6 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(supportedKeySizes.isEmpty());
</span><span class="cx"> supportedKeySizes.append(keygenMenuItem2048());
</span><del>- supportedKeySizes.append(keygenMenuItem1024());
- supportedKeySizes.append(keygenMenuItem512());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String& challengeString, const URL& url)
</span><span class="lines">@@ -227,12 +227,6 @@
</span><span class="cx"> case 0:
</span><span class="cx"> keySize = 2048;
</span><span class="cx"> break;
</span><del>- case 1:
- keySize = 1024;
- break;
- case 2:
- keySize = 512;
- break;
</del><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return String();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinSSLKeyGeneratorWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/SSLKeyGeneratorWin.cpp (208857 => 208858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/SSLKeyGeneratorWin.cpp 2016-11-17 20:25:24 UTC (rev 208857)
+++ trunk/Source/WebCore/platform/win/SSLKeyGeneratorWin.cpp 2016-11-17 21:20:20 UTC (rev 208858)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Strings should be localizable.
</span><span class="cx"> v.append("High Grade");
</span><del>- v.append("Medium Grade");
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebCore::signedPublicKeyAndChallengeString(unsigned index, const String& challenge, const URL& url)
</span></span></pre>
</div>
</div>
</body>
</html>