<!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>[209849] 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/209849">209849</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-12-14 18:31:37 -0800 (Wed, 14 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Support latest SubtleCrypto HMAC APIs
https://bugs.webkit.org/show_bug.cgi?id=165863
Reviewed by Sam Weinig.
Source/WebCore:
SubtleCrypto spec is updated, and new delegate implementations are required to support these interfaces.
This patch implements platformSign and platformVerify with WorkQueues for gcrypt backend.
* crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp:
(WebCore::calculateSignature):
(WebCore::CryptoAlgorithmHMAC::platformSign):
(WebCore::CryptoAlgorithmHMAC::platformVerify):
LayoutTests:
Enable HMAC tests.
* platform/gtk/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecryptogcryptCryptoAlgorithmHMACGCryptcpp">trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209848 => 209849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-15 02:23:56 UTC (rev 209848)
+++ trunk/LayoutTests/ChangeLog 2016-12-15 02:31:37 UTC (rev 209849)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-14 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [GTK] Support latest SubtleCrypto HMAC APIs
+ https://bugs.webkit.org/show_bug.cgi?id=165863
+
+ Reviewed by Sam Weinig.
+
+ Enable HMAC tests.
+
+ * platform/gtk/TestExpectations:
+
</ins><span class="cx"> 2016-12-14 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix cause of viewport-related flakiness in iOS tests
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (209848 => 209849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2016-12-15 02:23:56 UTC (rev 209848)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2016-12-15 02:31:37 UTC (rev 209849)
</span><span class="lines">@@ -365,6 +365,46 @@
</span><span class="cx"> webkit.org/b/133122 crypto/subtle [ Skip ]
</span><span class="cx"> webkit.org/b/133122 crypto/webkitSubtle [ Skip ]
</span><span class="cx"> webkit.org/b/133122 crypto/workers/subtle [ Skip ]
</span><ins>+crypto/subtle/hmac-export-key-malformed-parameters.html [ Pass ]
+crypto/subtle/hmac-generate-export-key-jwk-sha1.html [ Pass ]
+crypto/subtle/hmac-generate-export-key-jwk-sha224.html [ Pass ]
+crypto/subtle/hmac-generate-export-key-jwk-sha256.html [ Pass ]
+crypto/subtle/hmac-generate-export-key-jwk-sha384.html [ Pass ]
+crypto/subtle/hmac-generate-export-key-jwk-sha512.html [ Pass ]
+crypto/subtle/hmac-generate-export-raw-key.html [ Pass ]
+crypto/subtle/hmac-generate-key-customized-length.html [ Pass ]
+crypto/subtle/hmac-generate-key-hash-object.html [ Pass ]
+crypto/subtle/hmac-generate-key-malformed-parameters.html [ Pass ]
+crypto/subtle/hmac-generate-key-sha1.html [ Pass ]
+crypto/subtle/hmac-generate-key-sha224.html [ Pass ]
+crypto/subtle/hmac-generate-key-sha256.html [ Pass ]
+crypto/subtle/hmac-generate-key-sha384.html [ Pass ]
+crypto/subtle/hmac-generate-key-sha512.html [ Pass ]
+crypto/subtle/hmac-generate-key-sign-verify.html [ Pass ]
+crypto/subtle/hmac-import-jwk-key-export-jwk-key.html [ Pass ]
+crypto/subtle/hmac-import-jwk-key-export-raw-key.html [ Pass ]
+crypto/subtle/hmac-import-jwk-key-minimum.html [ Pass ]
+crypto/subtle/hmac-import-jwk-key-non-extractable.html [ Pass ]
+crypto/subtle/hmac-import-jwk-key-sha1.html [ Pass ]
+crypto/subtle/hmac-import-jwk-key-sha224.html [ Pass ]
+crypto/subtle/hmac-import-jwk-key-sha256.html [ Pass ]
+crypto/subtle/hmac-import-jwk-key-sha384.html [ Pass ]
+crypto/subtle/hmac-import-jwk-key-sha512.html [ Pass ]
+crypto/subtle/hmac-import-key-malformed-parameters.html [ Pass ]
+crypto/subtle/hmac-import-key-sign-sha1.html [ Pass ]
+crypto/subtle/hmac-import-key-sign-sha224.html [ Pass ]
+crypto/subtle/hmac-import-key-sign-sha256.html [ Pass ]
+crypto/subtle/hmac-import-key-sign-sha384.html [ Pass ]
+crypto/subtle/hmac-import-key-sign-sha512.html [ Pass ]
+crypto/subtle/hmac-import-key-verify-sha1.html [ Pass ]
+crypto/subtle/hmac-import-key-verify-sha224.html [ Pass ]
+crypto/subtle/hmac-import-key-verify-sha256.html [ Pass ]
+crypto/subtle/hmac-import-key-verify-sha384.html [ Pass ]
+crypto/subtle/hmac-import-key-verify-sha512.html [ Pass ]
+crypto/subtle/hmac-import-raw-key-customized-length.html [ Pass ]
+crypto/subtle/hmac-import-raw-key-export-jwk-key.html [ Pass ]
+crypto/subtle/hmac-import-raw-key-export-raw-key.html [ Pass ]
+crypto/subtle/hmac-import-raw-key.html [ Pass ]
</ins><span class="cx"> webkit.org/b/133319 crypto/webkitSubtle/sha-1.html [ Pass ]
</span><span class="cx"> webkit.org/b/133319 crypto/webkitSubtle/sha-224.html [ Pass ]
</span><span class="cx"> webkit.org/b/133319 crypto/webkitSubtle/sha-256.html [ Pass ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209848 => 209849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-15 02:23:56 UTC (rev 209848)
+++ trunk/Source/WebCore/ChangeLog 2016-12-15 02:31:37 UTC (rev 209849)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-12-14 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [GTK] Support latest SubtleCrypto HMAC APIs
+ https://bugs.webkit.org/show_bug.cgi?id=165863
+
+ Reviewed by Sam Weinig.
+
+ SubtleCrypto spec is updated, and new delegate implementations are required to support these interfaces.
+ This patch implements platformSign and platformVerify with WorkQueues for gcrypt backend.
+
+ * crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp:
+ (WebCore::calculateSignature):
+ (WebCore::CryptoAlgorithmHMAC::platformSign):
+ (WebCore::CryptoAlgorithmHMAC::platformVerify):
+
</ins><span class="cx"> 2016-12-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r209415.
</span></span></pre></div>
<a id="trunkSourceWebCorecryptogcryptCryptoAlgorithmHMACGCryptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp (209848 => 209849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp 2016-12-15 02:23:56 UTC (rev 209848)
+++ trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp 2016-12-15 02:31:37 UTC (rev 209849)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2014 Igalia S.L.
</span><span class="cx"> * Copyright (C) 2016 SoftAtHome
</span><ins>+ * Copyright (C) 2016 Apple Inc.
+ * Copyright (C) 2016 Yusuke Suzuki <utatane.tea@gmail.com>.
</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
</span><span class="lines">@@ -32,7 +34,7 @@
</span><span class="cx"> #include "CryptoAlgorithmHmacParamsDeprecated.h"
</span><span class="cx"> #include "CryptoKeyHMAC.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><del>-#include "NotImplemented.h"
</del><ins>+#include "ScriptExecutionContext.h"
</ins><span class="cx"> #include <gcrypt.h>
</span><span class="cx"> #include <wtf/CryptographicUtilities.h>
</span><span class="cx">
</span><span class="lines">@@ -56,7 +58,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::optional<Vector<uint8_t>> calculateSignature(int algorithm, const Vector<uint8_t>& key, const CryptoOperationData& data)
</del><ins>+static std::optional<Vector<uint8_t>> calculateSignature(int algorithm, const Vector<uint8_t>& key, const uint8_t* data, size_t dataLength)
</ins><span class="cx"> {
</span><span class="cx"> size_t digestLength = gcry_mac_get_algo_maclen(algorithm);
</span><span class="cx"> const void* keyData = key.data() ? key.data() : reinterpret_cast<const uint8_t*>("");
</span><span class="lines">@@ -75,7 +77,7 @@
</span><span class="cx"> if (err)
</span><span class="cx"> goto cleanup;
</span><span class="cx">
</span><del>- err = gcry_mac_write(hd, data.first, data.second);
</del><ins>+ err = gcry_mac_write(hd, data, dataLength);
</ins><span class="cx"> if (err)
</span><span class="cx"> goto cleanup;
</span><span class="cx">
</span><span class="lines">@@ -97,16 +99,63 @@
</span><span class="cx"> return WTFMove(signature);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CryptoAlgorithmHMAC::platformSign(Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&)
</del><ins>+static std::optional<Vector<uint8_t>> calculateSignature(int algorithm, const Vector<uint8_t>& key, const CryptoOperationData& data)
</ins><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ return calculateSignature(algorithm, key, data.first, data.second);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CryptoAlgorithmHMAC::platformVerify(Ref<CryptoKey>&&, Vector<uint8_t>&&, Vector<uint8_t>&&, BoolCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&)
</del><ins>+void CryptoAlgorithmHMAC::platformSign(Ref<CryptoKey>&& key, Vector<uint8_t>&& data, VectorCallback&& callback, ExceptionCallback&& exceptionCallback, ScriptExecutionContext& context, WorkQueue& workQueue)
</ins><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ context.ref();
+ workQueue.dispatch([key = WTFMove(key), data = WTFMove(data), callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback), &context]() mutable {
+ auto& hmacKey = downcast<CryptoKeyHMAC>(key.get());
+ auto algorithm = getGCryptDigestAlgorithm(hmacKey.hashAlgorithmIdentifier());
+ if (algorithm != GCRY_MAC_NONE) {
+ auto result = calculateSignature(algorithm, hmacKey.key(), data.data(), data.size());
+ if (result) {
+ // We should only dereference callbacks after being back to the Document/Worker threads.
+ context.postTask([callback = WTFMove(callback), result = WTFMove(*result), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
+ callback(result);
+ context.deref();
+ });
+ return;
+ }
+ }
+ // We should only dereference callbacks after being back to the Document/Worker threads.
+ context.postTask([exceptionCallback = WTFMove(exceptionCallback), callback = WTFMove(callback)](ScriptExecutionContext& context) {
+ exceptionCallback(OperationError);
+ context.deref();
+ });
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void CryptoAlgorithmHMAC::platformVerify(Ref<CryptoKey>&& key, Vector<uint8_t>&& signature, Vector<uint8_t>&& data, BoolCallback&& callback, ExceptionCallback&& exceptionCallback, ScriptExecutionContext& context, WorkQueue& workQueue)
+{
+ context.ref();
+ workQueue.dispatch([key = WTFMove(key), signature = WTFMove(signature), data = WTFMove(data), callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback), &context]() mutable {
+ auto& hmacKey = downcast<CryptoKeyHMAC>(key.get());
+ auto algorithm = getGCryptDigestAlgorithm(hmacKey.hashAlgorithmIdentifier());
+ if (algorithm != GCRY_MAC_NONE) {
+ auto expectedSignature = calculateSignature(algorithm, hmacKey.key(), data.data(), data.size());
+ if (expectedSignature) {
+ // Using a constant time comparison to prevent timing attacks.
+ bool result = signature.size() == expectedSignature->size() && !constantTimeMemcmp(expectedSignature->data(), signature.data(), expectedSignature->size());
+ // We should only dereference callbacks after being back to the Document/Worker threads.
+ context.postTask([callback = WTFMove(callback), result, exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
+ callback(result);
+ context.deref();
+ });
+ return;
+ }
+ }
+ // We should only dereference callbacks after being back to the Document/Worker threads.
+ context.postTask([exceptionCallback = WTFMove(exceptionCallback), callback = WTFMove(callback)](ScriptExecutionContext& context) {
+ exceptionCallback(OperationError);
+ context.deref();
+ });
+ });
+}
+
</ins><span class="cx"> ExceptionOr<void> CryptoAlgorithmHMAC::platformSign(const CryptoAlgorithmHmacParamsDeprecated& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
</span><span class="cx"> {
</span><span class="cx"> int algorithm = getGCryptDigestAlgorithm(parameters.hash);
</span></span></pre>
</div>
</div>
</body>
</html>