<!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>[197905] trunk/Source/WebCore</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/197905">197905</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-09 17:09:03 -0800 (Wed, 09 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Implement CryptoDigest
https://bugs.webkit.org/show_bug.cgi?id=155247
<rdar://problem/25065843>
Reviewed by Brent Fulgham.
Implement the CryptoDigest abstraction for Windows so that we can compute cryptographically
secure hashes. This will allow us to support Content Security Policy inline script and inline
stylesheet hashes on Windows.
* PlatformWin.cmake: Add file CryptoDigestWin.cpp.
* PlatformWinCairo.cmake: Ditto.
* platform/crypto/win/CryptoDigestWin.cpp: Added.
(WebCore::CryptoDigest::CryptoDigest): Instantiate a CryptoDigestContext object.
(WebCore::CryptoDigest::~CryptoDigest): Destroy the cryptographic service provider and hash
object if non-null.
(WebCore::CryptoDigest::create): Acquire a handle to a cryptographic service provider (HCRYPTPROV)
and a handle to a hash object (HCRYPTHASH).
(WebCore::CryptoDigest::addBytes): Add the contents of the specified buffer to the hash object.
(WebCore::CryptoDigest::computeHash): Compute and return a Vector of bytes that represent the digest.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWinCairocmake">trunk/Source/WebCore/PlatformWinCairo.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebCore/platform/crypto/win/</li>
<li><a href="#trunkSourceWebCoreplatformcryptowinCryptoDigestWincpp">trunk/Source/WebCore/platform/crypto/win/CryptoDigestWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197904 => 197905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-10 01:02:35 UTC (rev 197904)
+++ trunk/Source/WebCore/ChangeLog 2016-03-10 01:09:03 UTC (rev 197905)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-03-09 Daniel Bates <dabates@apple.com>
+
+ [Win] Implement CryptoDigest
+ https://bugs.webkit.org/show_bug.cgi?id=155247
+ <rdar://problem/25065843>
+
+ Reviewed by Brent Fulgham.
+
+ Implement the CryptoDigest abstraction for Windows so that we can compute cryptographically
+ secure hashes. This will allow us to support Content Security Policy inline script and inline
+ stylesheet hashes on Windows.
+
+ * PlatformWin.cmake: Add file CryptoDigestWin.cpp.
+ * PlatformWinCairo.cmake: Ditto.
+ * platform/crypto/win/CryptoDigestWin.cpp: Added.
+ (WebCore::CryptoDigest::CryptoDigest): Instantiate a CryptoDigestContext object.
+ (WebCore::CryptoDigest::~CryptoDigest): Destroy the cryptographic service provider and hash
+ object if non-null.
+ (WebCore::CryptoDigest::create): Acquire a handle to a cryptographic service provider (HCRYPTPROV)
+ and a handle to a hash object (HCRYPTHASH).
+ (WebCore::CryptoDigest::addBytes): Add the contents of the specified buffer to the hash object.
+ (WebCore::CryptoDigest::computeHash): Compute and return a Vector of bytes that represent the digest.
+
</ins><span class="cx"> 2016-03-09 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r197149): Missing availability checks when soft-linking DataDetectors.framework
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (197904 => 197905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2016-03-10 01:02:35 UTC (rev 197904)
+++ trunk/Source/WebCore/PlatformWin.cmake 2016-03-10 01:09:03 UTC (rev 197905)
</span><span class="lines">@@ -70,6 +70,8 @@
</span><span class="cx">
</span><span class="cx"> platform/cf/win/CertificateCFWin.cpp
</span><span class="cx">
</span><ins>+ platform/crypto/win/CryptoDigestWin.cpp
+
</ins><span class="cx"> platform/graphics/FontPlatformData.cpp
</span><span class="cx"> platform/graphics/GraphicsContext3DPrivate.cpp
</span><span class="cx"> platform/graphics/WOFFFileFormat.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (197904 => 197905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWinCairo.cmake 2016-03-10 01:02:35 UTC (rev 197904)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2016-03-10 01:09:03 UTC (rev 197905)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx">
</span><span class="cx"> platform/cf/win/CertificateCFWin.cpp
</span><span class="cx">
</span><ins>+ platform/crypto/win/CryptoDigestWin.cpp
+
</ins><span class="cx"> platform/graphics/GLContext.cpp
</span><span class="cx"> platform/graphics/GraphicsLayer.cpp
</span><span class="cx"> platform/graphics/ImageSource.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcryptowinCryptoDigestWincpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/crypto/win/CryptoDigestWin.cpp (0 => 197905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/crypto/win/CryptoDigestWin.cpp (rev 0)
+++ trunk/Source/WebCore/platform/crypto/win/CryptoDigestWin.cpp 2016-03-10 01:09:03 UTC (rev 197905)
</span><span class="lines">@@ -0,0 +1,104 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "CryptoDigest.h"
+
+#include <wincrypt.h>
+
+namespace WebCore {
+
+struct CryptoDigestContext {
+ CryptoDigest::Algorithm algorithm;
+ HCRYPTPROV hContext { 0 };
+ HCRYPTHASH hHash { 0 };
+};
+
+CryptoDigest::CryptoDigest()
+ : m_context(new CryptoDigestContext)
+{
+}
+
+CryptoDigest::~CryptoDigest()
+{
+ if (HCRYPTHASH hHash = m_context->hHash)
+ CryptDestroyHash(hHash);
+ if (HCRYPTPROV hContext = m_context->hContext)
+ CryptReleaseContext(hContext, 0);
+}
+
+std::unique_ptr<CryptoDigest> CryptoDigest::create(Algorithm algorithm)
+{
+ auto digest = std::make_unique<CryptoDigest>();
+ digest->m_context->algorithm = algorithm;
+ if (!CryptAcquireContext(&digest->m_context->hContext, nullptr, nullptr /* use default provider */, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
+ return nullptr;
+
+ bool succeeded = false;
+ switch (algorithm) {
+ case CryptoDigest::Algorithm::SHA_1: {
+ succeeded = CryptCreateHash(digest->m_context->hContext, CALG_SHA1, 0, 0, &digest->m_context->hHash);
+ break;
+ }
+ case CryptoDigest::Algorithm::SHA_256: {
+ succeeded = CryptCreateHash(digest->m_context->hContext, CALG_SHA_256, 0, 0, &digest->m_context->hHash);
+ break;
+ }
+ case CryptoDigest::Algorithm::SHA_384: {
+ succeeded = CryptCreateHash(digest->m_context->hContext, CALG_SHA_384, 0, 0, &digest->m_context->hHash);
+ break;
+ }
+ case CryptoDigest::Algorithm::SHA_512: {
+ succeeded = CryptCreateHash(digest->m_context->hContext, CALG_SHA_512, 0, 0, &digest->m_context->hHash);
+ break;
+ }
+ }
+ if (succeeded)
+ return digest;
+ return nullptr;
+}
+
+void CryptoDigest::addBytes(const void* input, size_t length)
+{
+ if (!input || !length)
+ return;
+ RELEASE_ASSERT(CryptHashData(m_context->hHash, reinterpret_cast<const BYTE*>(input), length, 0));
+}
+
+Vector<uint8_t> CryptoDigest::computeHash()
+{
+ Vector<uint8_t> result;
+ DWORD digestLengthBuffer;
+ DWORD digestLengthBufferSize = sizeof(digestLengthBuffer);
+
+ RELEASE_ASSERT(CryptGetHashParam(m_context->hHash, HP_HASHSIZE, reinterpret_cast<BYTE*>(&digestLengthBuffer), &digestLengthBufferSize, 0));
+ result.resize(digestLengthBuffer);
+
+ RELEASE_ASSERT(CryptGetHashParam(m_context->hHash, HP_HASHVAL, result.data(), &digestLengthBuffer, 0));
+ RELEASE_ASSERT(result.size() == digestLengthBuffer);
+ return result;
+}
+
+} // namespace WebCore
</ins></span></pre>
</div>
</div>
</body>
</html>