<!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>[173874] 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/173874">173874</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-23 09:41:45 -0700 (Tue, 23 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Adds implementation of subtle crypto HMAC algorithm
https://bugs.webkit.org/show_bug.cgi?id=133320
Patch by Eduardo Lima Mitev <elima@igalia.com> on 2014-09-23
Reviewed by Philippe Normand.
Source/WebCore:
Tests are already in place under crypto/subtle/hmac-*.html
* crypto/gtk/CryptoAlgorithmHMACGtk.cpp:
(WebCore::getGnutlsDigestAlgorithm):
(WebCore::calculateSignature):
(WebCore::CryptoAlgorithmHMAC::platformSign):
(WebCore::CryptoAlgorithmHMAC::platformVerify):
LayoutTests:
* platform/gtk/TestExpectations: Whitelists HMAC related tests that are passing</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="#trunkSourceWebCorecryptogtkCryptoAlgorithmHMACGtkcpp">trunk/Source/WebCore/crypto/gtk/CryptoAlgorithmHMACGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173873 => 173874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-09-23 16:14:24 UTC (rev 173873)
+++ trunk/LayoutTests/ChangeLog 2014-09-23 16:41:45 UTC (rev 173874)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-09-23 Eduardo Lima Mitev <elima@igalia.com>
+
+ [GTK] Adds implementation of subtle crypto HMAC algorithm
+ https://bugs.webkit.org/show_bug.cgi?id=133320
+
+ Reviewed by Philippe Normand.
+
+ * platform/gtk/TestExpectations: Whitelists HMAC related tests that are passing
+
</ins><span class="cx"> 2014-09-23 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r173864.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (173873 => 173874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-09-23 16:14:24 UTC (rev 173873)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-09-23 16:41:45 UTC (rev 173874)
</span><span class="lines">@@ -363,6 +363,12 @@
</span><span class="cx"> webkit.org/b/133319 crypto/subtle/sha-256.html [ Pass ]
</span><span class="cx"> webkit.org/b/133319 crypto/subtle/sha-384.html [ Pass ]
</span><span class="cx"> webkit.org/b/133319 crypto/subtle/sha-512.html [ Pass ]
</span><ins>+webkit.org/b/133320 crypto/subtle/hmac-check-algorithm.html [ Pass ]
+webkit.org/b/133320 crypto/subtle/hmac-export-key.html [ Pass ]
+webkit.org/b/133320 crypto/subtle/hmac-generate-key.html [ Pass ]
+webkit.org/b/133320 crypto/subtle/hmac-import-jwk.html [ Pass ]
+webkit.org/b/133320 crypto/subtle/hmac-sign-verify-empty-key.html [ Pass ]
+webkit.org/b/133320 crypto/subtle/hmac-sign-verify.html [ Pass ]
</ins><span class="cx">
</span><span class="cx"> # QuickTime plug-in not relevant to this port
</span><span class="cx"> Bug(GTK) plugins/quicktime-plugin-replacement.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173873 => 173874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-23 16:14:24 UTC (rev 173873)
+++ trunk/Source/WebCore/ChangeLog 2014-09-23 16:41:45 UTC (rev 173874)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-09-23 Eduardo Lima Mitev <elima@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Adds implementation of subtle crypto HMAC algorithm
+ https://bugs.webkit.org/show_bug.cgi?id=133320
+
+ Reviewed by Philippe Normand.
+
+ Tests are already in place under crypto/subtle/hmac-*.html
+
+ * crypto/gtk/CryptoAlgorithmHMACGtk.cpp:
+ (WebCore::getGnutlsDigestAlgorithm):
+ (WebCore::calculateSignature):
+ (WebCore::CryptoAlgorithmHMAC::platformSign):
+ (WebCore::CryptoAlgorithmHMAC::platformVerify):
+
+2014-09-23 Eduardo Lima Mitev <elima@igalia.com>
+
</ins><span class="cx"> [GTK] Adds implementation of Subtle Crypto digest algorithms
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133319
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecryptogtkCryptoAlgorithmHMACGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/gtk/CryptoAlgorithmHMACGtk.cpp (173873 => 173874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/gtk/CryptoAlgorithmHMACGtk.cpp 2014-09-23 16:14:24 UTC (rev 173873)
+++ trunk/Source/WebCore/crypto/gtk/CryptoAlgorithmHMACGtk.cpp 2014-09-23 16:41:45 UTC (rev 173874)
</span><span class="lines">@@ -31,35 +31,72 @@
</span><span class="cx"> #include "CryptoAlgorithmHmacParams.h"
</span><span class="cx"> #include "CryptoKeyHMAC.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><del>-#include "NotImplemented.h"
</del><ins>+#include <gnutls/gnutls.h>
+#include <gnutls/crypto.h>
+#include <wtf/CryptographicUtilities.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static gnutls_mac_algorithm_t getGnutlsDigestAlgorithm(CryptoAlgorithmIdentifier hashFunction)
+{
+ switch (hashFunction) {
+ case CryptoAlgorithmIdentifier::SHA_1:
+ return GNUTLS_MAC_SHA1;
+ case CryptoAlgorithmIdentifier::SHA_224:
+ return GNUTLS_MAC_SHA224;
+ case CryptoAlgorithmIdentifier::SHA_256:
+ return GNUTLS_MAC_SHA256;
+ case CryptoAlgorithmIdentifier::SHA_384:
+ return GNUTLS_MAC_SHA384;
+ case CryptoAlgorithmIdentifier::SHA_512:
+ return GNUTLS_MAC_SHA512;
+ default:
+ return GNUTLS_MAC_UNKNOWN;
+ }
+}
+
+static Vector<uint8_t> calculateSignature(gnutls_mac_algorithm_t algorithm, const Vector<uint8_t>& key, const CryptoOperationData& data)
+{
+ size_t digestLength = gnutls_hmac_get_len(algorithm);
+
+ Vector<uint8_t> result(digestLength);
+ const void* keyData = key.data() ? key.data() : reinterpret_cast<const uint8_t*>("");
+ int ret = gnutls_hmac_fast(algorithm, keyData, key.size(), data.first, data.second, result.data());
+ ASSERT(ret == GNUTLS_E_SUCCESS);
+ UNUSED_PARAM(ret);
+
+ return result;
+}
+
</ins><span class="cx"> void CryptoAlgorithmHMAC::platformSign(const CryptoAlgorithmHmacParams& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& data, VectorCallback callback, VoidCallback failureCallback, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- notImplemented();
- ec = NOT_SUPPORTED_ERR;
- failureCallback();
</del><ins>+ gnutls_mac_algorithm_t algorithm = getGnutlsDigestAlgorithm(parameters.hash);
+ if (algorithm == GNUTLS_MAC_UNKNOWN) {
+ ec = NOT_SUPPORTED_ERR;
+ failureCallback();
+ return;
+ }
</ins><span class="cx">
</span><del>- UNUSED_PARAM(parameters);
- UNUSED_PARAM(key);
- UNUSED_PARAM(data);
- UNUSED_PARAM(callback);
- UNUSED_PARAM(ec);
</del><ins>+ Vector<uint8_t> signature = calculateSignature(algorithm, key.key(), data);
+
+ callback(signature);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CryptoAlgorithmHMAC::platformVerify(const CryptoAlgorithmHmacParams& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& expectedSignature, const CryptoOperationData& data, BoolCallback callback, VoidCallback failureCallback, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- notImplemented();
- ec = NOT_SUPPORTED_ERR;
- failureCallback();
</del><ins>+ gnutls_mac_algorithm_t algorithm = getGnutlsDigestAlgorithm(parameters.hash);
+ if (algorithm == GNUTLS_MAC_UNKNOWN) {
+ ec = NOT_SUPPORTED_ERR;
+ failureCallback();
+ return;
+ }
</ins><span class="cx">
</span><del>- UNUSED_PARAM(parameters);
- UNUSED_PARAM(key);
- UNUSED_PARAM(expectedSignature);
- UNUSED_PARAM(data);
- UNUSED_PARAM(callback);
- UNUSED_PARAM(ec);
</del><ins>+ Vector<uint8_t> signature = calculateSignature(algorithm, key.key(), data);
+
+ // Using a constant time comparison to prevent timing attacks.
+ bool result = signature.size() == expectedSignature.second && !constantTimeMemcmp(signature.data(), expectedSignature.first, signature.size());
+
+ callback(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>