Skip to content

Commit b1986ef

Browse files
author
ZhaoLei
committed
add RSA_NO_PADDING support compatible with bouncycastle
1 parent e045714 commit b1986ef

File tree

4 files changed

+53
-6
lines changed

4 files changed

+53
-6
lines changed

‎src/encryptEngines/io.js‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,22 @@ module.exports = function (keyPair, options) {
77
return {
88
encrypt: function (buffer, usePrivate) {
99
if (usePrivate) {
10+
var padding = constants.RSA_PKCS1_PADDING;
11+
if (options.encryptionSchemeOptions && options.encryptionSchemeOptions.padding) {
12+
padding = options.encryptionSchemeOptions.padding;
13+
}
1014
return crypto.privateEncrypt({
1115
key: options.rsaUtils.exportKey('private'),
12-
padding: constants.RSA_PKCS1_PADDING
16+
padding: padding
1317
}, buffer);
1418
} else {
1519
var padding = constants.RSA_PKCS1_OAEP_PADDING;
1620
if (options.encryptionScheme === 'pkcs1') {
1721
padding = constants.RSA_PKCS1_PADDING;
1822
}
19-
23+
if (options.encryptionSchemeOptions && options.encryptionSchemeOptions.padding) {
24+
padding = options.encryptionSchemeOptions.padding;
25+
}
2026
return crypto.publicEncrypt({
2127
key: options.rsaUtils.exportKey('public'),
2228
padding: padding
@@ -26,16 +32,22 @@ module.exports = function (keyPair, options) {
2632

2733
decrypt: function (buffer, usePublic) {
2834
if (usePublic) {
35+
var padding = constants.RSA_PKCS1_PADDING;
36+
if (options.encryptionSchemeOptions && options.encryptionSchemeOptions.padding) {
37+
padding = options.encryptionSchemeOptions.padding;
38+
}
2939
return crypto.publicDecrypt({
3040
key: options.rsaUtils.exportKey('public'),
31-
padding: constants.RSA_PKCS1_PADDING
41+
padding: padding
3242
}, buffer);
3343
} else {
3444
var padding = constants.RSA_PKCS1_OAEP_PADDING;
3545
if (options.encryptionScheme === 'pkcs1') {
3646
padding = constants.RSA_PKCS1_PADDING;
3747
}
38-
48+
if (options.encryptionSchemeOptions && options.encryptionSchemeOptions.padding) {
49+
padding = options.encryptionSchemeOptions.padding;
50+
}
3951
return crypto.privateDecrypt({
4052
key: options.rsaUtils.exportKey('private'),
4153
padding: padding

‎src/encryptEngines/node12.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ module.exports = function (keyPair, options) {
1313
if (options.encryptionScheme === 'pkcs1') {
1414
padding = constants.RSA_PKCS1_PADDING;
1515
}
16+
if (options.encryptionSchemeOptions && options.encryptionSchemeOptions.padding) {
17+
padding = options.encryptionSchemeOptions.padding;
18+
}
1619

1720
return crypto.publicEncrypt({
1821
key: options.rsaUtils.exportKey('public'),
@@ -28,6 +31,9 @@ module.exports = function (keyPair, options) {
2831
if (options.encryptionScheme === 'pkcs1') {
2932
padding = constants.RSA_PKCS1_PADDING;
3033
}
34+
if (options.encryptionSchemeOptions && options.encryptionSchemeOptions.padding) {
35+
padding = options.encryptionSchemeOptions.padding;
36+
}
3137

3238
return crypto.privateDecrypt({
3339
key: options.rsaUtils.exportKey('private'),

‎src/schemes/pkcs1.js‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
var BigInteger = require('../libs/jsbn');
66
var crypt = require('crypto');
7+
var constants = require('constants');
78
var SIGN_INFO_HEAD = {
89
md2: new Buffer('3020300c06082a864886f70d020205000410', 'hex'),
910
md5: new Buffer('3020300c06082a864886f70d020505000410', 'hex'),
@@ -34,6 +35,9 @@ module.exports.makeScheme = function (key, options) {
3435
}
3536

3637
Scheme.prototype.maxMessageLength = function () {
38+
if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
39+
return this.key.encryptedDataLength;
40+
}
3741
return this.key.encryptedDataLength - 11;
3842
};
3943

@@ -50,6 +54,13 @@ module.exports.makeScheme = function (key, options) {
5054
throw new Error("Message too long for RSA (n=" + this.key.encryptedDataLength + ", l=" + buffer.length + ")");
5155
}
5256

57+
if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
58+
//RSA_NO_PADDING treated like JAVA left pad with zero character
59+
filled = new Buffer(this.key.maxMessageLength - buffer.length);
60+
filled.fill(0);
61+
return Buffer.concat([filled, buffer]);
62+
}
63+
5364
/* Type 1: zeros padding for private key encrypt */
5465
if (options.type === 1) {
5566
filled = new Buffer(this.key.encryptedDataLength - buffer.length - 1);
@@ -86,6 +97,17 @@ module.exports.makeScheme = function (key, options) {
8697
options = options || {};
8798
var i = 0;
8899

100+
if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
101+
//RSA_NO_PADDING treated like JAVA left pad with zero character
102+
var unPad;
103+
if (typeof buffer.lastIndexOf == "function") { //patch for old node version
104+
unPad = buffer.slice(buffer.lastIndexOf('\0') + 1, buffer.length);
105+
} else {
106+
unPad = buffer.slice(String.prototype.lastIndexOf.call(buffer, '\0') + 1, buffer.length);
107+
}
108+
return unPad;
109+
}
110+
89111
if (buffer.length < 4) {
90112
return null;
91113
}
@@ -135,6 +157,10 @@ module.exports.makeScheme = function (key, options) {
135157
};
136158

137159
Scheme.prototype.verify = function (buffer, signature, signature_encoding) {
160+
if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
161+
//RSA_NO_PADDING has no verify data
162+
return true;
163+
}
138164
var hashAlgorithm = this.options.signingSchemeOptions.hash || DEFAULT_HASH_FUNCTION;
139165
if (this.options.environment === 'browser') {
140166
hashAlgorithm = SIGN_ALG_TO_HASH_ALIASES[hashAlgorithm] || hashAlgorithm;

‎test/tests.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var assert = require('chai').assert;
33
var _ = require('lodash');
44
var NodeRSA = require('../src/NodeRSA');
55
var OAEP = require('../src/schemes/oaep');
6+
var constants = require('constants');
67

78
describe('NodeRSA', function () {
89
var keySizes = [
@@ -16,7 +17,7 @@ describe('NodeRSA', function () {
1617
];
1718

1819
var environments = ['browser', 'node'];
19-
var encryptSchemes = ['pkcs1', 'pkcs1_oaep'];
20+
var encryptSchemes = ['pkcs1', 'pkcs1_oaep', {scheme:'pkcs1', encryptionScheme:{padding: constants.RSA_NO_PADDING}}];
2021
var signingSchemes = ['pkcs1', 'pss'];
2122
var signHashAlgorithms = {
2223
'node': ['MD4', 'MD5', 'RIPEMD160', 'SHA', 'SHA1', 'SHA224', 'SHA256', 'SHA384', 'SHA512'],
@@ -116,7 +117,8 @@ describe('NodeRSA', function () {
116117
encryptionScheme: {
117118
scheme: 'pkcs1_oaep',
118119
hash: 'sha512',
119-
label: 'horay'
120+
label: 'horay',
121+
padding: constants.RSA_NO_PADDING
120122
},
121123
signingScheme: {
122124
scheme: 'pss',
@@ -131,6 +133,7 @@ describe('NodeRSA', function () {
131133
assert.equal(key.$options.encryptionScheme, 'pkcs1_oaep');
132134
assert.equal(key.$options.encryptionSchemeOptions.hash, 'sha512');
133135
assert.equal(key.$options.encryptionSchemeOptions.label, 'horay');
136+
assert.equal(key.$options.encryptionSchemeOptions.padding, constants.RSA_NO_PADDING);
134137
});
135138

136139
it('should throw \'unsupported hashing algorithm\' exception', function () {

0 commit comments

Comments
 (0)