Changeset 275535 in webkit

Timestamp:

Apr 6, 2021 11:10:31 AM (3 years ago)

Author:

jiewen_tan@apple.com

Message:

WebCrypto in Safari will not AES-GCM encrypt 0 bytes
​https://bugs.webkit.org/show_bug.cgi?id=224083
<rdar://75093377>

Reviewed by Youenn Fablet.

Source/WebCore:

CommonCrypto will bail out both the encryption and decryption process if the dataOut is a null pointer.
To workaround the issue, this patch forces the dataOut to be a non-null pointer.

Test: crypto/subtle/aes-gcm-generate-key-encrypt-decrypt-null-plain-text.html

• crypto/mac/CryptoAlgorithmAES_GCMMac.cpp:

(WebCore::encryptAES_GCM):
(WebCore::decyptAES_GCM):

LayoutTests:

• crypto/subtle/aes-gcm-generate-key-encrypt-decrypt-null-plain-text-expected.txt: Added.
• crypto/subtle/aes-gcm-generate-key-encrypt-decrypt-null-plain-text.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/crypto/subtle/aes-gcm-generate-key-encrypt-decrypt-null-plain-text-expected.txt (added)
• LayoutTests/crypto/subtle/aes-gcm-generate-key-encrypt-decrypt-null-plain-text.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/crypto/mac/CryptoAlgorithmAES_GCMMac.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-04-06  Jiewen Tan  <jiewen_tan@apple.com>
+
+        WebCrypto in Safari will not AES-GCM encrypt 0 bytes
+        https://bugs.webkit.org/show_bug.cgi?id=224083
+        <rdar://75093377>
+
+        Reviewed by Youenn Fablet.
+
+        * crypto/subtle/aes-gcm-generate-key-encrypt-decrypt-null-plain-text-expected.txt: Added.
+        * crypto/subtle/aes-gcm-generate-key-encrypt-decrypt-null-plain-text.html: Added.
+
 2021-04-06  Chris Gambrell  <cgambrell@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-06  Jiewen Tan  <jiewen_tan@apple.com>
+
+        WebCrypto in Safari will not AES-GCM encrypt 0 bytes
+        https://bugs.webkit.org/show_bug.cgi?id=224083
+        <rdar://75093377>
+
+        Reviewed by Youenn Fablet.
+
+        CommonCrypto will bail out both the encryption and decryption process if the dataOut is a null pointer.
+        To workaround the issue, this patch forces the dataOut to be a non-null pointer.
+
+        Test: crypto/subtle/aes-gcm-generate-key-encrypt-decrypt-null-plain-text.html
+
+        * crypto/mac/CryptoAlgorithmAES_GCMMac.cpp:
+        (WebCore::encryptAES_GCM):
+        (WebCore::decyptAES_GCM):
+
 2021-04-06  Patrick Angle  <pangle@apple.com>
 

trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_GCMMac.cpp

@@ -38 +38 @@
 static ExceptionOr<Vector<uint8_t>> encryptAES_GCM(const Vector<uint8_t>& iv, const Vector<uint8_t>& key, const Vector<uint8_t>& plainText, const Vector<uint8_t>& additionalData, size_t desiredTagLengthInBytes)
 {
-    Vector<uint8_t> cipherText(plainText.size()); // Per section 5.2.1.2: http://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf
+    // This is a wordaround for rdar://75093377. Force the buffer to be a non null pointer.
+    Vector<uint8_t> cipherText(plainText.size() + desiredTagLengthInBytes); // Per section 5.2.1.2: http://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf
     Vector<uint8_t> tag(desiredTagLengthInBytes);
     // tagLength is actual an input <rdar://problem/30660074>
@@ -47 +48 @@
         return Exception { OperationError };
 
-    cipherText.append(tag.data(), desiredTagLengthInBytes);
+    memcpy(cipherText.data() + plainText.size(), tag.data(), desiredTagLengthInBytes);
 
     return WTFMove(cipherText);
@@ -54 +55 @@
 static ExceptionOr<Vector<uint8_t>> decyptAES_GCM(const Vector<uint8_t>& iv, const Vector<uint8_t>& key, const Vector<uint8_t>& cipherText, const Vector<uint8_t>& additionalData, size_t desiredTagLengthInBytes)
 {
-    Vector<uint8_t> plainText(cipherText.size() - desiredTagLengthInBytes); // Per section 5.2.1.2: http://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf
+    // This is a wordaround for rdar://75093377. Force the buffer to be a non null pointer.
+    Vector<uint8_t> plainText(cipherText.size()); // Per section 5.2.1.2: http://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf
     Vector<uint8_t> tag(desiredTagLengthInBytes);
     size_t offset = cipherText.size() - desiredTagLengthInBytes;
@@ -68 +70 @@
         return Exception { OperationError };
 
+    // This is a wordaround for rdar://75093377. Force the buffer to be a non null pointer.
+    plainText.shrink(offset);
     return WTFMove(plainText);
 }