Skip to content

Commit 5ea1a58

Browse files
danbevaddaleax
authored andcommitted
crypto: remove rsaPrivate and rename rsaPublic
This commit renames rsaPublic and removes the rsaPrivate function as the code in these two functions are identical. Backport-PR-URL: #20706 PR-URL: #20164 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent 503844e commit 5ea1a58

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

lib/internal/crypto/cipher.js

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const { StringDecoder } = require('string_decoder');
3333
const { inherits } = require('util');
3434
const { deprecate, normalizeEncoding } = require('internal/util');
3535

36-
function rsaPublic(method, defaultPadding) {
36+
function rsaFunctionFor(method, defaultPadding) {
3737
return function(options, buffer) {
3838
const key = options.key || options;
3939
const padding = options.padding || defaultPadding;
@@ -42,19 +42,10 @@ function rsaPublic(method, defaultPadding) {
4242
};
4343
}
4444

45-
function rsaPrivate(method, defaultPadding) {
46-
return function(options, buffer) {
47-
const key = options.key || options;
48-
const passphrase = options.passphrase || null;
49-
const padding = options.padding || defaultPadding;
50-
return method(toBuf(key), buffer, padding, passphrase);
51-
};
52-
}
53-
54-
const publicEncrypt = rsaPublic(_publicEncrypt, RSA_PKCS1_OAEP_PADDING);
55-
const publicDecrypt = rsaPublic(_publicDecrypt, RSA_PKCS1_PADDING);
56-
const privateEncrypt = rsaPrivate(_privateEncrypt, RSA_PKCS1_PADDING);
57-
const privateDecrypt = rsaPrivate(_privateDecrypt, RSA_PKCS1_OAEP_PADDING);
45+
const publicEncrypt = rsaFunctionFor(_publicEncrypt, RSA_PKCS1_OAEP_PADDING);
46+
const publicDecrypt = rsaFunctionFor(_publicDecrypt, RSA_PKCS1_PADDING);
47+
const privateEncrypt = rsaFunctionFor(_privateEncrypt, RSA_PKCS1_PADDING);
48+
const privateDecrypt = rsaFunctionFor(_privateDecrypt, RSA_PKCS1_OAEP_PADDING);
5849

5950
function getDecoder(decoder, encoding) {
6051
encoding = normalizeEncoding(encoding);

0 commit comments

Comments
 (0)