From 751c92d9728da6f6f86e443783a61253791cfc2f Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Wed, 20 Mar 2019 13:05:12 +0100 Subject: [PATCH] crypto: remove obsolete encoding check This renames the parameters for clarity and removes the check for undefined encoding. That will always default to `utf8`. PR-URL: https://github.com/nodejs/node/pull/26809 Reviewed-By: Matteo Collina Reviewed-By: James M Snell --- lib/internal/crypto/util.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/internal/crypto/util.js b/lib/internal/crypto/util.js index 6746f2a66c818a..c8a1f9e927ec6b 100644 --- a/lib/internal/crypto/util.js +++ b/lib/internal/crypto/util.js @@ -55,13 +55,13 @@ function getDefaultEncoding() { // This is here because many functions accepted binary strings without // any explicit encoding in older versions of node, and we don't want // to break them unnecessarily. -function toBuf(str, encoding) { - if (typeof str === 'string') { - if (encoding === 'buffer' || !encoding) +function toBuf(val, encoding) { + if (typeof val === 'string') { + if (encoding === 'buffer') encoding = 'utf8'; - return Buffer.from(str, encoding); + return Buffer.from(val, encoding); } - return str; + return val; } const getCiphers = cachedResult(() => filterDuplicateStrings(_getCiphers()));