From 2e6740171049dc6fe8b6558cffa382ac2c0c9f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Fri, 12 May 2023 02:01:48 +0200
Subject: [PATCH] crypto: remove default encoding from scrypt

Refs: https://github.com/nodejs/node/pull/47182
PR-URL: https://github.com/nodejs/node/pull/47943
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
---
 lib/internal/crypto/scrypt.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/internal/crypto/scrypt.js b/lib/internal/crypto/scrypt.js
index b794322c272840..a90d317c552331 100644
--- a/lib/internal/crypto/scrypt.js
+++ b/lib/internal/crypto/scrypt.js
@@ -28,7 +28,6 @@ const {
 
 const {
   getArrayBufferOrView,
-  getDefaultEncoding,
 } = require('internal/crypto/util');
 
 const defaults = {
@@ -53,14 +52,11 @@ function scrypt(password, salt, keylen, options, callback = defaults) {
   const job = new ScryptJob(
     kCryptoJobAsync, password, salt, N, r, p, maxmem, keylen);
 
-  const encoding = getDefaultEncoding();
   job.ondone = (error, result) => {
     if (error !== undefined)
       return FunctionPrototypeCall(callback, job, error);
     const buf = Buffer.from(result);
-    if (encoding === 'buffer')
-      return FunctionPrototypeCall(callback, job, null, buf);
-    FunctionPrototypeCall(callback, job, null, buf.toString(encoding));
+    return FunctionPrototypeCall(callback, job, null, buf);
   };
 
   job.run();
@@ -77,9 +73,7 @@ function scryptSync(password, salt, keylen, options = defaults) {
   if (err !== undefined)
     throw err;
 
-  const buf = Buffer.from(result);
-  const encoding = getDefaultEncoding();
-  return encoding === 'buffer' ? buf : buf.toString(encoding);
+  return Buffer.from(result);
 }
 
 function check(password, salt, keylen, options) {