<!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>[209061] 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/209061">209061</a></dd>
<dt>Author</dt> <dd>jiewen_tan@apple.com</dd>
<dt>Date</dt> <dd>2016-11-28 21:49:36 -0800 (Mon, 28 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, followup patch after <a href="http://trac.webkit.org/projects/webkit/changeset/209059">r209059</a>.
* crypto/mac/CryptoAlgorithmAES_CBCMac.cpp:
(WebCore::CryptoAlgorithmAES_CBC::platformEncrypt):
(WebCore::CryptoAlgorithmAES_CBC::platformDecrypt):
* crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp:
(WebCore::CryptoAlgorithmRSAES_PKCS1_v1_5::platformEncrypt):
(WebCore::CryptoAlgorithmRSAES_PKCS1_v1_5::platformDecrypt):
* crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp:
(WebCore::CryptoAlgorithmRSA_OAEP::platformEncrypt):
(WebCore::CryptoAlgorithmRSA_OAEP::platformDecrypt):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecryptomacCryptoAlgorithmAES_CBCMaccpp">trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptomacCryptoAlgorithmRSAES_PKCS1_v1_5Maccpp">trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptomacCryptoAlgorithmRSA_OAEPMaccpp">trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209060 => 209061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-29 05:37:12 UTC (rev 209060)
+++ trunk/Source/WebCore/ChangeLog 2016-11-29 05:49:36 UTC (rev 209061)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-11-28 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><ins>+ Unreviewed, followup patch after r209059.
+
+ * crypto/mac/CryptoAlgorithmAES_CBCMac.cpp:
+ (WebCore::CryptoAlgorithmAES_CBC::platformEncrypt):
+ (WebCore::CryptoAlgorithmAES_CBC::platformDecrypt):
+ * crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp:
+ (WebCore::CryptoAlgorithmRSAES_PKCS1_v1_5::platformEncrypt):
+ (WebCore::CryptoAlgorithmRSAES_PKCS1_v1_5::platformDecrypt):
+ * crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp:
+ (WebCore::CryptoAlgorithmRSA_OAEP::platformEncrypt):
+ (WebCore::CryptoAlgorithmRSA_OAEP::platformDecrypt):
+
+2016-11-28 Jiewen Tan <jiewen_tan@apple.com>
+
</ins><span class="cx"> ASSERTION FAILED: m_scriptExecutionContext->isContextThread() seen with LayoutTest crypto/subtle/rsa-oaep-generate-key-encrypt-decrypt.html
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165124
</span><span class="cx"> <rdar://problem/29413805>
</span></span></pre></div>
<a id="trunkSourceWebCorecryptomacCryptoAlgorithmAES_CBCMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp (209060 => 209061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp 2016-11-29 05:37:12 UTC (rev 209060)
+++ trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp 2016-11-29 05:49:36 UTC (rev 209061)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> ASSERT(aesParameters.ivVector().size() == kCCBlockSizeAES128);
</span><span class="cx"> auto result = transformAES_CBC(kCCEncrypt, aesParameters.ivVector().data(), aesKey.key(), plainText.data(), plainText.size());
</span><span class="cx"> if (result.hasException()) {
</span><del>- // We should only derenference callbacks after being back to the Document/Worker threads.
</del><ins>+ // We should only dereference callbacks after being back to the Document/Worker threads.
</ins><span class="cx"> context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
</span><span class="cx"> exceptionCallback(ec);
</span><span class="cx"> context.deref();
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> });
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- // We should only derenference callbacks after being back to the Document/Worker threads.
</del><ins>+ // We should only dereference callbacks after being back to the Document/Worker threads.
</ins><span class="cx"> context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
</span><span class="cx"> callback(result);
</span><span class="cx"> context.deref();
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> assert(aesParameters.ivVector().size() == kCCBlockSizeAES128);
</span><span class="cx"> auto result = transformAES_CBC(kCCDecrypt, aesParameters.ivVector().data(), aesKey.key(), cipherText.data(), cipherText.size());
</span><span class="cx"> if (result.hasException()) {
</span><del>- // We should only derenference callbacks after being back to the Document/Worker threads.
</del><ins>+ // We should only dereference callbacks after being back to the Document/Worker threads.
</ins><span class="cx"> context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
</span><span class="cx"> exceptionCallback(ec);
</span><span class="cx"> context.deref();
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> });
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- // We should only derenference callbacks after being back to the Document/Worker threads.
</del><ins>+ // We should only dereference callbacks after being back to the Document/Worker threads.
</ins><span class="cx"> context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
</span><span class="cx"> callback(result);
</span><span class="cx"> context.deref();
</span></span></pre></div>
<a id="trunkSourceWebCorecryptomacCryptoAlgorithmRSAES_PKCS1_v1_5Maccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp (209060 => 209061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp 2016-11-29 05:37:12 UTC (rev 209060)
+++ trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp 2016-11-29 05:49:36 UTC (rev 209061)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> auto& rsaKey = downcast<CryptoKeyRSA>(key.get());
</span><span class="cx"> auto result = encryptRSAES_PKCS1_v1_5(rsaKey.platformKey(), rsaKey.keySizeInBits(), plainText.data(), plainText.size());
</span><span class="cx"> if (result.hasException()) {
</span><del>- // We should only derenference callbacks after being back to the Document/Worker threads.
</del><ins>+ // We should only dereference callbacks after being back to the Document/Worker threads.
</ins><span class="cx"> context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
</span><span class="cx"> exceptionCallback(ec);
</span><span class="cx"> context.deref();
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> });
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- // We should only derenference callbacks after being back to the Document/Worker threads.
</del><ins>+ // We should only dereference callbacks after being back to the Document/Worker threads.
</ins><span class="cx"> context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
</span><span class="cx"> callback(result);
</span><span class="cx"> context.deref();
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> auto& rsaKey = downcast<CryptoKeyRSA>(key.get());
</span><span class="cx"> auto result = decryptRSAES_PKCS1_v1_5(rsaKey.platformKey(), rsaKey.keySizeInBits(), cipherText.data(), cipherText.size());
</span><span class="cx"> if (result.hasException()) {
</span><del>- // We should only derenference callbacks after being back to the Document/Worker threads.
</del><ins>+ // We should only dereference callbacks after being back to the Document/Worker threads.
</ins><span class="cx"> context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
</span><span class="cx"> exceptionCallback(ec);
</span><span class="cx"> context.deref();
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> });
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- // We should only derenference callbacks after being back to the Document/Worker threads.
</del><ins>+ // We should only dereference callbacks after being back to the Document/Worker threads.
</ins><span class="cx"> context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
</span><span class="cx"> callback(result);
</span><span class="cx"> context.deref();
</span></span></pre></div>
<a id="trunkSourceWebCorecryptomacCryptoAlgorithmRSA_OAEPMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp (209060 => 209061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp 2016-11-29 05:37:12 UTC (rev 209060)
+++ trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp 2016-11-29 05:49:36 UTC (rev 209061)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> auto& rsaKey = downcast<CryptoKeyRSA>(key.get());
</span><span class="cx"> auto result = encryptRSA_OAEP(rsaKey.hashAlgorithmIdentifier(), rsaParameters.labelVector(), rsaKey.platformKey(), rsaKey.keySizeInBits(), plainText.data(), plainText.size());
</span><span class="cx"> if (result.hasException()) {
</span><del>- // We should only derenference callbacks after being back to the Document/Worker threads.
</del><ins>+ // We should only dereference callbacks after being back to the Document/Worker threads.
</ins><span class="cx"> context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
</span><span class="cx"> exceptionCallback(ec);
</span><span class="cx"> context.deref();
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> });
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- // We should only derenference callbacks after being back to the Document/Worker threads.
</del><ins>+ // We should only dereference callbacks after being back to the Document/Worker threads.
</ins><span class="cx"> context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
</span><span class="cx"> callback(result);
</span><span class="cx"> context.deref();
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> auto& rsaKey = downcast<CryptoKeyRSA>(key.get());
</span><span class="cx"> auto result = decryptRSA_OAEP(rsaKey.hashAlgorithmIdentifier(), rsaParameters.labelVector(), rsaKey.platformKey(), rsaKey.keySizeInBits(), cipherText.data(), cipherText.size());
</span><span class="cx"> if (result.hasException()) {
</span><del>- // We should only derenference callbacks after being back to the Document/Worker threads.
</del><ins>+ // We should only dereference callbacks after being back to the Document/Worker threads.
</ins><span class="cx"> context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
</span><span class="cx"> exceptionCallback(ec);
</span><span class="cx"> context.deref();
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> });
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- // We should only derenference callbacks after being back to the Document/Worker threads.
</del><ins>+ // We should only dereference callbacks after being back to the Document/Worker threads.
</ins><span class="cx"> context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
</span><span class="cx"> callback(result);
</span><span class="cx"> context.deref();
</span></span></pre>
</div>
</div>
</body>
</html>