Skip to content

Commit ea5c17d

Browse files
rzcoderrzcoder
committed
version bump
1 parent a5cd796 commit ea5c17d

File tree

6 files changed

+28
-17
lines changed

6 files changed

+28
-17
lines changed

‎README.md

+3
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,9 @@ Return result of check, `true` or `false`.<br/>
236236
Questions, comments, bug reports, and pull requests are all welcome.
237237

238238
## Changelog
239+
240+
### 0.4.1
241+
* `PKCS1 no padding` scheme support.
239242

240243
### 0.4.0
241244
* License changed from BSD to MIT.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "node-rsa",
3-
"version": "0.4.0",
3+
"version": "0.4.1",
44
"description": "Node.js RSA library",
55
"main": "src/NodeRSA.js",
66
"scripts": {

‎src/NodeRSA.js

+6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* License BSD
88
*/
99

10+
var constants = require('constants');
1011
var rsa = require('./libs/rsa.js');
1112
var crypt = require('crypto');
1213
var ber = require('asn1').Ber;
@@ -15,6 +16,11 @@ var utils = require('./utils');
1516
var schemes = require('./schemes/schemes.js');
1617
var formats = require('./formats/formats.js');
1718

19+
if (typeof constants.RSA_NO_PADDING == "undefined") {
20+
//patch for node v0.10.x, constants do not defined
21+
constants.RSA_NO_PADDING = 3;
22+
}
23+
1824
module.exports = (function () {
1925
var SUPPORTED_HASH_ALGORITHMS = {
2026
node10: ['md4', 'md5', 'ripemd160', 'sha', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512'],

‎src/encryptEngines/io.js

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ var crypto = require('crypto');
22
var constants = require('constants');
33

44
module.exports = function (keyPair, options) {
5-
var jsEngine = require('./js.js')(keyPair, options);
6-
75
return {
86
encrypt: function (buffer, usePrivate) {
97
if (usePrivate) {

‎src/schemes/pkcs1.js

+4-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
var BigInteger = require('../libs/jsbn');
66
var crypt = require('crypto');
77
var constants = require('constants');
8-
var _ = require('lodash');
98
var SIGN_INFO_HEAD = {
109
md2: new Buffer('3020300c06082a864886f70d020205000410', 'hex'),
1110
md5: new Buffer('3020300c06082a864886f70d020505000410', 'hex'),
@@ -24,11 +23,6 @@ var SIGN_ALG_TO_HASH_ALIASES = {
2423

2524
var DEFAULT_HASH_FUNCTION = 'sha256';
2625

27-
if (typeof constants.RSA_NO_PADDING == "undefined") {
28-
//patch for node v0.10.x, constants do not defined
29-
constants.RSA_NO_PADDING = 3;
30-
}
31-
3226
module.exports = {
3327
isEncryption: true,
3428
isSignature: true
@@ -41,7 +35,7 @@ module.exports.makeScheme = function (key, options) {
4135
}
4236

4337
Scheme.prototype.maxMessageLength = function () {
44-
if (!_.isEmpty(this.options.encryptionSchemeOptions) && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
38+
if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
4539
return this.key.encryptedDataLength;
4640
}
4741
return this.key.encryptedDataLength - 11;
@@ -59,7 +53,7 @@ module.exports.makeScheme = function (key, options) {
5953
if (buffer.length > this.key.maxMessageLength) {
6054
throw new Error("Message too long for RSA (n=" + this.key.encryptedDataLength + ", l=" + buffer.length + ")");
6155
}
62-
if (!_.isEmpty(this.options.encryptionSchemeOptions) && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
56+
if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
6357
//RSA_NO_PADDING treated like JAVA left pad with zero character
6458
filled = new Buffer(this.key.maxMessageLength - buffer.length);
6559
filled.fill(0);
@@ -102,7 +96,7 @@ module.exports.makeScheme = function (key, options) {
10296
options = options || {};
10397
var i = 0;
10498

105-
if (!_.isEmpty(this.options.encryptionSchemeOptions) && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
99+
if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
106100
//RSA_NO_PADDING treated like JAVA left pad with zero character
107101
var unPad;
108102
if (typeof buffer.lastIndexOf == "function") { //patch for old node version
@@ -164,7 +158,7 @@ module.exports.makeScheme = function (key, options) {
164158
Scheme.prototype.verify = function (buffer, signature, signature_encoding) {
165159
if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
166160
//RSA_NO_PADDING has no verify data
167-
return true;
161+
return false;
168162
}
169163
var hashAlgorithm = this.options.signingSchemeOptions.hash || DEFAULT_HASH_FUNCTION;
170164
if (this.options.environment === 'browser') {

‎test/tests.js

+14-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,19 @@ describe('NodeRSA', function () {
1717
];
1818

1919
var environments = ['browser', 'node'];
20-
var encryptSchemes = ['pkcs1', 'pkcs1_oaep', {scheme:'pkcs1', encryptionScheme:{padding: constants.RSA_NO_PADDING}}];
20+
var encryptSchemes = [
21+
'pkcs1',
22+
'pkcs1_oaep',
23+
{
24+
scheme:'pkcs1',
25+
encryptionScheme:{
26+
padding: constants.RSA_NO_PADDING
27+
},
28+
toString: function() {
29+
return 'pkcs1-nopadding';
30+
}
31+
}
32+
];
2133
var signingSchemes = ['pkcs1', 'pss'];
2234
var signHashAlgorithms = {
2335
'node': ['MD4', 'MD5', 'RIPEMD160', 'SHA', 'SHA1', 'SHA224', 'SHA256', 'SHA384', 'SHA512'],
@@ -117,8 +129,7 @@ describe('NodeRSA', function () {
117129
encryptionScheme: {
118130
scheme: 'pkcs1_oaep',
119131
hash: 'sha512',
120-
label: 'horay',
121-
padding: constants.RSA_NO_PADDING
132+
label: 'horay'
122133
},
123134
signingScheme: {
124135
scheme: 'pss',
@@ -133,7 +144,6 @@ describe('NodeRSA', function () {
133144
assert.equal(key.$options.encryptionScheme, 'pkcs1_oaep');
134145
assert.equal(key.$options.encryptionSchemeOptions.hash, 'sha512');
135146
assert.equal(key.$options.encryptionSchemeOptions.label, 'horay');
136-
assert.equal(key.$options.encryptionSchemeOptions.padding, constants.RSA_NO_PADDING);
137147
});
138148

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

0 commit comments

Comments
 (0)