diff options
| -rw-r--r-- | lib/internal/crypto/scrypt.js | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/internal/crypto/scrypt.js b/lib/internal/crypto/scrypt.js index b794322c27..a90d317c55 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) { |