<!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>[190789] branches/safari-601.1.46-branch/Source/WTF</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/190789">190789</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-09 07:21:29 -0700 (Fri, 09 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/189633">r189633</a>. rdar://problem/22824424</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWTFChangeLog">branches/safari-601.1.46-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWTFWTFxcodeprojprojectpbxproj">branches/safari-601.1.46-branch/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari601146branchSourceWTFwtfOSRandomSourcecpp">branches/safari-601.1.46-branch/Source/WTF/wtf/OSRandomSource.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWTFwtfspidarwinCommonCryptoSPIh">branches/safari-601.1.46-branch/Source/WTF/wtf/spi/darwin/CommonCryptoSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WTF/ChangeLog (190788 => 190789)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WTF/ChangeLog 2015-10-09 14:21:24 UTC (rev 190788)
+++ branches/safari-601.1.46-branch/Source/WTF/ChangeLog 2015-10-09 14:21:29 UTC (rev 190789)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+
+2015-09-11 Keith Miller <keith_miller@apple.com>
+
+ cryptographicallyRandomValuesFromOS should use CCRandomCopyBytes when available.
+ https://bugs.webkit.org/show_bug.cgi?id=148439
+
+ Reviewed by Alexey Proskuryakov.
+
+ Recently, we switched to using arc4random_buf on Darwin but further research indicates that
+ arc4random_buf has the same behavior we had before and thus we were just pushing the problem
+ further down the stack. CCRandomCopyBytes, however, appears to be more advanced and has much
+ better error handling than we had before.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/OSRandomSource.cpp:
+ (WTF::cryptographicallyRandomValuesFromOS):
+ * wtf/spi/darwin/CommonCryptoSPI.h: Added.
+
</ins><span class="cx"> 2015-07-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r187129
</span></span></pre></div>
<a id="branchessafari601146branchSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WTF/WTF.xcodeproj/project.pbxproj (190788 => 190789)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WTF/WTF.xcodeproj/project.pbxproj 2015-10-09 14:21:24 UTC (rev 190788)
+++ branches/safari-601.1.46-branch/Source/WTF/WTF.xcodeproj/project.pbxproj 2015-10-09 14:21:29 UTC (rev 190789)
</span><span class="lines">@@ -271,6 +271,7 @@
</span><span class="cx"> CD5497AD15857D0300B5BC30 /* MediaTime.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5497AB15857D0300B5BC30 /* MediaTime.h */; };
</span><span class="cx"> CE46516E19DB1FB4003ECA05 /* NSMapTableSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */; };
</span><span class="cx"> CE73E02519DCB7AB00580D5C /* XPCSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE73E02419DCB7AB00580D5C /* XPCSPI.h */; };
</span><ins>+ DE5A09FC1BA36992003D4424 /* CommonCryptoSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = DE5A09FB1BA36992003D4424 /* CommonCryptoSPI.h */; };
</ins><span class="cx"> E15556F518A0CC18006F48FB /* CryptographicUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E15556F318A0CC18006F48FB /* CryptographicUtilities.cpp */; };
</span><span class="cx"> E15556F618A0CC18006F48FB /* CryptographicUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = E15556F418A0CC18006F48FB /* CryptographicUtilities.h */; };
</span><span class="cx"> E4A0AD391A96245500536DF6 /* WorkQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4A0AD371A96245500536DF6 /* WorkQueue.cpp */; };
</span><span class="lines">@@ -563,6 +564,7 @@
</span><span class="cx"> CD5497AB15857D0300B5BC30 /* MediaTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaTime.h; sourceTree = "<group>"; };
</span><span class="cx"> CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSMapTableSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CE73E02419DCB7AB00580D5C /* XPCSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCSPI.h; sourceTree = "<group>"; };
</span><ins>+ DE5A09FB1BA36992003D4424 /* CommonCryptoSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonCryptoSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> E15556F318A0CC18006F48FB /* CryptographicUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptographicUtilities.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E15556F418A0CC18006F48FB /* CryptographicUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptographicUtilities.h; sourceTree = "<group>"; };
</span><span class="cx"> E4A0AD371A96245500536DF6 /* WorkQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkQueue.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -1005,6 +1007,7 @@
</span><span class="cx"> CE73E02319DCB7AB00580D5C /* darwin */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ DE5A09FB1BA36992003D4424 /* CommonCryptoSPI.h */,
</ins><span class="cx"> CE73E02419DCB7AB00580D5C /* XPCSPI.h */,
</span><span class="cx"> );
</span><span class="cx"> path = darwin;
</span><span class="lines">@@ -1171,6 +1174,7 @@
</span><span class="cx"> A8A47426151A825B004123FF /* Spectrum.h in Headers */,
</span><span class="cx"> A8A47428151A825B004123FF /* StackBounds.h in Headers */,
</span><span class="cx"> FEDACD3E1630F83F00C69634 /* StackStats.h in Headers */,
</span><ins>+ DE5A09FC1BA36992003D4424 /* CommonCryptoSPI.h in Headers */,
</ins><span class="cx"> A8A47429151A825B004123FF /* StaticConstructors.h in Headers */,
</span><span class="cx"> A8A4742A151A825B004123FF /* StdLibExtras.h in Headers */,
</span><span class="cx"> 1A6BB769162F300500DD16DB /* StreamBuffer.h in Headers */,
</span></span></pre></div>
<a id="branchessafari601146branchSourceWTFwtfOSRandomSourcecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WTF/wtf/OSRandomSource.cpp (190788 => 190789)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WTF/wtf/OSRandomSource.cpp 2015-10-09 14:21:24 UTC (rev 190788)
+++ branches/safari-601.1.46-branch/Source/WTF/wtf/OSRandomSource.cpp 2015-10-09 14:21:29 UTC (rev 190789)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="lines">@@ -40,8 +40,13 @@
</span><span class="cx"> #include <wincrypt.h> // windows.h must be included before wincrypt.h.
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if OS(DARWIN)
+#include "CommonCryptoSPI.h"
+#endif
+
</ins><span class="cx"> namespace WTF {
</span><span class="cx">
</span><ins>+#if !OS(DARWIN) && OS(UNIX)
</ins><span class="cx"> NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom()
</span><span class="cx"> {
</span><span class="cx"> CRASH();
</span><span class="lines">@@ -51,10 +56,13 @@
</span><span class="cx"> {
</span><span class="cx"> CRASH();
</span><span class="cx"> }
</span><del>-
</del><ins>+#endif
+
</ins><span class="cx"> void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length)
</span><span class="cx"> {
</span><del>-#if OS(UNIX)
</del><ins>+#if OS(DARWIN)
+ RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length));
+#elif OS(UNIX)
</ins><span class="cx"> int fd = open("/dev/urandom", O_RDONLY, 0);
</span><span class="cx"> if (fd < 0)
</span><span class="cx"> crashUnableToOpenURandom(); // We need /dev/urandom for this API to work...
</span><span class="lines">@@ -70,7 +78,7 @@
</span><span class="cx"> } else
</span><span class="cx"> amountRead += currentRead;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> close(fd);
</span><span class="cx">
</span><span class="cx"> #elif OS(WINDOWS)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWTFwtfspidarwinCommonCryptoSPIh"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/Source/WTF/wtf/spi/darwin/CommonCryptoSPI.h (0 => 190789)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WTF/wtf/spi/darwin/CommonCryptoSPI.h (rev 0)
+++ branches/safari-601.1.46-branch/Source/WTF/wtf/spi/darwin/CommonCryptoSPI.h 2015-10-09 14:21:29 UTC (rev 190789)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CommonCryptoSPI_h
+#define CommonCryptoSPI_h
+
+#if OS(DARWIN)
+
+#if defined(__has_include)
+#if __has_include(<CommonCrypto/CommonRandomSPI.h>)
+#include <CommonCrypto/CommonRandomSPI.h>
+#endif
+#endif
+
+typedef struct __CCRandom* CCRandomRef;
+extern const CCRandomRef kCCRandomDefault;
+extern "C" int CCRandomCopyBytes(CCRandomRef rnd, void *bytes, size_t count);
+
+#endif // OS(DARWIN)
+
+#endif /* CommonCryptoSPI_h */
</ins></span></pre>
</div>
</div>
</body>
</html>