From 5ea1a58db90a9bd9df2a93e1b45333925668c6cc Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Fri, 20 Apr 2018 08:14:23 +0200 Subject: [PATCH] crypto: remove rsaPrivate and rename rsaPublic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit renames rsaPublic and removes the rsaPrivate function as the code in these two functions are identical. Backport-PR-URL: https://github.com/nodejs/node/pull/20706 PR-URL: https://github.com/nodejs/node/pull/20164 Reviewed-By: James M Snell Reviewed-By: Tobias Nießen Reviewed-By: Trivikram Kamat Reviewed-By: Ruben Bridgewater --- lib/internal/crypto/cipher.js | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/lib/internal/crypto/cipher.js b/lib/internal/crypto/cipher.js index 9a915c0c55ad27..abf007de5cd623 100644 --- a/lib/internal/crypto/cipher.js +++ b/lib/internal/crypto/cipher.js @@ -33,7 +33,7 @@ const { StringDecoder } = require('string_decoder'); const { inherits } = require('util'); const { deprecate, normalizeEncoding } = require('internal/util'); -function rsaPublic(method, defaultPadding) { +function rsaFunctionFor(method, defaultPadding) { return function(options, buffer) { const key = options.key || options; const padding = options.padding || defaultPadding; @@ -42,19 +42,10 @@ function rsaPublic(method, defaultPadding) { }; } -function rsaPrivate(method, defaultPadding) { - return function(options, buffer) { - const key = options.key || options; - const passphrase = options.passphrase || null; - const padding = options.padding || defaultPadding; - return method(toBuf(key), buffer, padding, passphrase); - }; -} - -const publicEncrypt = rsaPublic(_publicEncrypt, RSA_PKCS1_OAEP_PADDING); -const publicDecrypt = rsaPublic(_publicDecrypt, RSA_PKCS1_PADDING); -const privateEncrypt = rsaPrivate(_privateEncrypt, RSA_PKCS1_PADDING); -const privateDecrypt = rsaPrivate(_privateDecrypt, RSA_PKCS1_OAEP_PADDING); +const publicEncrypt = rsaFunctionFor(_publicEncrypt, RSA_PKCS1_OAEP_PADDING); +const publicDecrypt = rsaFunctionFor(_publicDecrypt, RSA_PKCS1_PADDING); +const privateEncrypt = rsaFunctionFor(_privateEncrypt, RSA_PKCS1_PADDING); +const privateDecrypt = rsaFunctionFor(_privateDecrypt, RSA_PKCS1_OAEP_PADDING); function getDecoder(decoder, encoding) { encoding = normalizeEncoding(encoding);