<!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>[182895] trunk/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/182895">182895</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-04-16 10:44:13 -0700 (Thu, 16 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use CommonCrypto for SHA1 and MD5
https://bugs.webkit.org/show_bug.cgi?id=143826
Reviewed by Anders Carlsson.
CommonCrypto SHA1 implementation is ~4x faster than the naive WTF one. Use it when available.
These are covered by existing API tests.
* wtf/MD5.cpp:
(WTF::MD5::MD5):
(WTF::MD5::addBytes):
(WTF::MD5::checksum):
* wtf/MD5.h:
* wtf/SHA1.cpp:
(WTF::SHA1::SHA1):
(WTF::SHA1::addBytes):
(WTF::SHA1::computeHash):
Remove the side effect where computeHash resets the state. No one relies on it.
(WTF::SHA1::hexDigest):
(WTF::SHA1::computeHexDigest):
* wtf/SHA1.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfMD5cpp">trunk/Source/WTF/wtf/MD5.cpp</a></li>
<li><a href="#trunkSourceWTFwtfMD5h">trunk/Source/WTF/wtf/MD5.h</a></li>
<li><a href="#trunkSourceWTFwtfSHA1cpp">trunk/Source/WTF/wtf/SHA1.cpp</a></li>
<li><a href="#trunkSourceWTFwtfSHA1h">trunk/Source/WTF/wtf/SHA1.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (182894 => 182895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-04-16 17:32:27 UTC (rev 182894)
+++ trunk/Source/WTF/ChangeLog 2015-04-16 17:44:13 UTC (rev 182895)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-04-16 Antti Koivisto <antti@apple.com>
+
+ Use CommonCrypto for SHA1 and MD5
+ https://bugs.webkit.org/show_bug.cgi?id=143826
+
+ Reviewed by Anders Carlsson.
+
+ CommonCrypto SHA1 implementation is ~4x faster than the naive WTF one. Use it when available.
+
+ These are covered by existing API tests.
+
+ * wtf/MD5.cpp:
+ (WTF::MD5::MD5):
+ (WTF::MD5::addBytes):
+ (WTF::MD5::checksum):
+ * wtf/MD5.h:
+ * wtf/SHA1.cpp:
+ (WTF::SHA1::SHA1):
+ (WTF::SHA1::addBytes):
+ (WTF::SHA1::computeHash):
+
+ Remove the side effect where computeHash resets the state. No one relies on it.
+
+ (WTF::SHA1::hexDigest):
+ (WTF::SHA1::computeHexDigest):
+ * wtf/SHA1.h:
+
</ins><span class="cx"> 2015-04-16 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove the unnecessary WTF_CHANGES define
</span></span></pre></div>
<a id="trunkSourceWTFwtfMD5cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MD5.cpp (182894 => 182895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MD5.cpp 2015-04-16 17:32:27 UTC (rev 182894)
+++ trunk/Source/WTF/wtf/MD5.cpp 2015-04-16 17:44:13 UTC (rev 182895)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> // Modifications Copyright 2006 Google Inc. All Rights Reserved
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -58,6 +59,25 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+
+MD5::MD5()
+{
+ CC_MD5_Init(&m_context);
+}
+
+void MD5::addBytes(const uint8_t* input, size_t length)
+{
+ CC_MD5_Update(&m_context, input, length);
+}
+
+void MD5::checksum(Digest& hash)
+{
+ CC_MD5_Final(hash.data(), &m_context);
+}
+
+#else
+
</ins><span class="cx"> // Note: this code is harmless on little-endian machines.
</span><span class="cx">
</span><span class="cx"> static void toLittleEndian(uint8_t* buf, unsigned longs)
</span><span class="lines">@@ -264,4 +284,6 @@
</span><span class="cx"> memset(m_in, 0, sizeof(m_in));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif
+
</ins><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtfMD5h"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MD5.h (182894 => 182895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MD5.h 2015-04-16 17:32:27 UTC (rev 182894)
+++ trunk/Source/WTF/wtf/MD5.h 2015-04-16 17:44:13 UTC (rev 182895)
</span><span class="lines">@@ -34,6 +34,10 @@
</span><span class="cx"> #include <array>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+#include <CommonCrypto/CommonDigest.h>
+#endif
+
</ins><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> class MD5 {
</span><span class="lines">@@ -56,9 +60,13 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE void checksum(Digest&);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+#if PLATFORM(COCOA)
+ CC_MD5_CTX m_context;
+#else
</ins><span class="cx"> uint32_t m_buf[4];
</span><span class="cx"> uint32_t m_bits[2];
</span><span class="cx"> uint8_t m_in[64];
</span><ins>+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtfSHA1cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/SHA1.cpp (182894 => 182895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/SHA1.cpp 2015-04-16 17:32:27 UTC (rev 182894)
+++ trunk/Source/WTF/wtf/SHA1.cpp 2015-04-16 17:44:13 UTC (rev 182895)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -28,10 +29,6 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// A straightforward SHA-1 implementation based on RFC 3174.
-// http://www.ietf.org/rfc/rfc3174.txt
-// The names of functions and variables (such as "a", "b", and "f") follow notations in RFC 3174.
-
</del><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SHA1.h"
</span><span class="cx">
</span><span class="lines">@@ -42,6 +39,29 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+
+SHA1::SHA1()
+{
+ CC_SHA1_Init(&m_context);
+}
+
+void SHA1::addBytes(const uint8_t* input, size_t length)
+{
+ CC_SHA1_Update(&m_context, input, length);
+}
+
+void SHA1::computeHash(Digest& hash)
+{
+ CC_SHA1_Final(hash.data(), &m_context);
+}
+
+#else
+
+// A straightforward SHA-1 implementation based on RFC 3174.
+// http://www.ietf.org/rfc/rfc3174.txt
+// The names of functions and variables (such as "a", "b", and "f") follow notations in RFC 3174.
+
</ins><span class="cx"> static inline uint32_t f(int t, uint32_t b, uint32_t c, uint32_t d)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(t >= 0 && t < 80);
</span><span class="lines">@@ -104,25 +124,6 @@
</span><span class="cx"> reset();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CString SHA1::hexDigest(const Digest& digest)
-{
- char* start = 0;
- CString result = CString::newUninitialized(40, start);
- char* buffer = start;
- for (size_t i = 0; i < hashSize; ++i) {
- snprintf(buffer, 3, "%02X", digest.at(i));
- buffer += 2;
- }
- return result;
-}
-
-CString SHA1::computeHexDigest()
-{
- Digest digest;
- computeHash(digest);
- return hexDigest(digest);
-}
-
</del><span class="cx"> void SHA1::finalize()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_cursor < 64);
</span><span class="lines">@@ -195,4 +196,25 @@
</span><span class="cx"> memset(m_buffer, 0, sizeof(m_buffer));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif
+
+CString SHA1::hexDigest(const Digest& digest)
+{
+ char* start = 0;
+ CString result = CString::newUninitialized(40, start);
+ char* buffer = start;
+ for (size_t i = 0; i < hashSize; ++i) {
+ snprintf(buffer, 3, "%02X", digest.at(i));
+ buffer += 2;
+ }
+ return result;
+}
+
+CString SHA1::computeHexDigest()
+{
+ Digest digest;
+ computeHash(digest);
+ return hexDigest(digest);
+}
+
</ins><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtfSHA1h"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/SHA1.h (182894 => 182895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/SHA1.h 2015-04-16 17:32:27 UTC (rev 182894)
+++ trunk/Source/WTF/wtf/SHA1.h 2015-04-16 17:44:13 UTC (rev 182895)
</span><span class="lines">@@ -35,6 +35,10 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+#include <CommonCrypto/CommonDigest.h>
+#endif
+
</ins><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> class SHA1 {
</span><span class="lines">@@ -63,7 +67,6 @@
</span><span class="cx"> // type for computing SHA1 hash
</span><span class="cx"> typedef std::array<uint8_t, hashSize> Digest;
</span><span class="cx">
</span><del>- // computeHash has a side effect of resetting the state of the object.
</del><span class="cx"> WTF_EXPORT_PRIVATE void computeHash(Digest&);
</span><span class="cx">
</span><span class="cx"> // Get a hex hash from the digest.
</span><span class="lines">@@ -73,6 +76,9 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE CString computeHexDigest();
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+#if PLATFORM(COCOA)
+ CC_SHA1_CTX m_context;
+#else
</ins><span class="cx"> void finalize();
</span><span class="cx"> void processBlock();
</span><span class="cx"> void reset();
</span><span class="lines">@@ -81,6 +87,7 @@
</span><span class="cx"> size_t m_cursor; // Number of bytes filled in m_buffer (0-64).
</span><span class="cx"> uint64_t m_totalBytes; // Number of bytes added so far.
</span><span class="cx"> uint32_t m_hash[5];
</span><ins>+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre>
</div>
</div>
</body>
</html>