fix(ext/node): fix Cipheriv#update(string, undefined) (#25571)

denoland · Sep 11, 2024 · aae3a6b · aae3a6b
1 parent 200145a
commit aae3a6b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/ext/node/polyfills/internal/crypto/cipher.ts b/ext/node/polyfills/internal/crypto/cipher.ts
@@ -242,7 +242,7 @@ export class Cipheriv extends Transform implements Cipher {
   ): Buffer | string {
     // TODO(kt3k): throw ERR_INVALID_ARG_TYPE if data is not string, Buffer, or ArrayBufferView
     let buf = data;
-    if (typeof data === "string" && typeof inputEncoding === "string") {
+    if (typeof data === "string") {
       buf = Buffer.from(data, inputEncoding);
     }
 
@@ -396,7 +396,7 @@ export class Decipheriv extends Transform implements Cipher {
   ): Buffer | string {
     // TODO(kt3k): throw ERR_INVALID_ARG_TYPE if data is not string, Buffer, or ArrayBufferView
     let buf = data;
-    if (typeof data === "string" && typeof inputEncoding === "string") {
+    if (typeof data === "string") {
       buf = Buffer.from(data, inputEncoding);
     }
 

diff --git a/tests/unit_node/crypto/crypto_cipher_test.ts b/tests/unit_node/crypto/crypto_cipher_test.ts
@@ -139,16 +139,32 @@ Deno.test({
 Deno.test({
   name: "createCipheriv - input encoding",
   fn() {
-    const cipher = crypto.createCipheriv(
-      "aes-128-cbc",
-      new Uint8Array(16),
-      new Uint8Array(16),
-    );
-    assertEquals(
-      cipher.update("hello, world! hello, world!", "utf-8", "hex"),
-      "ca7df4d74f51b77a7440ead38343ab0f",
-    );
-    assertEquals(cipher.final("hex"), "d0da733dec1fa61125c80a6f97e6166e");
+    {
+      const cipher = crypto.createCipheriv(
+        "aes-128-cbc",
+        new Uint8Array(16),
+        new Uint8Array(16),
+      );
+      assertEquals(
+        cipher.update("hello, world! hello, world!", "utf-8", "hex"),
+        "ca7df4d74f51b77a7440ead38343ab0f",
+      );
+      assertEquals(cipher.final("hex"), "d0da733dec1fa61125c80a6f97e6166e");
+    }
+
+    {
+      const cipher = crypto.createCipheriv(
+        "aes-128-cbc",
+        new Uint8Array(16),
+        new Uint8Array(16),
+      );
+      // update with string without input encoding
+      assertEquals(
+        cipher.update("hello, world! hello, world!").toString("hex"),
+        "ca7df4d74f51b77a7440ead38343ab0f",
+      );
+      assertEquals(cipher.final("hex"), "d0da733dec1fa61125c80a6f97e6166e");
+    }
   },
 });