Skip to content

Commit 4cf393d

Browse files
rzcoderrzcoder
committed
Merge remote-tracking branch 'origin/dev' into stage
# Conflicts: # .travis.yml # README.md # package.json
2 parents 9bd9942 + 4825109 commit 4cf393d

File tree

8 files changed

+54
-44
lines changed

8 files changed

+54
-44
lines changed

‎src/NodeRSA.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ module.exports = (function () {
289289
*/
290290
NodeRSA.prototype.$$decryptKey = function (usePublic, buffer, encoding) {
291291
try {
292-
buffer = _.isString(buffer) ? new Buffer(buffer, 'base64') : buffer;
292+
buffer = _.isString(buffer) ? Buffer.from(buffer, 'base64') : buffer;
293293
var res = this.keyPair.decrypt(buffer, usePublic);
294294

295295
if (res === null) {
@@ -366,11 +366,11 @@ module.exports = (function () {
366366
*/
367367
NodeRSA.prototype.$getDataForEncrypt = function (buffer, encoding) {
368368
if (_.isString(buffer) || _.isNumber(buffer)) {
369-
return new Buffer('' + buffer, encoding || 'utf8');
369+
return Buffer.from('' + buffer, encoding || 'utf8');
370370
} else if (Buffer.isBuffer(buffer)) {
371371
return buffer;
372372
} else if (_.isObject(buffer)) {
373-
return new Buffer(JSON.stringify(buffer));
373+
return Buffer.from(JSON.stringify(buffer));
374374
} else {
375375
throw Error("Unexpected data type");
376376
}

‎src/encryptEngines/io.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ module.exports = function (keyPair, options) {
77

88
return {
99
encrypt: function (buffer, usePrivate) {
10+
var padding;
1011
if (usePrivate) {
11-
var padding = constants.RSA_PKCS1_PADDING;
12+
padding = constants.RSA_PKCS1_PADDING;
1213
if (options.encryptionSchemeOptions && options.encryptionSchemeOptions.padding) {
1314
padding = options.encryptionSchemeOptions.padding;
1415
}
@@ -17,7 +18,7 @@ module.exports = function (keyPair, options) {
1718
padding: padding
1819
}, buffer);
1920
} else {
20-
var padding = constants.RSA_PKCS1_OAEP_PADDING;
21+
padding = constants.RSA_PKCS1_OAEP_PADDING;
2122
if (options.encryptionScheme === 'pkcs1') {
2223
padding = constants.RSA_PKCS1_PADDING;
2324
}
@@ -38,8 +39,9 @@ module.exports = function (keyPair, options) {
3839
},
3940

4041
decrypt: function (buffer, usePublic) {
42+
var padding;
4143
if (usePublic) {
42-
var padding = constants.RSA_PKCS1_PADDING;
44+
padding = constants.RSA_PKCS1_PADDING;
4345
if (options.encryptionSchemeOptions && options.encryptionSchemeOptions.padding) {
4446
padding = options.encryptionSchemeOptions.padding;
4547
}
@@ -48,7 +50,7 @@ module.exports = function (keyPair, options) {
4850
padding: padding
4951
}, buffer);
5052
} else {
51-
var padding = constants.RSA_PKCS1_OAEP_PADDING;
53+
padding = constants.RSA_PKCS1_OAEP_PADDING;
5254
if (options.encryptionScheme === 'pkcs1') {
5355
padding = constants.RSA_PKCS1_PADDING;
5456
}

‎src/formats/pkcs1.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ module.exports = {
4949
var pem = data.replace('-----BEGIN RSA PRIVATE KEY-----', '')
5050
.replace('-----END RSA PRIVATE KEY-----', '')
5151
.replace(/\s+|\n\r|\n|\r$/gm, '');
52-
buffer = new Buffer(pem, 'base64');
52+
buffer = Buffer.from(pem, 'base64');
5353
} else {
5454
throw Error('Unsupported key format');
5555
}
@@ -106,7 +106,7 @@ module.exports = {
106106
var pem = data.replace('-----BEGIN RSA PUBLIC KEY-----', '')
107107
.replace('-----END RSA PUBLIC KEY-----', '')
108108
.replace(/\s+|\n\r|\n|\r$/gm, '');
109-
buffer = new Buffer(pem, 'base64');
109+
buffer = Buffer.from(pem, 'base64');
110110
}
111111
} else if (Buffer.isBuffer(data)) {
112112
buffer = data;

‎src/formats/pkcs8.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ module.exports = {
6060
var pem = data.replace('-----BEGIN PRIVATE KEY-----', '')
6161
.replace('-----END PRIVATE KEY-----', '')
6262
.replace(/\s+|\n\r|\n|\r$/gm, '');
63-
buffer = new Buffer(pem, 'base64');
63+
buffer = Buffer.from(pem, 'base64');
6464
} else {
6565
throw Error('Unsupported key format');
6666
}
@@ -136,7 +136,7 @@ module.exports = {
136136
var pem = data.replace('-----BEGIN PUBLIC KEY-----', '')
137137
.replace('-----END PUBLIC KEY-----', '')
138138
.replace(/\s+|\n\r|\n|\r$/gm, '');
139-
buffer = new Buffer(pem, 'base64');
139+
buffer = Buffer.from(pem, 'base64');
140140
}
141141
} else if (Buffer.isBuffer(data)) {
142142
buffer = data;

‎src/libs/jsbn.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ function bnToByteArray() {
829829
* @returns {Buffer}
830830
*/
831831
function bnToBuffer(trimOrSize) {
832-
var res = new Buffer(this.toByteArray());
832+
var res = Buffer.from(this.toByteArray());
833833
if (trimOrSize === true && res[0] === 0) {
834834
res = res.slice(1);
835835
} else if (_.isNumber(trimOrSize)) {
@@ -841,7 +841,7 @@ function bnToBuffer(trimOrSize) {
841841
}
842842
return res.slice(res.length - trimOrSize);
843843
} else if (res.length < trimOrSize) {
844-
var padded = new Buffer(trimOrSize);
844+
var padded = Buffer.alloc(trimOrSize);
845845
padded.fill(0, 0, trimOrSize - res.length);
846846
res.copy(padded, trimOrSize - res.length);
847847
return padded;

‎src/schemes/oaep.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ module.exports.eme_oaep_mgf1 = function (seed, maskLength, hashFunction) {
4343
hashFunction = hashFunction || DEFAULT_HASH_FUNCTION;
4444
var hLen = module.exports.digestLength[hashFunction];
4545
var count = Math.ceil(maskLength / hLen);
46-
var T = new Buffer(hLen * count);
47-
var c = new Buffer(4);
46+
var T = Buffer.alloc(hLen * count);
47+
var c = Buffer.alloc(4);
4848
for (var i = 0; i < count; ++i) {
4949
var hash = crypt.createHash(hashFunction);
5050
hash.update(seed);
@@ -74,7 +74,7 @@ module.exports.makeScheme = function (key, options) {
7474
Scheme.prototype.encPad = function (buffer) {
7575
var hash = this.options.encryptionSchemeOptions.hash || DEFAULT_HASH_FUNCTION;
7676
var mgf = this.options.encryptionSchemeOptions.mgf || module.exports.eme_oaep_mgf1;
77-
var label = this.options.encryptionSchemeOptions.label || new Buffer(0);
77+
var label = this.options.encryptionSchemeOptions.label || Buffer.alloc(0);
7878
var emLen = this.key.encryptedDataLength;
7979

8080
var hLen = module.exports.digestLength[hash];
@@ -89,7 +89,7 @@ module.exports.makeScheme = function (key, options) {
8989
lHash.update(label);
9090
lHash = lHash.digest();
9191

92-
var PS = new Buffer(emLen - buffer.length - 2 * hLen - 1); // Padding "String"
92+
var PS = Buffer.alloc(emLen - buffer.length - 2 * hLen - 1); // Padding "String"
9393
PS.fill(0); // Fill the buffer with octets of 0
9494
PS[PS.length - 1] = 1;
9595

@@ -112,7 +112,7 @@ module.exports.makeScheme = function (key, options) {
112112
}
113113
// seed = maskedSeed
114114

115-
var em = new Buffer(1 + seed.length + DB.length);
115+
var em = Buffer.alloc(1 + seed.length + DB.length);
116116
em[0] = 0;
117117
seed.copy(em, 1);
118118
DB.copy(em, 1 + seed.length);
@@ -132,7 +132,7 @@ module.exports.makeScheme = function (key, options) {
132132
Scheme.prototype.encUnPad = function (buffer) {
133133
var hash = this.options.encryptionSchemeOptions.hash || DEFAULT_HASH_FUNCTION;
134134
var mgf = this.options.encryptionSchemeOptions.mgf || module.exports.eme_oaep_mgf1;
135-
var label = this.options.encryptionSchemeOptions.label || new Buffer(0);
135+
var label = this.options.encryptionSchemeOptions.label || Buffer.alloc(0);
136136

137137
var hLen = module.exports.digestLength[hash];
138138

‎src/schemes/pkcs1.js‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ var BigInteger = require('../libs/jsbn');
66
var crypt = require('crypto');
77
var constants = require('constants');
88
var SIGN_INFO_HEAD = {
9-
md2: new Buffer('3020300c06082a864886f70d020205000410', 'hex'),
10-
md5: new Buffer('3020300c06082a864886f70d020505000410', 'hex'),
11-
sha1: new Buffer('3021300906052b0e03021a05000414', 'hex'),
12-
sha224: new Buffer('302d300d06096086480165030402040500041c', 'hex'),
13-
sha256: new Buffer('3031300d060960864801650304020105000420', 'hex'),
14-
sha384: new Buffer('3041300d060960864801650304020205000430', 'hex'),
15-
sha512: new Buffer('3051300d060960864801650304020305000440', 'hex'),
16-
ripemd160: new Buffer('3021300906052b2403020105000414', 'hex'),
17-
rmd160: new Buffer('3021300906052b2403020105000414', 'hex')
9+
md2: Buffer.from('3020300c06082a864886f70d020205000410', 'hex'),
10+
md5: Buffer.from('3020300c06082a864886f70d020505000410', 'hex'),
11+
sha1: Buffer.from('3021300906052b0e03021a05000414', 'hex'),
12+
sha224: Buffer.from('302d300d06096086480165030402040500041c', 'hex'),
13+
sha256: Buffer.from('3031300d060960864801650304020105000420', 'hex'),
14+
sha384: Buffer.from('3041300d060960864801650304020205000430', 'hex'),
15+
sha512: Buffer.from('3051300d060960864801650304020305000440', 'hex'),
16+
ripemd160: Buffer.from('3021300906052b2403020105000414', 'hex'),
17+
rmd160: Buffer.from('3021300906052b2403020105000414', 'hex')
1818
};
1919

2020
var SIGN_ALG_TO_HASH_ALIASES = {
@@ -42,7 +42,7 @@ module.exports.makeScheme = function (key, options) {
4242
};
4343

4444
/**
45-
* Pad input Buffer to encryptedDataLength bytes, and return new Buffer
45+
* Pad input Buffer to encryptedDataLength bytes, and return Buffer.from
4646
* alg: PKCS#1
4747
* @param buffer
4848
* @returns {Buffer}
@@ -55,20 +55,22 @@ module.exports.makeScheme = function (key, options) {
5555
}
5656
if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
5757
//RSA_NO_PADDING treated like JAVA left pad with zero character
58-
return this.pkcs0pad(buffer);
58+
filled = Buffer.alloc(this.key.maxMessageLength - buffer.length);
59+
filled.fill(0);
60+
return Buffer.concat([filled, buffer]);
5961
}
6062

6163
/* Type 1: zeros padding for private key encrypt */
6264
if (options.type === 1) {
63-
filled = new Buffer(this.key.encryptedDataLength - buffer.length - 1);
65+
filled = Buffer.alloc(this.key.encryptedDataLength - buffer.length - 1);
6466
filled.fill(0xff, 0, filled.length - 1);
6567
filled[0] = 1;
6668
filled[filled.length - 1] = 0;
6769

6870
return Buffer.concat([filled, buffer]);
6971
} else {
7072
/* random padding for public key encrypt */
71-
filled = new Buffer(this.key.encryptedDataLength - buffer.length);
73+
filled = Buffer.alloc(this.key.encryptedDataLength - buffer.length);
7274
filled[0] = 0;
7375
filled[1] = 2;
7476
var rand = crypt.randomBytes(filled.length - 3);
@@ -96,7 +98,13 @@ module.exports.makeScheme = function (key, options) {
9698

9799
if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
98100
//RSA_NO_PADDING treated like JAVA left pad with zero character
99-
return this.pkcs0unpad(buffer);
101+
var unPad;
102+
if (typeof buffer.lastIndexOf == "function") { //patch for old node version
103+
unPad = buffer.slice(buffer.lastIndexOf('\0') + 1, buffer.length);
104+
} else {
105+
unPad = buffer.slice(String.prototype.lastIndexOf.call(buffer, '\0') + 1, buffer.length);
106+
}
107+
return unPad;
100108
}
101109

102110
if (buffer.length < 4) {
@@ -157,7 +165,7 @@ module.exports.makeScheme = function (key, options) {
157165
hashAlgorithm = SIGN_ALG_TO_HASH_ALIASES[hashAlgorithm] || hashAlgorithm;
158166

159167
if (signature_encoding) {
160-
signature = new Buffer(signature, signature_encoding);
168+
signature = Buffer.from(signature, signature_encoding);
161169
}
162170

163171
var hasher = crypt.createHash(hashAlgorithm);
@@ -180,7 +188,7 @@ module.exports.makeScheme = function (key, options) {
180188
* @returns {*}
181189
*/
182190
Scheme.prototype.pkcs0pad = function (buffer) {
183-
var filled = new Buffer(this.key.maxMessageLength - buffer.length);
191+
var filled = Buffer.alloc(this.key.maxMessageLength - buffer.length);
184192
filled.fill(0);
185193
return Buffer.concat([filled, buffer]);
186194
};
@@ -214,7 +222,7 @@ module.exports.makeScheme = function (key, options) {
214222
throw Error('Key is too short for signing algorithm (' + hashAlgorithm + ')');
215223
}
216224

217-
var filled = new Buffer(this.key.encryptedDataLength - data.length - 1);
225+
var filled = Buffer.alloc(this.key.encryptedDataLength - data.length - 1);
218226
filled.fill(0xff, 0, filled.length - 1);
219227
filled[0] = 1;
220228
filled[filled.length - 1] = 0;

‎src/schemes/pss.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ module.exports.makeScheme = function (key, options) {
4141

4242
Scheme.prototype.verify = function (buffer, signature, signature_encoding) {
4343
if (signature_encoding) {
44-
signature = new Buffer(signature, signature_encoding);
44+
signature = Buffer.from(signature, signature_encoding);
4545
}
4646
signature = new BigInteger(signature);
4747

@@ -78,7 +78,7 @@ module.exports.makeScheme = function (key, options) {
7878

7979
var salt = crypt.randomBytes(sLen);
8080

81-
var Mapostrophe = new Buffer(8 + hLen + sLen);
81+
var Mapostrophe = Buffer.alloc(8 + hLen + sLen);
8282
Mapostrophe.fill(0, 0, 8);
8383
mHash.copy(Mapostrophe, 8);
8484
salt.copy(Mapostrophe, 8 + mHash.length);
@@ -87,18 +87,18 @@ module.exports.makeScheme = function (key, options) {
8787
H.update(Mapostrophe);
8888
H = H.digest();
8989

90-
var PS = new Buffer(emLen - salt.length - hLen - 2);
90+
var PS = Buffer.alloc(emLen - salt.length - hLen - 2);
9191
PS.fill(0);
9292

93-
var DB = new Buffer(PS.length + 1 + salt.length);
93+
var DB = Buffer.alloc(PS.length + 1 + salt.length);
9494
PS.copy(DB);
9595
DB[PS.length] = 0x01;
9696
salt.copy(DB, PS.length + 1);
9797

9898
var dbMask = mgf(H, DB.length, hash);
9999

100100
// XOR DB and dbMask together
101-
var maskedDB = new Buffer(DB.length);
101+
var maskedDB = Buffer.alloc(DB.length);
102102
for (var i = 0; i < dbMask.length; i++) {
103103
maskedDB[i] = DB[i] ^ dbMask[i];
104104
}
@@ -107,7 +107,7 @@ module.exports.makeScheme = function (key, options) {
107107
var mask = 255 ^ (255 >> 8 - bits << 8 - bits);
108108
maskedDB[0] = maskedDB[0] & mask;
109109

110-
var EM = new Buffer(maskedDB.length + H.length + 1);
110+
var EM = Buffer.alloc(maskedDB.length + H.length + 1);
111111
maskedDB.copy(EM, 0);
112112
H.copy(EM, maskedDB.length);
113113
EM[EM.length - 1] = 0xbc;
@@ -135,7 +135,7 @@ module.exports.makeScheme = function (key, options) {
135135
return false;
136136
}
137137

138-
var DB = new Buffer(emLen - hLen - 1);
138+
var DB = Buffer.alloc(emLen - hLen - 1);
139139
EM.copy(DB, 0, 0, emLen - hLen - 1);
140140

141141
var mask = 0;
@@ -167,7 +167,7 @@ module.exports.makeScheme = function (key, options) {
167167

168168
var salt = DB.slice(DB.length - sLen);
169169

170-
var Mapostrophe = new Buffer(8 + hLen + sLen);
170+
var Mapostrophe = Buffer.alloc(8 + hLen + sLen);
171171
Mapostrophe.fill(0, 0, 8);
172172
mHash.copy(Mapostrophe, 8);
173173
salt.copy(Mapostrophe, 8 + mHash.length);

0 commit comments

Comments
 (0)