<!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>[214822] 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/214822">214822</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2017-04-03 11:12:38 -0700 (Mon, 03 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GCrypt] Implement AES_GCM support
https://bugs.webkit.org/show_bug.cgi?id=170271
Reviewed by Michael Catanzaro.
Source/WebCore:
Implement the CryptoAlgorithmAES_GCM::platform{Encrypt,Decrypt}
functionality for configurations that use libgcrypt. This is done
by leveraging the gcry_cipher_* APIs for the AES algorithm that's
deducted appropriately from the key size and the GCM cipher mode.
No new tests -- current ones cover this sufficiently, but are not yet
enabled due to other missing platform-specific SUBTLE_CRYPTO
implementations.
* crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp:
(WebCore::gcryptEncrypt):
(WebCore::gcryptDecrypt):
(WebCore::CryptoAlgorithmAES_GCM::platformEncrypt):
(WebCore::CryptoAlgorithmAES_GCM::platformDecrypt):
Source/WebCore/PAL:
* pal/crypto/gcrypt/Handle.h:
(PAL::GCrypt::HandleDeleter<gcry_cipher_hd_t>::operator()): Specialize
the HandleDeleter<> template for the gcry_cipher_hd_t type.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALChangeLog">trunk/Source/WebCore/PAL/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALpalcryptogcryptHandleh">trunk/Source/WebCore/PAL/pal/crypto/gcrypt/Handle.h</a></li>
<li><a href="#trunkSourceWebCorecryptogcryptCryptoAlgorithmAES_GCMGCryptcpp">trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214821 => 214822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-03 18:10:29 UTC (rev 214821)
+++ trunk/Source/WebCore/ChangeLog 2017-04-03 18:12:38 UTC (rev 214822)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2017-04-03 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ [GCrypt] Implement AES_GCM support
+ https://bugs.webkit.org/show_bug.cgi?id=170271
+
+ Reviewed by Michael Catanzaro.
+
+ Implement the CryptoAlgorithmAES_GCM::platform{Encrypt,Decrypt}
+ functionality for configurations that use libgcrypt. This is done
+ by leveraging the gcry_cipher_* APIs for the AES algorithm that's
+ deducted appropriately from the key size and the GCM cipher mode.
+
+ No new tests -- current ones cover this sufficiently, but are not yet
+ enabled due to other missing platform-specific SUBTLE_CRYPTO
+ implementations.
+
+ * crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp:
+ (WebCore::gcryptEncrypt):
+ (WebCore::gcryptDecrypt):
+ (WebCore::CryptoAlgorithmAES_GCM::platformEncrypt):
+ (WebCore::CryptoAlgorithmAES_GCM::platformDecrypt):
+
+2017-04-03 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> [GCrypt] Implement PBKDF2 support
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170270
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (214821 => 214822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog 2017-04-03 18:10:29 UTC (rev 214821)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-04-03 18:12:38 UTC (rev 214822)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-04-03 Zan Dobersek <zdobersek@igalia.com>
+
+ [GCrypt] Implement AES_GCM support
+ https://bugs.webkit.org/show_bug.cgi?id=170271
+
+ Reviewed by Michael Catanzaro.
+
+ * pal/crypto/gcrypt/Handle.h:
+ (PAL::GCrypt::HandleDeleter<gcry_cipher_hd_t>::operator()): Specialize
+ the HandleDeleter<> template for the gcry_cipher_hd_t type.
+
</ins><span class="cx"> 2017-03-30 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GCrypt] Add the Utilities.h header
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalcryptogcryptHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/crypto/gcrypt/Handle.h (214821 => 214822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/crypto/gcrypt/Handle.h 2017-04-03 18:10:29 UTC (rev 214821)
+++ trunk/Source/WebCore/PAL/pal/crypto/gcrypt/Handle.h 2017-04-03 18:12:38 UTC (rev 214822)
</span><span class="lines">@@ -83,6 +83,14 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<>
</span><ins>+struct HandleDeleter<gcry_cipher_hd_t> {
+ void operator()(gcry_cipher_hd_t handle)
+ {
+ gcry_cipher_close(handle);
+ }
+};
+
+template<>
</ins><span class="cx"> struct HandleDeleter<gcry_mac_hd_t> {
</span><span class="cx"> void operator()(gcry_mac_hd_t handle)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptogcryptCryptoAlgorithmAES_GCMGCryptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp (214821 => 214822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp 2017-04-03 18:10:29 UTC (rev 214821)
+++ trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp 2017-04-03 18:12:38 UTC (rev 214822)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2017 Apple Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2017 Metrological Group B.V.
+ * Copyright (C) 2017 Igalia S.L.
</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">@@ -28,21 +30,195 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx">
</span><ins>+#include "CryptoAlgorithmAesGcmParams.h"
+#include "CryptoKeyAES.h"
</ins><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><ins>+#include "ScriptExecutionContext.h"
+#include <pal/crypto/gcrypt/Handle.h>
+#include <pal/crypto/gcrypt/Utilities.h>
+#include <wtf/CryptographicUtilities.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void CryptoAlgorithmAES_GCM::platformEncrypt(std::unique_ptr<CryptoAlgorithmParameters>&&, Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&)
</del><ins>+static std::optional<Vector<uint8_t>> gcryptEncrypt(const Vector<uint8_t>& key, const Vector<uint8_t>& iv, Vector<uint8_t>&& plainText, const Vector<uint8_t>& additionalData, uint8_t tagLength)
</ins><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ auto algorithm = PAL::GCrypt::aesAlgorithmForKeySize(key.size() * 8);
+ if (!algorithm)
+ return std::nullopt;
+
+ PAL::GCrypt::Handle<gcry_cipher_hd_t> handle;
+ gcry_error_t error = gcry_cipher_open(&handle, *algorithm, GCRY_CIPHER_MODE_GCM, GCRY_CIPHER_SECURE);
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+
+ error = gcry_cipher_setkey(handle, key.data(), key.size());
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+
+ error = gcry_cipher_setiv(handle, iv.data(), iv.size());
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+
+ if (!additionalData.isEmpty()) {
+ error = gcry_cipher_authenticate(handle, additionalData.data(), additionalData.size());
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+ }
+
+ error = gcry_cipher_final(handle);
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+
+ Vector<uint8_t> output(plainText.size());
+ error = gcry_cipher_encrypt(handle, output.data(), output.size(), plainText.data(), plainText.size());
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+
+ if (tagLength) {
+ Vector<uint8_t> tag(tagLength);
+ error = gcry_cipher_gettag(handle, tag.data(), tag.size());
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+
+ output.appendVector(tag);
+ }
+
+ return output;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CryptoAlgorithmAES_GCM::platformDecrypt(std::unique_ptr<CryptoAlgorithmParameters>&&, Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&)
</del><ins>+static std::optional<Vector<uint8_t>> gcryptDecrypt(const Vector<uint8_t>& key, const Vector<uint8_t>& iv, Vector<uint8_t>&& cipherText, const Vector<uint8_t>& additionalData, uint8_t tagLength)
</ins><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ auto algorithm = PAL::GCrypt::aesAlgorithmForKeySize(key.size() * 8);
+ if (!algorithm)
+ return std::nullopt;
+
+ PAL::GCrypt::Handle<gcry_cipher_hd_t> handle;
+ gcry_error_t error = gcry_cipher_open(&handle, *algorithm, GCRY_CIPHER_MODE_GCM, 0);
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+
+ error = gcry_cipher_setkey(handle, key.data(), key.size());
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+
+ error = gcry_cipher_setiv(handle, iv.data(), iv.size());
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+
+ if (!additionalData.isEmpty()) {
+ error = gcry_cipher_authenticate(handle, additionalData.data(), additionalData.size());
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+ }
+
+ error = gcry_cipher_final(handle);
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+
+ size_t cipherLength = cipherText.size() - tagLength;
+ Vector<uint8_t> output(cipherLength);
+ error = gcry_cipher_decrypt(handle, output.data(), output.size(), cipherText.data(), cipherLength);
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+
+ if (tagLength) {
+ Vector<uint8_t> tag(tagLength);
+ error = gcry_cipher_gettag(handle, tag.data(), tagLength);
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
+
+ if (constantTimeMemcmp(tag.data(), cipherText.data() + cipherLength, tagLength))
+ return std::nullopt;
+ }
+
+ return output;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void CryptoAlgorithmAES_GCM::platformEncrypt(std::unique_ptr<CryptoAlgorithmParameters>&& parameters, Ref<CryptoKey>&& key, Vector<uint8_t>&& plainText, VectorCallback&& callback, ExceptionCallback&& exceptionCallback, ScriptExecutionContext& context, WorkQueue& workQueue)
+{
+ context.ref();
+ workQueue.dispatch(
+ [parameters = WTFMove(parameters), key = WTFMove(key), plainText = WTFMove(plainText), callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback), &context]() mutable {
+ auto& aesParameters = downcast<CryptoAlgorithmAesGcmParams>(*parameters);
+ auto& aesKey = downcast<CryptoKeyAES>(key.get());
+
+ auto output = gcryptEncrypt(aesKey.key(), aesParameters.ivVector(), WTFMove(plainText), aesParameters.additionalDataVector(), aesParameters.tagLength.value_or(0) / 8);
+ if (!output) {
+ // We should only dereference callbacks after being back to the Document/Worker threads.
+ context.postTask(
+ [callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
+ exceptionCallback(OperationError);
+ context.deref();
+ });
+ return;
+ }
+
+ // We should only dereference callbacks after being back to the Document/Worker threads.
+ context.postTask(
+ [output = WTFMove(*output), callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) mutable {
+ callback(WTFMove(output));
+ context.deref();
+ });
+ });
+}
+
+void CryptoAlgorithmAES_GCM::platformDecrypt(std::unique_ptr<CryptoAlgorithmParameters>&& parameters, Ref<CryptoKey>&& key, Vector<uint8_t>&& cipherText, VectorCallback&& callback, ExceptionCallback&& exceptionCallback, ScriptExecutionContext& context, WorkQueue& workQueue)
+{
+ context.ref();
+ workQueue.dispatch(
+ [parameters = WTFMove(parameters), key = WTFMove(key), cipherText = WTFMove(cipherText), callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback), &context]() mutable {
+ auto& aesParameters = downcast<CryptoAlgorithmAesGcmParams>(*parameters);
+ auto& aesKey = downcast<CryptoKeyAES>(key.get());
+
+ auto output = gcryptDecrypt(aesKey.key(), aesParameters.ivVector(), WTFMove(cipherText), aesParameters.additionalDataVector(), aesParameters.tagLength.value_or(0) / 8);
+ if (!output) {
+ // We should only dereference callbacks after being back to the Document/Worker threads.
+ context.postTask(
+ [callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
+ exceptionCallback(OperationError);
+ context.deref();
+ });
+ return;
+ }
+
+ // We should only dereference callbacks after being back to the Document/Worker threads.
+ context.postTask(
+ [output = WTFMove(*output), callback = WTFMove(callback), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) mutable {
+ callback(WTFMove(output));
+ context.deref();
+ });
+ });
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(SUBTLE_CRYPTO)
</span></span></pre>
</div>
</div>
</body>
</html>