Changeset 189633 in webkit

Timestamp:

Sep 11, 2015 2:34:15 PM (9 years ago)

Author:

keith_miller@apple.com

Message:

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.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• WTF.xcodeproj/project.pbxproj (modified) (4 diffs)
• wtf/OSRandomSource.cpp (modified) (2 diffs)
• wtf/spi/darwin/CommonCryptoSPI.h (added)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+
+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.
+
 2015-09-08  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

@@ -279 +279 @@
                 CE46516E19DB1FB4003ECA05 /* NSMapTableSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */; };
                 CE73E02519DCB7AB00580D5C /* XPCSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE73E02419DCB7AB00580D5C /* XPCSPI.h */; };
+                DE5A09FC1BA36992003D4424 /* CommonCryptoSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = DE5A09FB1BA36992003D4424 /* CommonCryptoSPI.h */; };
                 E15556F518A0CC18006F48FB /* CryptographicUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E15556F318A0CC18006F48FB /* CryptographicUtilities.cpp */; };
                 E15556F618A0CC18006F48FB /* CryptographicUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = E15556F418A0CC18006F48FB /* CryptographicUtilities.h */; };
@@ -576 +577 @@
                 CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSMapTableSPI.h; sourceTree = "<group>"; };
                 CE73E02419DCB7AB00580D5C /* XPCSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCSPI.h; sourceTree = "<group>"; };
+                DE5A09FB1BA36992003D4424 /* CommonCryptoSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonCryptoSPI.h; sourceTree = "<group>"; };
                 E15556F318A0CC18006F48FB /* CryptographicUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptographicUtilities.cpp; sourceTree = "<group>"; };
                 E15556F418A0CC18006F48FB /* CryptographicUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptographicUtilities.h; sourceTree = "<group>"; };
@@ -1022 +1024 @@
                         isa = PBXGroup;
                         children = (
+                                DE5A09FB1BA36992003D4424 /* CommonCryptoSPI.h */,
                                 CE73E02419DCB7AB00580D5C /* XPCSPI.h */,
                         );
@@ -1191 +1194 @@
                                 A8A47428151A825B004123FF /* StackBounds.h in Headers */,
                                 FEDACD3E1630F83F00C69634 /* StackStats.h in Headers */,
+                                DE5A09FC1BA36992003D4424 /* CommonCryptoSPI.h in Headers */,
                                 A8A47429151A825B004123FF /* StaticConstructors.h in Headers */,
                                 A8A4742A151A825B004123FF /* StdLibExtras.h in Headers */,

trunk/Source/WTF/wtf/OSRandomSource.cpp

@@ -41 +41 @@
 #endif
 
+#if OS(DARWIN)
+#include "CommonCryptoSPI.h"
+#endif
+
 namespace WTF {
 
@@ -58 +62 @@
 {
 #if OS(DARWIN)
-    return arc4random_buf(buffer, length);
+    RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length));
 #elif OS(UNIX)
     int fd = open("/dev/urandom", O_RDONLY, 0);