Diff
Modified: trunk/Source/WebCore/ChangeLog (209060 => 209061)
--- 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)
@@ -1,5 +1,19 @@
2016-11-28 Jiewen Tan <jiewen_...@apple.com>
+ 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_...@apple.com>
+
ASSERTION FAILED: m_scriptExecutionContext->isContextThread() seen with LayoutTest crypto/subtle/rsa-oaep-generate-key-encrypt-decrypt.html
https://bugs.webkit.org/show_bug.cgi?id=165124
<rdar://problem/29413805>
Modified: trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp (209060 => 209061)
--- 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)
@@ -82,7 +82,7 @@
ASSERT(aesParameters.ivVector().size() == kCCBlockSizeAES128);
auto result = transformAES_CBC(kCCEncrypt, aesParameters.ivVector().data(), aesKey.key(), plainText.data(), plainText.size());
if (result.hasException()) {
- // We should only derenference callbacks after being back to the Document/Worker threads.
+ // We should only dereference callbacks after being back to the Document/Worker threads.
context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
exceptionCallback(ec);
context.deref();
@@ -89,7 +89,7 @@
});
return;
}
- // We should only derenference callbacks after being back to the Document/Worker threads.
+ // We should only dereference callbacks after being back to the Document/Worker threads.
context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
callback(result);
context.deref();
@@ -106,7 +106,7 @@
assert(aesParameters.ivVector().size() == kCCBlockSizeAES128);
auto result = transformAES_CBC(kCCDecrypt, aesParameters.ivVector().data(), aesKey.key(), cipherText.data(), cipherText.size());
if (result.hasException()) {
- // We should only derenference callbacks after being back to the Document/Worker threads.
+ // We should only dereference callbacks after being back to the Document/Worker threads.
context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
exceptionCallback(ec);
context.deref();
@@ -113,7 +113,7 @@
});
return;
}
- // We should only derenference callbacks after being back to the Document/Worker threads.
+ // We should only dereference callbacks after being back to the Document/Worker threads.
context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
callback(result);
context.deref();
Modified: trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp (209060 => 209061)
--- 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)
@@ -67,7 +67,7 @@
auto& rsaKey = downcast<CryptoKeyRSA>(key.get());
auto result = encryptRSAES_PKCS1_v1_5(rsaKey.platformKey(), rsaKey.keySizeInBits(), plainText.data(), plainText.size());
if (result.hasException()) {
- // We should only derenference callbacks after being back to the Document/Worker threads.
+ // We should only dereference callbacks after being back to the Document/Worker threads.
context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
exceptionCallback(ec);
context.deref();
@@ -74,7 +74,7 @@
});
return;
}
- // We should only derenference callbacks after being back to the Document/Worker threads.
+ // We should only dereference callbacks after being back to the Document/Worker threads.
context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
callback(result);
context.deref();
@@ -89,7 +89,7 @@
auto& rsaKey = downcast<CryptoKeyRSA>(key.get());
auto result = decryptRSAES_PKCS1_v1_5(rsaKey.platformKey(), rsaKey.keySizeInBits(), cipherText.data(), cipherText.size());
if (result.hasException()) {
- // We should only derenference callbacks after being back to the Document/Worker threads.
+ // We should only dereference callbacks after being back to the Document/Worker threads.
context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
exceptionCallback(ec);
context.deref();
@@ -96,7 +96,7 @@
});
return;
}
- // We should only derenference callbacks after being back to the Document/Worker threads.
+ // We should only dereference callbacks after being back to the Document/Worker threads.
context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
callback(result);
context.deref();
Modified: trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp (209060 => 209061)
--- 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)
@@ -78,7 +78,7 @@
auto& rsaKey = downcast<CryptoKeyRSA>(key.get());
auto result = encryptRSA_OAEP(rsaKey.hashAlgorithmIdentifier(), rsaParameters.labelVector(), rsaKey.platformKey(), rsaKey.keySizeInBits(), plainText.data(), plainText.size());
if (result.hasException()) {
- // We should only derenference callbacks after being back to the Document/Worker threads.
+ // We should only dereference callbacks after being back to the Document/Worker threads.
context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
exceptionCallback(ec);
context.deref();
@@ -85,7 +85,7 @@
});
return;
}
- // We should only derenference callbacks after being back to the Document/Worker threads.
+ // We should only dereference callbacks after being back to the Document/Worker threads.
context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
callback(result);
context.deref();
@@ -101,7 +101,7 @@
auto& rsaKey = downcast<CryptoKeyRSA>(key.get());
auto result = decryptRSA_OAEP(rsaKey.hashAlgorithmIdentifier(), rsaParameters.labelVector(), rsaKey.platformKey(), rsaKey.keySizeInBits(), cipherText.data(), cipherText.size());
if (result.hasException()) {
- // We should only derenference callbacks after being back to the Document/Worker threads.
+ // We should only dereference callbacks after being back to the Document/Worker threads.
context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
exceptionCallback(ec);
context.deref();
@@ -108,7 +108,7 @@
});
return;
}
- // We should only derenference callbacks after being back to the Document/Worker threads.
+ // We should only dereference callbacks after being back to the Document/Worker threads.
context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
callback(result);
context.deref();
