des.js
des.js copied to clipboard
Please avoid buffer() + patch
Could you please apply this patch
commit 63a6a15a34dd3ba7addb0d97bb4542d847f51763
Author: Bastien Roucariès <[email protected]>
Date: Tue Jan 1 22:21:14 2019 +0100
Fix Buffer() warning
Forwarded:
diff --git a/test/cbc-test.js b/test/cbc-test.js
index d07881c..90b943d 100644
--- a/test/cbc-test.js
+++ b/test/cbc-test.js
@@ -44,16 +44,16 @@ describe('DES-CBC', function() {
vectors.forEach(function(vec, i) {
it('should encrypt vector ' + i, function() {
- var key = new Buffer(vec.key, 'hex');
- var iv = new Buffer(vec.iv, 'hex');
- var input = new Buffer(vec.input, 'hex');
+ var key = new Buffer.from(vec.key, 'hex');
+ var iv = new Buffer.from(vec.iv, 'hex');
+ var input = new Buffer.from(vec.input, 'hex');
var enc = CBC.create({
type: 'encrypt',
key: key,
iv: iv
});
- var out = new Buffer(enc.update(input).concat(enc.final()));
+ var out = new Buffer.from(enc.update(input).concat(enc.final()));
var cipher = crypto.createCipheriv('des-cbc', key, iv);
var expected = Buffer.concat([ cipher.update(input), cipher.final() ]);
@@ -65,7 +65,7 @@ describe('DES-CBC', function() {
key: key,
iv: iv
});
- assert.deepEqual(new Buffer(dec.update(out).concat(dec.final())),
+ assert.deepEqual(new Buffer.from(dec.update(out).concat(dec.final())),
input);
});
});
diff --git a/test/des-test.js b/test/des-test.js
index b6a5ee8..d55c6fd 100644
--- a/test/des-test.js
+++ b/test/des-test.js
@@ -84,8 +84,8 @@ describe('DES', function() {
vectors.forEach(function(vec, i) {
it('should encrypt vector ' + i, function() {
- var key = new Buffer(vec.key, 'hex');
- var input = new Buffer(vec.input, 'hex');
+ var key = new Buffer.from(vec.key, 'hex');
+ var input = new Buffer.from(vec.input, 'hex');
var enc = des.DES.create({
type: 'encrypt',
@@ -95,23 +95,23 @@ describe('DES', function() {
type: 'decrypt',
key: key
});
- var out = new Buffer(enc.update(input).concat(enc.final()));
+ var out = new Buffer.from(enc.update(input).concat(enc.final()));
- var cipher = crypto.createCipheriv('des-ecb', key, new Buffer(0));
+ var cipher = crypto.createCipheriv('des-ecb', key, new Buffer.from([]));
var expected = Buffer.concat([ cipher.update(input), cipher.final() ]);
assert.deepEqual(out, expected);
- assert.deepEqual(new Buffer(dec.update(out).concat(dec.final())),
+ assert.deepEqual(new Buffer.from(dec.update(out).concat(dec.final())),
input);
});
});
it('should buffer during encryption/decryption', function() {
- var key = new Buffer('0102030405060708', 'hex');
- var chunk = new Buffer('01020304050607', 'hex');
+ var key = new Buffer.from('0102030405060708', 'hex');
+ var chunk = new Buffer.from('01020304050607', 'hex');
var count = 257;
- var expected = new Buffer(
+ var expected = new Buffer.from(
new Array(count + 1).join('01020304050607'), 'hex');
var enc = des.DES.create({
@@ -132,7 +132,7 @@ describe('DES', function() {
out = out.concat(dec.update(cipher.slice(i * 7, (i + 1) * 7)));
out = out.concat(dec.final(cipher.slice(i * 7)));
- out = new Buffer(out);
+ out = new Buffer.from(out);
assert.deepEqual(out, expected);
});
});
diff --git a/test/ede-test.js b/test/ede-test.js
index 116a76a..b5a2c72 100644
--- a/test/ede-test.js
+++ b/test/ede-test.js
@@ -44,16 +44,16 @@ describe('DES-EDE-CBC', function() {
vectors.forEach(function(vec, i) {
it('should encrypt vector ' + i, function() {
- var key = new Buffer(vec.key, 'hex');
- var iv = new Buffer(vec.iv, 'hex');
- var input = new Buffer(vec.input, 'hex');
+ var key = new Buffer.from(vec.key, 'hex');
+ var iv = new Buffer.from(vec.iv, 'hex');
+ var input = new Buffer.from(vec.input, 'hex');
var enc = CBC.create({
type: 'encrypt',
key: key,
iv: iv
});
- var out = new Buffer(enc.update(input).concat(enc.final()));
+ var out = new Buffer.from(enc.update(input).concat(enc.final()));
var cipher = crypto.createCipheriv('des-ede3-cbc', key, iv);
var expected = Buffer.concat([ cipher.update(input), cipher.final() ]);
@@ -65,7 +65,7 @@ describe('DES-EDE-CBC', function() {
key: key,
iv: iv
});
- assert.deepEqual(new Buffer(dec.update(out).concat(dec.final())),
+ assert.deepEqual(new Buffer.from(dec.update(out).concat(dec.final())),
input);
});
});
Sure! It would be way easier if you could submit a PR, but if you prefer to do it in this manner - it works too.
Few comments: new Buffer.from() - are you sure that it shouldn't be just Buffer.from()?
@bastien-roucaries can you provide a PR please?
this is fixed now