<!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>[185500] trunk/Source/WebKit2</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/185500">185500</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-06-12 05:58:36 -0700 (Fri, 12 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Network Cache: Use SHA1 for key hash
https://bugs.webkit.org/show_bug.cgi?id=143829
Reviewed by Anders Carlsson.
For consistency with blobs, use SHA1 instead of MD5.
* NetworkProcess/cache/NetworkCacheCoders.cpp:
(WebKit::NetworkCache::Coder<MD5::Digest>::encode): Deleted.
(WebKit::NetworkCache::Coder<MD5::Digest>::decode): Deleted.
No longer needed.
* NetworkProcess/cache/NetworkCacheCoders.h:
* NetworkProcess/cache/NetworkCacheKey.cpp:
(WebKit::NetworkCache::hashString):
(WebKit::NetworkCache::Key::computeHash):
* NetworkProcess/cache/NetworkCacheKey.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheCoderscpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheCodersh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeycpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeyh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185499 => 185500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-12 12:54:26 UTC (rev 185499)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-12 12:58:36 UTC (rev 185500)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-06-12 Antti Koivisto <antti@apple.com>
+
+ Network Cache: Use SHA1 for key hash
+ https://bugs.webkit.org/show_bug.cgi?id=143829
+
+ Reviewed by Anders Carlsson.
+
+ For consistency with blobs, use SHA1 instead of MD5.
+
+ * NetworkProcess/cache/NetworkCacheCoders.cpp:
+ (WebKit::NetworkCache::Coder<MD5::Digest>::encode): Deleted.
+ (WebKit::NetworkCache::Coder<MD5::Digest>::decode): Deleted.
+
+ No longer needed.
+
+ * NetworkProcess/cache/NetworkCacheCoders.h:
+ * NetworkProcess/cache/NetworkCacheKey.cpp:
+ (WebKit::NetworkCache::hashString):
+ (WebKit::NetworkCache::Key::computeHash):
+ * NetworkProcess/cache/NetworkCacheKey.h:
+
</ins><span class="cx"> 2015-06-12 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix mismatched-tags warning in Source/WebKit2/UIProcess/gtk/InputMethodFilter.h
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp (185499 => 185500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp 2015-06-12 12:54:26 UTC (rev 185499)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp 2015-06-12 12:58:36 UTC (rev 185500)
</span><span class="lines">@@ -166,16 +166,6 @@
</span><span class="cx"> return argumentDecoder.decode(certificateInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Coder<MD5::Digest>::encode(Encoder& encoder, const MD5::Digest& digest)
-{
- encoder.encodeFixedLengthData(digest.data(), sizeof(digest));
-}
-
-bool Coder<MD5::Digest>::decode(Decoder& decoder, MD5::Digest& digest)
-{
- return decoder.decodeFixedLengthData(digest.data(), sizeof(digest));
-}
-
</del><span class="cx"> void Coder<SHA1::Digest>::encode(Encoder& encoder, const SHA1::Digest& digest)
</span><span class="cx"> {
</span><span class="cx"> encoder.encodeFixedLengthData(digest.data(), sizeof(digest));
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h (185499 => 185500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h 2015-06-12 12:54:26 UTC (rev 185499)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h 2015-06-12 12:58:36 UTC (rev 185500)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/MD5.h>
</del><span class="cx"> #include <wtf/SHA1.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -254,11 +253,6 @@
</span><span class="cx"> static bool decode(Decoder&, WebCore::CertificateInfo&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<> struct Coder<MD5::Digest> {
- static void encode(Encoder&, const MD5::Digest&);
- static bool decode(Decoder&, MD5::Digest&);
-};
-
</del><span class="cx"> template<> struct Coder<SHA1::Digest> {
</span><span class="cx"> static void encode(Encoder&, const SHA1::Digest&);
</span><span class="cx"> static bool decode(Decoder&, SHA1::Digest&);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp (185499 => 185500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp 2015-06-12 12:54:26 UTC (rev 185499)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp 2015-06-12 12:58:36 UTC (rev 185500)
</span><span class="lines">@@ -64,34 +64,33 @@
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void hashString(MD5& md5, const String& string)
</del><ins>+static void hashString(SHA1& sha1, const String& string)
</ins><span class="cx"> {
</span><del>- const uint8_t zero = 0;
-
</del><span class="cx"> if (string.isNull())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (string.is8Bit() && string.containsOnlyASCII()) {
</span><del>- md5.addBytes(string.characters8(), string.length());
- md5.addBytes(&zero, 1);
</del><ins>+ const uint8_t nullByte = 0;
+ sha1.addBytes(string.characters8(), string.length());
+ sha1.addBytes(&nullByte, 1);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> auto cString = string.utf8();
</span><del>- md5.addBytes(reinterpret_cast<const uint8_t*>(cString.data()), cString.length());
- md5.addBytes(&zero, 1);
</del><ins>+ // Include terminating null byte.
+ sha1.addBytes(reinterpret_cast<const uint8_t*>(cString.data()), cString.length() + 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Key::HashType Key::computeHash() const
</span><span class="cx"> {
</span><span class="cx"> // We don't really need a cryptographic hash. The key is always verified against the entry header.
</span><del>- // MD5 just happens to be suitably sized, fast and available.
- MD5 md5;
- hashString(md5, m_method);
- hashString(md5, m_partition);
- hashString(md5, m_identifier);
- hashString(md5, m_range);
- MD5::Digest hash;
- md5.checksum(hash);
</del><ins>+ // SHA1 just happens to be suitably sized, fast and available.
+ SHA1 sha1;
+ hashString(sha1, m_method);
+ hashString(sha1, m_partition);
+ hashString(sha1, m_identifier);
+ hashString(sha1, m_range);
+ SHA1::Digest hash;
+ sha1.computeHash(hash);
</ins><span class="cx"> return hash;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h (185499 => 185500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h 2015-06-12 12:54:26 UTC (rev 185499)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h 2015-06-12 12:58:36 UTC (rev 185500)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx">
</span><del>-#include <wtf/MD5.h>
</del><ins>+#include <wtf/SHA1.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> class Key {
</span><span class="cx"> public:
</span><del>- typedef MD5::Digest HashType;
</del><ins>+ typedef SHA1::Digest HashType;
</ins><span class="cx">
</span><span class="cx"> Key() { }
</span><span class="cx"> Key(const Key&);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (185499 => 185500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-06-12 12:54:26 UTC (rev 185499)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-06-12 12:58:36 UTC (rev 185500)
</span><span class="lines">@@ -222,6 +222,8 @@
</span><span class="cx">
</span><span class="cx"> m_blobStorage.synchronize();
</span><span class="cx">
</span><ins>+ deleteEmptyRecordsDirectories(recordsPath());
+
</ins><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) cache synchronization completed size=%zu count=%d", recordsSize, count);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -859,8 +861,6 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- deleteEmptyRecordsDirectories(recordsPath);
-
</del><span class="cx"> RunLoop::main().dispatch([this] {
</span><span class="cx"> m_shrinkInProgress = false;
</span><span class="cx"> // We could synchronize during the shrink traversal. However this is fast and it is better to have just one code path.
</span></span></pre>
</div>
</div>
</body>
</html>