<!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>[160386] 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/160386">160386</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-10 13:48:06 -0800 (Tue, 10 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use std::array when computing MD5 checksum
https://bugs.webkit.org/show_bug.cgi?id=125509
Patch by Laszlo Vidacs <lac@inf.u-szeged.hu> on 2013-12-10
Reviewed by Anders Carlsson.
Source/WebCore:
Use MD5::Digest type and MD5::hashSize when computing MD5 checksum.
* platform/network/curl/CurlCacheEntry.cpp:
(WebCore::CurlCacheEntry::generateBaseFilename):
Source/WTF:
Added MD5::Digest type and MD5::hashSize for computing MD5 checksum.
* wtf/MD5.cpp:
(WTF::MD5::checksum):
* wtf/MD5.h:
Tools:
Use MD5::Digest type and MD5::hashSize when computing MD5 checksum.
* DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp:
(computeMD5HashStringForBitmapContext):
* DumpRenderTree/cairo/PixelDumpSupportCairo.cpp:
(computeMD5HashStringForBitmapContext):
* TestWebKitAPI/Tests/WTF/MD5.cpp:
(TestWebKitAPI::expectMD5):
* WebKitTestRunner/cairo/TestInvocationCairo.cpp:
(WTR::computeMD5HashStringForCairoSurface):
* WebKitTestRunner/cg/TestInvocationCG.cpp:
(WTR::computeMD5HashStringForContext):</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="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlCacheEntrycpp">trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeblackberryPixelDumpSupportBlackBerrycpp">trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreecairoPixelDumpSupportCairocpp">trunk/Tools/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFMD5cpp">trunk/Tools/TestWebKitAPI/Tests/WTF/MD5.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnercairoTestInvocationCairocpp">trunk/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnercgTestInvocationCGcpp">trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (160385 => 160386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-12-10 21:39:59 UTC (rev 160385)
+++ trunk/Source/WTF/ChangeLog 2013-12-10 21:48:06 UTC (rev 160386)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-12-10 Laszlo Vidacs <lac@inf.u-szeged.hu>
+
+ Use std::array when computing MD5 checksum
+ https://bugs.webkit.org/show_bug.cgi?id=125509
+
+ Reviewed by Anders Carlsson.
+
+ Added MD5::Digest type and MD5::hashSize for computing MD5 checksum.
+
+ * wtf/MD5.cpp:
+ (WTF::MD5::checksum):
+ * wtf/MD5.h:
+
</ins><span class="cx"> 2013-12-10 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> Various fixes for the CMake GTK+ build
</span></span></pre></div>
<a id="trunkSourceWTFwtfMD5cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MD5.cpp (160385 => 160386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MD5.cpp 2013-12-10 21:39:59 UTC (rev 160385)
+++ trunk/Source/WTF/wtf/MD5.cpp 2013-12-10 21:48:06 UTC (rev 160386)
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> memcpy(m_in, buf, length);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MD5::checksum(Vector<uint8_t, 16>& digest)
</del><ins>+void MD5::checksum(Digest& digest)
</ins><span class="cx"> {
</span><span class="cx"> // Compute number of bytes mod 64
</span><span class="cx"> unsigned count = (m_bits[0] >> 3) & 0x3F;
</span><span class="lines">@@ -256,9 +256,9 @@
</span><span class="cx"> reverseBytes(reinterpret_cast<uint8_t*>(m_buf), 4);
</span><span class="cx">
</span><span class="cx"> // Now, m_buf contains checksum result.
</span><del>- if (!digest.isEmpty())
- digest.clear();
- digest.append(reinterpret_cast<uint8_t*>(m_buf), 16);
</del><ins>+ uint8_t* mBufUInt8 = reinterpret_cast<uint8_t*>(m_buf);
+ for (size_t i = 0; i < hashSize; ++i)
+ digest[i] = mBufUInt8[i];
</ins><span class="cx">
</span><span class="cx"> // In case it's sensitive
</span><span class="cx"> memset(m_buf, 0, sizeof(m_buf));
</span></span></pre></div>
<a id="trunkSourceWTFwtfMD5h"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MD5.h (160385 => 160386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MD5.h 2013-12-10 21:39:59 UTC (rev 160385)
+++ trunk/Source/WTF/wtf/MD5.h 2013-12-10 21:48:06 UTC (rev 160386)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #ifndef WTF_MD5_h
</span><span class="cx"> #define WTF_MD5_h
</span><span class="cx">
</span><ins>+#include <array>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -45,8 +46,14 @@
</span><span class="cx"> }
</span><span class="cx"> WTF_EXPORT_PRIVATE void addBytes(const uint8_t* input, size_t length);
</span><span class="cx">
</span><ins>+ // Size of the SHA1 hash
+ WTF_EXPORT_PRIVATE static const size_t hashSize = 16;
+
+ // type for computing MD5 hash
+ typedef std::array<uint8_t, hashSize> Digest;
+
</ins><span class="cx"> // checksum has a side effect of resetting the state of the object.
</span><del>- WTF_EXPORT_PRIVATE void checksum(Vector<uint8_t, 16>&);
</del><ins>+ WTF_EXPORT_PRIVATE void checksum(Digest&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> uint32_t m_buf[4];
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160385 => 160386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-10 21:39:59 UTC (rev 160385)
+++ trunk/Source/WebCore/ChangeLog 2013-12-10 21:48:06 UTC (rev 160386)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-10 Laszlo Vidacs <lac@inf.u-szeged.hu>
+
+ Use std::array when computing MD5 checksum
+ https://bugs.webkit.org/show_bug.cgi?id=125509
+
+ Reviewed by Anders Carlsson.
+
+ Use MD5::Digest type and MD5::hashSize when computing MD5 checksum.
+
+ * platform/network/curl/CurlCacheEntry.cpp:
+ (WebCore::CurlCacheEntry::generateBaseFilename):
+
</ins><span class="cx"> 2013-12-10 Mario Sanchez Prada <mario.prada@samsung.com>
</span><span class="cx">
</span><span class="cx"> [ATK] Expose splitter elements with ATK_ROLE_SEPARATOR
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlCacheEntrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp (160385 => 160386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp 2013-12-10 21:39:59 UTC (rev 160385)
+++ trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp 2013-12-10 21:48:06 UTC (rev 160386)
</span><span class="lines">@@ -206,11 +206,11 @@
</span><span class="cx"> MD5 md5;
</span><span class="cx"> md5.addBytes(reinterpret_cast<const uint8_t*>(url.data()), url.length());
</span><span class="cx">
</span><del>- Vector<uint8_t, 16> sum;
</del><ins>+ MD5::Digest sum;
</ins><span class="cx"> md5.checksum(sum);
</span><span class="cx"> uint8_t* rawdata = sum.data();
</span><span class="cx">
</span><del>- for (unsigned i = 0; i < 16; i++)
</del><ins>+ for (size_t i = 0; i < MD5::hasSize; i++)
</ins><span class="cx"> appendByteAsHex(rawdata[i], m_basename, Lowercase);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160385 => 160386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-10 21:39:59 UTC (rev 160385)
+++ trunk/Tools/ChangeLog 2013-12-10 21:48:06 UTC (rev 160386)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-12-10 Laszlo Vidacs <lac@inf.u-szeged.hu>
+
+ Use std::array when computing MD5 checksum
+ https://bugs.webkit.org/show_bug.cgi?id=125509
+
+ Reviewed by Anders Carlsson.
+
+ Use MD5::Digest type and MD5::hashSize when computing MD5 checksum.
+
+ * DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp:
+ (computeMD5HashStringForBitmapContext):
+ * DumpRenderTree/cairo/PixelDumpSupportCairo.cpp:
+ (computeMD5HashStringForBitmapContext):
+ * TestWebKitAPI/Tests/WTF/MD5.cpp:
+ (TestWebKitAPI::expectMD5):
+ * WebKitTestRunner/cairo/TestInvocationCairo.cpp:
+ (WTR::computeMD5HashStringForCairoSurface):
+ * WebKitTestRunner/cg/TestInvocationCG.cpp:
+ (WTR::computeMD5HashStringForContext):
+
</ins><span class="cx"> 2013-12-10 Mario Sanchez Prada <mario.prada@samsung.com>
</span><span class="cx">
</span><span class="cx"> [ATK] Expose splitter elements with ATK_ROLE_SEPARATOR
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeblackberryPixelDumpSupportBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp (160385 => 160386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp 2013-12-10 21:39:59 UTC (rev 160385)
+++ trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp 2013-12-10 21:48:06 UTC (rev 160386)
</span><span class="lines">@@ -84,11 +84,11 @@
</span><span class="cx"> pixelData += bytesPerRow;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Vector<uint8_t, 16> hash;
</del><ins>+ MD5::Digest hash;
</ins><span class="cx"> md5.checksum(hash);
</span><span class="cx">
</span><span class="cx"> hashString[0] = '\0';
</span><del>- for (int i = 0; i < 16; ++i)
</del><ins>+ for (size_t i = 0; i < MD5::hashSize; ++i)
</ins><span class="cx"> snprintf(hashString, 33, "%s%02x", hashString, hash[i]);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreecairoPixelDumpSupportCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp (160385 => 160386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp 2013-12-10 21:39:59 UTC (rev 160385)
+++ trunk/Tools/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp 2013-12-10 21:48:06 UTC (rev 160386)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> md5Context.addBytes(bitmapData, 4 * pixelsWide);
</span><span class="cx"> bitmapData += bytesPerRow;
</span><span class="cx"> }
</span><del>- Vector<uint8_t, 16> hash;
</del><ins>+ MD5::Digest hash;
</ins><span class="cx"> md5Context.checksum(hash);
</span><span class="cx">
</span><span class="cx"> snprintf(hashString, 33, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFMD5cpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/MD5.cpp (160385 => 160386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/MD5.cpp 2013-12-10 21:39:59 UTC (rev 160385)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/MD5.cpp 2013-12-10 21:48:06 UTC (rev 160386)
</span><span class="lines">@@ -21,12 +21,12 @@
</span><span class="cx"> {
</span><span class="cx"> MD5 md5;
</span><span class="cx"> md5.addBytes(reinterpret_cast<const uint8_t*>(input.data()), input.length());
</span><del>- Vector<uint8_t, 16> digest;
</del><ins>+ MD5::Digest digest;
</ins><span class="cx"> md5.checksum(digest);
</span><span class="cx"> char* buf = 0;
</span><span class="cx"> CString actual = CString::newUninitialized(32, buf);
</span><del>- for (size_t i = 0; i < 16; i++, buf += 2)
- snprintf(buf, 3, "%02x", digest.at(i));
</del><ins>+ for (size_t i = 0; i < MD5::hashSize; i++, buf += 2)
+ snprintf(buf, 3, "%02x", digest[i]);
</ins><span class="cx">
</span><span class="cx"> ASSERT_EQ(expected.length(), actual.length());
</span><span class="cx"> ASSERT_STREQ(expected.data(), actual.data());
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnercairoTestInvocationCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp (160385 => 160386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp 2013-12-10 21:39:59 UTC (rev 160385)
+++ trunk/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp 2013-12-10 21:48:06 UTC (rev 160386)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> md5Context.addBytes(bitmapData, 4 * pixelsWide);
</span><span class="cx"> bitmapData += bytesPerRow;
</span><span class="cx"> }
</span><del>- Vector<uint8_t, 16> hash;
</del><ins>+ MD5::Digest hash;
</ins><span class="cx"> md5Context.checksum(hash);
</span><span class="cx">
</span><span class="cx"> snprintf(hashString, 33, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnercgTestInvocationCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp (160385 => 160386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2013-12-10 21:39:59 UTC (rev 160385)
+++ trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2013-12-10 21:48:06 UTC (rev 160386)
</span><span class="lines">@@ -99,11 +99,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Vector<uint8_t, 16> hash;
</del><ins>+ MD5::Digest hash;
</ins><span class="cx"> md5.checksum(hash);
</span><del>-
</del><ins>+
</ins><span class="cx"> hashString[0] = '\0';
</span><del>- for (int i = 0; i < 16; i++)
</del><ins>+ for (size_t i = 0; i < MD5::hashSize; i++)
</ins><span class="cx"> snprintf(hashString, 33, "%s%02x", hashString, hash[i]);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>