Changeset 209061 in webkit


Ignore:
Timestamp:
Nov 28, 2016 9:49:36 PM (7 years ago)
Author:
jiewen_tan@apple.com
Message:

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):

Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r209059 r209061  
     12016-11-28  Jiewen Tan  <jiewen_tan@apple.com>
     2
     3        Unreviewed, followup patch after r209059.
     4
     5        * crypto/mac/CryptoAlgorithmAES_CBCMac.cpp:
     6        (WebCore::CryptoAlgorithmAES_CBC::platformEncrypt):
     7        (WebCore::CryptoAlgorithmAES_CBC::platformDecrypt):
     8        * crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp:
     9        (WebCore::CryptoAlgorithmRSAES_PKCS1_v1_5::platformEncrypt):
     10        (WebCore::CryptoAlgorithmRSAES_PKCS1_v1_5::platformDecrypt):
     11        * crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp:
     12        (WebCore::CryptoAlgorithmRSA_OAEP::platformEncrypt):
     13        (WebCore::CryptoAlgorithmRSA_OAEP::platformDecrypt):
     14
    1152016-11-28  Jiewen Tan  <jiewen_tan@apple.com>
    216

  • trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp

    r209059 r209061  
    8383        auto result = transformAES_CBC(kCCEncrypt, aesParameters.ivVector().data(), aesKey.key(), plainText.data(), plainText.size());
    8484        if (result.hasException()) {
    85             // We should only derenference callbacks after being back to the Document/Worker threads.
     85            // We should only dereference callbacks after being back to the Document/Worker threads.
    8686            context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
    8787                exceptionCallback(ec);
    … …  
    9090            return;
    9191        }
    92         // We should only derenference callbacks after being back to the Document/Worker threads.
     92        // We should only dereference callbacks after being back to the Document/Worker threads.
    9393        context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
    9494            callback(result);
    … …  
    107107        auto result = transformAES_CBC(kCCDecrypt, aesParameters.ivVector().data(), aesKey.key(), cipherText.data(), cipherText.size());
    108108        if (result.hasException()) {
    109             // We should only derenference callbacks after being back to the Document/Worker threads.
     109            // We should only dereference callbacks after being back to the Document/Worker threads.
    110110            context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
    111111                exceptionCallback(ec);
    … …  
    114114            return;
    115115        }
    116         // We should only derenference callbacks after being back to the Document/Worker threads.
     116        // We should only dereference callbacks after being back to the Document/Worker threads.
    117117        context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
    118118            callback(result);

  • trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp

    r209059 r209061  
    6868        auto result = encryptRSAES_PKCS1_v1_5(rsaKey.platformKey(), rsaKey.keySizeInBits(), plainText.data(), plainText.size());
    6969        if (result.hasException()) {
    70             // We should only derenference callbacks after being back to the Document/Worker threads.
     70            // We should only dereference callbacks after being back to the Document/Worker threads.
    7171            context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
    7272                exceptionCallback(ec);
    … …  
    7575            return;
    7676        }
    77         // We should only derenference callbacks after being back to the Document/Worker threads.
     77        // We should only dereference callbacks after being back to the Document/Worker threads.
    7878        context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
    7979            callback(result);
    … …  
    9090        auto result = decryptRSAES_PKCS1_v1_5(rsaKey.platformKey(), rsaKey.keySizeInBits(), cipherText.data(), cipherText.size());
    9191        if (result.hasException()) {
    92             // We should only derenference callbacks after being back to the Document/Worker threads.
     92            // We should only dereference callbacks after being back to the Document/Worker threads.
    9393            context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
    9494                exceptionCallback(ec);
    … …  
    9797            return;
    9898        }
    99         // We should only derenference callbacks after being back to the Document/Worker threads.
     99        // We should only dereference callbacks after being back to the Document/Worker threads.
    100100        context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
    101101            callback(result);

  • trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp

    r209059 r209061  
    7979        auto result = encryptRSA_OAEP(rsaKey.hashAlgorithmIdentifier(), rsaParameters.labelVector(), rsaKey.platformKey(), rsaKey.keySizeInBits(), plainText.data(), plainText.size());
    8080        if (result.hasException()) {
    81             // We should only derenference callbacks after being back to the Document/Worker threads.
     81            // We should only dereference callbacks after being back to the Document/Worker threads.
    8282            context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
    8383                exceptionCallback(ec);
    … …  
    8686            return;
    8787        }
    88         // We should only derenference callbacks after being back to the Document/Worker threads.
     88        // We should only dereference callbacks after being back to the Document/Worker threads.
    8989        context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
    9090            callback(result);
    … …  
    102102        auto result = decryptRSA_OAEP(rsaKey.hashAlgorithmIdentifier(), rsaParameters.labelVector(), rsaKey.platformKey(), rsaKey.keySizeInBits(), cipherText.data(), cipherText.size());
    103103        if (result.hasException()) {
    104             // We should only derenference callbacks after being back to the Document/Worker threads.
     104            // We should only dereference callbacks after being back to the Document/Worker threads.
    105105            context.postTask([exceptionCallback = WTFMove(exceptionCallback), ec = result.releaseException().code(), callback = WTFMove(callback)](ScriptExecutionContext& context) {
    106106                exceptionCallback(ec);
    … …  
    109109            return;
    110110        }
    111         // We should only derenference callbacks after being back to the Document/Worker threads.
     111        // We should only dereference callbacks after being back to the Document/Worker threads.
    112112        context.postTask([callback = WTFMove(callback), result = result.releaseReturnValue(), exceptionCallback = WTFMove(exceptionCallback)](ScriptExecutionContext& context) {
    113113            callback(result);
Note: See TracChangeset for help on using the changeset viewer.