<!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>[160456] trunk/Source</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/160456">160456</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-11 14:31:07 -0800 (Wed, 11 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Store SHA1 hash in std::array
https://bugs.webkit.org/show_bug.cgi?id=125446
Patch by Laszlo Vidacs <lac@inf.u-szeged.hu> on 2013-12-11
Reviewed by Darin Adler.
Change Vector to std::array and use typedef.
Source/JavaScriptCore:
* bytecode/CodeBlockHash.cpp:
(JSC::CodeBlockHash::CodeBlockHash):
Source/WebCore:
* Modules/websockets/WebSocketHandshake.cpp:
(WebCore::WebSocketHandshake::getExpectedWebSocketAccept):
* inspector/DOMPatchSupport.cpp:
(WebCore::DOMPatchSupport::createDigest):
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::HostTLSCertificateSet::computeCertificateHash):
Source/WTF:
* wtf/SHA1.cpp:
(WTF::SHA1::computeHash):
(WTF::SHA1::hexDigest):
(WTF::SHA1::computeHexDigest):
* wtf/SHA1.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockHashcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlockHash.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</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>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketHandshakecpp">trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorDOMPatchSupportcpp">trunk/Source/WebCore/inspector/DOMPatchSupport.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160455 => 160456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-11 22:13:55 UTC (rev 160455)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-11 22:31:07 UTC (rev 160456)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-11 Laszlo Vidacs <lac@inf.u-szeged.hu>
+
+ Store SHA1 hash in std::array
+ https://bugs.webkit.org/show_bug.cgi?id=125446
+
+ Reviewed by Darin Adler.
+
+ Change Vector to std::array and use typedef.
+
+ * bytecode/CodeBlockHash.cpp:
+ (JSC::CodeBlockHash::CodeBlockHash):
+
</ins><span class="cx"> 2013-12-11 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> <https://webkit.org/b/125141> Modernize the JavaScriptCore API headers
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockHashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlockHash.cpp (160455 => 160456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlockHash.cpp 2013-12-11 22:13:55 UTC (rev 160455)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlockHash.cpp 2013-12-11 22:31:07 UTC (rev 160456)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> {
</span><span class="cx"> SHA1 sha1;
</span><span class="cx"> sha1.addBytes(sourceCode.toUTF8());
</span><del>- Vector<uint8_t, SHA1::hashSize> digest;
</del><ins>+ SHA1::Digest digest;
</ins><span class="cx"> sha1.computeHash(digest);
</span><span class="cx"> m_hash += digest[0] | (digest[1] << 8) | (digest[2] << 16) | (digest[3] << 24);
</span><span class="cx"> m_hash ^= static_cast<unsigned>(kind);
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (160455 => 160456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-12-11 22:13:55 UTC (rev 160455)
+++ trunk/Source/WTF/ChangeLog 2013-12-11 22:31:07 UTC (rev 160456)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-11 Laszlo Vidacs <lac@inf.u-szeged.hu>
+
+ Store SHA1 hash in std::array
+ https://bugs.webkit.org/show_bug.cgi?id=125446
+
+ Reviewed by Darin Adler.
+
+ Change Vector to std::array and use typedef.
+
+ * wtf/SHA1.cpp:
+ (WTF::SHA1::computeHash):
+ (WTF::SHA1::hexDigest):
+ (WTF::SHA1::computeHexDigest):
+ * wtf/SHA1.h:
+
</ins><span class="cx"> 2013-12-11 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Give Unique StringImpls a meaningful data pointer
</span></span></pre></div>
<a id="trunkSourceWTFwtfSHA1cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/SHA1.cpp (160455 => 160456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/SHA1.cpp 2013-12-11 22:13:55 UTC (rev 160455)
+++ trunk/Source/WTF/wtf/SHA1.cpp 2013-12-11 22:31:07 UTC (rev 160456)
</span><span class="lines">@@ -88,12 +88,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SHA1::computeHash(Vector<uint8_t, 20>& digest)
</del><ins>+void SHA1::computeHash(Digest& digest)
</ins><span class="cx"> {
</span><span class="cx"> finalize();
</span><span class="cx">
</span><del>- digest.clear();
- digest.resize(20);
</del><span class="cx"> for (size_t i = 0; i < 5; ++i) {
</span><span class="cx"> // Treat hashValue as a big-endian value.
</span><span class="cx"> uint32_t hashValue = m_hash[i];
</span><span class="lines">@@ -106,12 +104,12 @@
</span><span class="cx"> reset();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CString SHA1::hexDigest(const Vector<uint8_t, 20>& digest)
</del><ins>+CString SHA1::hexDigest(const Digest& digest)
</ins><span class="cx"> {
</span><span class="cx"> char* start = 0;
</span><span class="cx"> CString result = CString::newUninitialized(40, start);
</span><span class="cx"> char* buffer = start;
</span><del>- for (size_t i = 0; i < 20; ++i) {
</del><ins>+ for (size_t i = 0; i < hashSize; ++i) {
</ins><span class="cx"> snprintf(buffer, 3, "%02X", digest.at(i));
</span><span class="cx"> buffer += 2;
</span><span class="cx"> }
</span><span class="lines">@@ -120,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> CString SHA1::computeHexDigest()
</span><span class="cx"> {
</span><del>- Vector<uint8_t, 20> digest;
</del><ins>+ Digest digest;
</ins><span class="cx"> computeHash(digest);
</span><span class="cx"> return hexDigest(digest);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfSHA1h"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/SHA1.h (160455 => 160456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/SHA1.h 2013-12-11 22:13:55 UTC (rev 160455)
+++ trunk/Source/WTF/wtf/SHA1.h 2013-12-11 22:31:07 UTC (rev 160456)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #ifndef WTF_SHA1_h
</span><span class="cx"> #define WTF_SHA1_h
</span><span class="cx">
</span><ins>+#include <array>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -56,18 +57,21 @@
</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 = 20;
+
+ // type for computing SHA1 hash
+ typedef std::array<uint8_t, hashSize> Digest;
+
</ins><span class="cx"> // computeHash has a side effect of resetting the state of the object.
</span><del>- WTF_EXPORT_PRIVATE void computeHash(Vector<uint8_t, 20>&);
</del><ins>+ WTF_EXPORT_PRIVATE void computeHash(Digest&);
</ins><span class="cx">
</span><del>- // Get a hex hash from the digest. Pass a limit less than 40 if you want a shorter digest.
- WTF_EXPORT_PRIVATE static CString hexDigest(const Vector<uint8_t, 20>&);
</del><ins>+ // Get a hex hash from the digest.
+ WTF_EXPORT_PRIVATE static CString hexDigest(const Digest&);
</ins><span class="cx">
</span><del>- // Compute the hex digest directly. Pass a limit less than 40 if you want a shorter digest.
</del><ins>+ // Compute the hex digest directly.
</ins><span class="cx"> WTF_EXPORT_PRIVATE CString computeHexDigest();
</span><span class="cx">
</span><del>- // Size of the SHA1 hash
- WTF_EXPORT_PRIVATE static const size_t hashSize = 20;
-
</del><span class="cx"> private:
</span><span class="cx"> void finalize();
</span><span class="cx"> void processBlock();
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160455 => 160456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-11 22:13:55 UTC (rev 160455)
+++ trunk/Source/WebCore/ChangeLog 2013-12-11 22:31:07 UTC (rev 160456)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-12-11 Laszlo Vidacs <lac@inf.u-szeged.hu>
+
+ Store SHA1 hash in std::array
+ https://bugs.webkit.org/show_bug.cgi?id=125446
+
+ Reviewed by Darin Adler.
+
+ Change Vector to std::array and use typedef.
+
+ * Modules/websockets/WebSocketHandshake.cpp:
+ (WebCore::WebSocketHandshake::getExpectedWebSocketAccept):
+ * inspector/DOMPatchSupport.cpp:
+ (WebCore::DOMPatchSupport::createDigest):
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::HostTLSCertificateSet::computeCertificateHash):
+
</ins><span class="cx"> 2013-12-11 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> WebCrypto keys should support structured clone
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketHandshakecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp (160455 => 160456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2013-12-11 22:13:55 UTC (rev 160455)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2013-12-11 22:31:07 UTC (rev 160456)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> CString keyData = secWebSocketKey.ascii();
</span><span class="cx"> sha1.addBytes(reinterpret_cast<const uint8_t*>(keyData.data()), keyData.length());
</span><span class="cx"> sha1.addBytes(reinterpret_cast<const uint8_t*>(webSocketKeyGUID), strlen(webSocketKeyGUID));
</span><del>- Vector<uint8_t, SHA1::hashSize> hash;
</del><ins>+ SHA1::Digest hash;
</ins><span class="cx"> sha1.computeHash(hash);
</span><span class="cx"> return base64Encode(hash.data(), SHA1::hashSize);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorDOMPatchSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/DOMPatchSupport.cpp (160455 => 160456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/DOMPatchSupport.cpp 2013-12-11 22:13:55 UTC (rev 160455)
+++ trunk/Source/WebCore/inspector/DOMPatchSupport.cpp 2013-12-11 22:31:07 UTC (rev 160456)
</span><span class="lines">@@ -440,14 +440,14 @@
</span><span class="cx"> addStringToSHA1(attrsSHA1, attribute.name().toString());
</span><span class="cx"> addStringToSHA1(attrsSHA1, attribute.value());
</span><span class="cx"> }
</span><del>- Vector<uint8_t, 20> attrsHash;
</del><ins>+ SHA1::Digest attrsHash;
</ins><span class="cx"> attrsSHA1.computeHash(attrsHash);
</span><span class="cx"> digest->m_attrsSHA1 = base64Encode(attrsHash.data(), 10);
</span><span class="cx"> addStringToSHA1(sha1, digest->m_attrsSHA1);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Vector<uint8_t, 20> hash;
</del><ins>+ SHA1::Digest hash;
</ins><span class="cx"> sha1.computeHash(hash);
</span><span class="cx"> digest->m_sha1 = base64Encode(hash.data(), 10);
</span><span class="cx"> if (unusedNodesMap)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (160455 => 160456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2013-12-11 22:13:55 UTC (rev 160455)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2013-12-11 22:31:07 UTC (rev 160456)
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> SHA1 sha1;
</span><span class="cx"> sha1.addBytes(certificateData->data, certificateData->len);
</span><span class="cx">
</span><del>- Vector<uint8_t, SHA1::hashSize> digest;
</del><ins>+ SHA1::Digest digest;
</ins><span class="cx"> sha1.computeHash(digest);
</span><span class="cx">
</span><span class="cx"> return base64Encode(reinterpret_cast<const char*>(digest.data()), SHA1::hashSize);
</span></span></pre>
</div>
</div>
</body>
</html>