Skip to content

Commit 3970504

Browse files
Trottrvagg
Trott
authored and
rvagg
committed
test: remove var redeclarations in test-crypto-*
PR-URL: #4981 Reviewed-By: Brian White <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent a2881e2 commit 3970504

5 files changed

+97
-90
lines changed

‎test/parallel/test-crypto-binary-default.js

+23-23
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ assert.throws(function() {
4646
}, 'not enough data');
4747

4848
// Test HMAC
49-
var h1 = crypto.createHmac('sha1', 'Node')
50-
.update('some data')
51-
.update('to hmac')
52-
.digest('hex');
53-
assert.equal(h1, '19fd6e1ba73d9ed2224dd5094a71babe85d9a892', 'test HMAC');
49+
const hmacHash = crypto.createHmac('sha1', 'Node')
50+
.update('some data')
51+
.update('to hmac')
52+
.digest('hex');
53+
assert.equal(hmacHash, '19fd6e1ba73d9ed2224dd5094a71babe85d9a892', 'test HMAC');
5454

5555
// Test HMAC-SHA-* (rfc 4231 Test Cases)
5656
var rfc4231 = [
@@ -199,7 +199,7 @@ var rfc4231 = [
199199
}
200200
];
201201

202-
for (var i = 0, l = rfc4231.length; i < l; i++) {
202+
for (let i = 0, l = rfc4231.length; i < l; i++) {
203203
for (var hash in rfc4231[i]['hmac']) {
204204
var result = crypto.createHmac(hash, rfc4231[i]['key'])
205205
.update(rfc4231[i]['data'])
@@ -322,7 +322,7 @@ var rfc2202_sha1 = [
322322
}
323323
];
324324

325-
for (var i = 0, l = rfc2202_md5.length; i < l; i++) {
325+
for (let i = 0, l = rfc2202_md5.length; i < l; i++) {
326326
if (!common.hasFipsCrypto) {
327327
assert.equal(rfc2202_md5[i]['hmac'],
328328
crypto.createHmac('md5', rfc2202_md5[i]['key'])
@@ -331,7 +331,7 @@ for (var i = 0, l = rfc2202_md5.length; i < l; i++) {
331331
'Test HMAC-MD5 : Test case ' + (i + 1) + ' rfc 2202');
332332
}
333333
}
334-
for (var i = 0, l = rfc2202_sha1.length; i < l; i++) {
334+
for (let i = 0, l = rfc2202_sha1.length; i < l; i++) {
335335
assert.equal(rfc2202_sha1[i]['hmac'],
336336
crypto.createHmac('sha1', rfc2202_sha1[i]['key'])
337337
.update(rfc2202_sha1[i]['data'])
@@ -394,29 +394,29 @@ assert.throws(function() {
394394
var s1 = crypto.createSign('RSA-SHA1')
395395
.update('Test123')
396396
.sign(keyPem, 'base64');
397-
var verified = crypto.createVerify('RSA-SHA1')
398-
.update('Test')
399-
.update('123')
400-
.verify(certPem, s1, 'base64');
401-
assert.strictEqual(verified, true, 'sign and verify (base 64)');
397+
var s1Verified = crypto.createVerify('RSA-SHA1')
398+
.update('Test')
399+
.update('123')
400+
.verify(certPem, s1, 'base64');
401+
assert.strictEqual(s1Verified, true, 'sign and verify (base 64)');
402402

403403
var s2 = crypto.createSign('RSA-SHA256')
404404
.update('Test123')
405405
.sign(keyPem); // binary
406-
var verified = crypto.createVerify('RSA-SHA256')
407-
.update('Test')
408-
.update('123')
409-
.verify(certPem, s2); // binary
410-
assert.strictEqual(verified, true, 'sign and verify (binary)');
406+
var s2Verified = crypto.createVerify('RSA-SHA256')
407+
.update('Test')
408+
.update('123')
409+
.verify(certPem, s2); // binary
410+
assert.strictEqual(s2Verified, true, 'sign and verify (binary)');
411411

412412
var s3 = crypto.createSign('RSA-SHA1')
413413
.update('Test123')
414414
.sign(keyPem, 'buffer');
415-
var verified = crypto.createVerify('RSA-SHA1')
416-
.update('Test')
417-
.update('123')
418-
.verify(certPem, s3);
419-
assert.strictEqual(verified, true, 'sign and verify (buffer)');
415+
var s3Verified = crypto.createVerify('RSA-SHA1')
416+
.update('Test')
417+
.update('123')
418+
.verify(certPem, s3);
419+
assert.strictEqual(s3Verified, true, 'sign and verify (buffer)');
420420

421421

422422
function testCipher1(key) {

‎test/parallel/test-crypto-hmac.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ var wikipedia = [
5959
},
6060
];
6161

62-
for (var i = 0, l = wikipedia.length; i < l; i++) {
63-
for (var hash in wikipedia[i]['hmac']) {
62+
for (let i = 0, l = wikipedia.length; i < l; i++) {
63+
for (const hash in wikipedia[i]['hmac']) {
6464
// FIPS does not support MD5.
6565
if (common.hasFipsCrypto && hash == 'md5')
6666
continue;
67-
var result = crypto.createHmac(hash, wikipedia[i]['key'])
68-
.update(wikipedia[i]['data'])
69-
.digest('hex');
67+
const result = crypto.createHmac(hash, wikipedia[i]['key'])
68+
.update(wikipedia[i]['data'])
69+
.digest('hex');
7070
assert.equal(wikipedia[i]['hmac'][hash],
7171
result,
7272
'Test HMAC-' + hash + ': Test case ' + (i + 1) + ' wikipedia');
@@ -221,14 +221,14 @@ var rfc4231 = [
221221
}
222222
];
223223

224-
for (var i = 0, l = rfc4231.length; i < l; i++) {
225-
for (var hash in rfc4231[i]['hmac']) {
226-
var str = crypto.createHmac(hash, rfc4231[i].key);
224+
for (let i = 0, l = rfc4231.length; i < l; i++) {
225+
for (const hash in rfc4231[i]['hmac']) {
226+
const str = crypto.createHmac(hash, rfc4231[i].key);
227227
str.end(rfc4231[i].data);
228-
var strRes = str.read().toString('hex');
229-
var result = crypto.createHmac(hash, rfc4231[i]['key'])
230-
.update(rfc4231[i]['data'])
231-
.digest('hex');
228+
let strRes = str.read().toString('hex');
229+
let result = crypto.createHmac(hash, rfc4231[i]['key'])
230+
.update(rfc4231[i]['data'])
231+
.digest('hex');
232232
if (rfc4231[i]['truncate']) {
233233
result = result.substr(0, 32); // first 128 bits == 32 hex chars
234234
strRes = strRes.substr(0, 32);
@@ -350,15 +350,15 @@ var rfc2202_sha1 = [
350350
];
351351

352352
if (!common.hasFipsCrypto) {
353-
for (var i = 0, l = rfc2202_md5.length; i < l; i++) {
353+
for (let i = 0, l = rfc2202_md5.length; i < l; i++) {
354354
assert.equal(rfc2202_md5[i]['hmac'],
355355
crypto.createHmac('md5', rfc2202_md5[i]['key'])
356356
.update(rfc2202_md5[i]['data'])
357357
.digest('hex'),
358358
'Test HMAC-MD5 : Test case ' + (i + 1) + ' rfc 2202');
359359
}
360360
}
361-
for (var i = 0, l = rfc2202_sha1.length; i < l; i++) {
361+
for (let i = 0, l = rfc2202_sha1.length; i < l; i++) {
362362
assert.equal(rfc2202_sha1[i]['hmac'],
363363
crypto.createHmac('sha1', rfc2202_sha1[i]['key'])
364364
.update(rfc2202_sha1[i]['data'])

‎test/parallel/test-crypto-rsa-dsa.js

+10-8
Original file line numberDiff line numberDiff line change
@@ -227,28 +227,30 @@ assert.throws(function() {
227227
//
228228
// Test DSA signing and verification with encrypted key
229229
//
230-
(function() {
231-
var input = 'I AM THE WALRUS';
230+
const input = 'I AM THE WALRUS';
232231

233-
var sign = crypto.createSign('DSS1');
232+
{
233+
const sign = crypto.createSign('DSS1');
234234
sign.update(input);
235235
assert.throws(function() {
236236
sign.sign({ key: dsaKeyPemEncrypted, passphrase: 'wrong' }, 'hex');
237237
});
238+
}
238239

240+
{
239241
// DSA signatures vary across runs so there is no static string to verify
240242
// against
241-
var sign = crypto.createSign('DSS1');
243+
const sign = crypto.createSign('DSS1');
242244
sign.update(input);
243245

244-
var signature;
246+
let signature;
245247
assert.doesNotThrow(function() {
246-
var signOptions = { key: dsaKeyPemEncrypted, passphrase: 'password' };
248+
const signOptions = { key: dsaKeyPemEncrypted, passphrase: 'password' };
247249
signature = sign.sign(signOptions, 'hex');
248250
});
249251

250-
var verify = crypto.createVerify('DSS1');
252+
const verify = crypto.createVerify('DSS1');
251253
verify.update(input);
252254

253255
assert.strictEqual(verify.verify(dsaPubPem, signature, 'hex'), true);
254-
})();
256+
}

‎test/parallel/test-crypto-sign-verify.js

+50-44
Original file line numberDiff line numberDiff line change
@@ -14,53 +14,59 @@ var certPem = fs.readFileSync(common.fixturesDir + '/test_cert.pem', 'ascii');
1414
var keyPem = fs.readFileSync(common.fixturesDir + '/test_key.pem', 'ascii');
1515

1616
// Test signing and verifying
17-
var s1 = crypto.createSign('RSA-SHA1')
18-
.update('Test123')
19-
.sign(keyPem, 'base64');
20-
var s1stream = crypto.createSign('RSA-SHA1');
21-
s1stream.end('Test123');
22-
s1stream = s1stream.sign(keyPem, 'base64');
23-
assert.equal(s1, s1stream, 'Stream produces same output');
17+
{
18+
const s1 = crypto.createSign('RSA-SHA1')
19+
.update('Test123')
20+
.sign(keyPem, 'base64');
21+
let s1stream = crypto.createSign('RSA-SHA1');
22+
s1stream.end('Test123');
23+
s1stream = s1stream.sign(keyPem, 'base64');
24+
assert.equal(s1, s1stream, 'Stream produces same output');
2425

25-
var verified = crypto.createVerify('RSA-SHA1')
26-
.update('Test')
27-
.update('123')
28-
.verify(certPem, s1, 'base64');
29-
assert.strictEqual(verified, true, 'sign and verify (base 64)');
26+
const verified = crypto.createVerify('RSA-SHA1')
27+
.update('Test')
28+
.update('123')
29+
.verify(certPem, s1, 'base64');
30+
assert.strictEqual(verified, true, 'sign and verify (base 64)');
31+
}
3032

31-
var s2 = crypto.createSign('RSA-SHA256')
32-
.update('Test123')
33-
.sign(keyPem, 'binary');
34-
var s2stream = crypto.createSign('RSA-SHA256');
35-
s2stream.end('Test123');
36-
s2stream = s2stream.sign(keyPem, 'binary');
37-
assert.equal(s2, s2stream, 'Stream produces same output');
33+
{
34+
const s2 = crypto.createSign('RSA-SHA256')
35+
.update('Test123')
36+
.sign(keyPem, 'binary');
37+
let s2stream = crypto.createSign('RSA-SHA256');
38+
s2stream.end('Test123');
39+
s2stream = s2stream.sign(keyPem, 'binary');
40+
assert.equal(s2, s2stream, 'Stream produces same output');
3841

39-
var verified = crypto.createVerify('RSA-SHA256')
40-
.update('Test')
41-
.update('123')
42-
.verify(certPem, s2, 'binary');
43-
assert.strictEqual(verified, true, 'sign and verify (binary)');
42+
let verified = crypto.createVerify('RSA-SHA256')
43+
.update('Test')
44+
.update('123')
45+
.verify(certPem, s2, 'binary');
46+
assert.strictEqual(verified, true, 'sign and verify (binary)');
4447

45-
var verStream = crypto.createVerify('RSA-SHA256');
46-
verStream.write('Tes');
47-
verStream.write('t12');
48-
verStream.end('3');
49-
verified = verStream.verify(certPem, s2, 'binary');
50-
assert.strictEqual(verified, true, 'sign and verify (stream)');
48+
const verStream = crypto.createVerify('RSA-SHA256');
49+
verStream.write('Tes');
50+
verStream.write('t12');
51+
verStream.end('3');
52+
verified = verStream.verify(certPem, s2, 'binary');
53+
assert.strictEqual(verified, true, 'sign and verify (stream)');
54+
}
5155

52-
var s3 = crypto.createSign('RSA-SHA1')
53-
.update('Test123')
54-
.sign(keyPem, 'buffer');
55-
var verified = crypto.createVerify('RSA-SHA1')
56-
.update('Test')
57-
.update('123')
58-
.verify(certPem, s3);
59-
assert.strictEqual(verified, true, 'sign and verify (buffer)');
56+
{
57+
const s3 = crypto.createSign('RSA-SHA1')
58+
.update('Test123')
59+
.sign(keyPem, 'buffer');
60+
let verified = crypto.createVerify('RSA-SHA1')
61+
.update('Test')
62+
.update('123')
63+
.verify(certPem, s3);
64+
assert.strictEqual(verified, true, 'sign and verify (buffer)');
6065

61-
var verStream = crypto.createVerify('RSA-SHA1');
62-
verStream.write('Tes');
63-
verStream.write('t12');
64-
verStream.end('3');
65-
verified = verStream.verify(certPem, s3);
66-
assert.strictEqual(verified, true, 'sign and verify (stream)');
66+
const verStream = crypto.createVerify('RSA-SHA1');
67+
verStream.write('Tes');
68+
verStream.write('t12');
69+
verStream.end('3');
70+
verified = verStream.verify(certPem, s3);
71+
assert.strictEqual(verified, true, 'sign and verify (stream)');
72+
}

‎test/parallel/test-crypto.js

-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ assert.equal(-1, crypto.getCiphers().indexOf('AES-128-CBC'));
6767
assertSorted(crypto.getCiphers());
6868

6969
// Assume that we have at least AES256-SHA.
70-
var tls = require('tls');
7170
assert.notEqual(0, tls.getCiphers().length);
7271
assert.notEqual(-1, tls.getCiphers().indexOf('aes256-sha'));
7372
assert.equal(-1, tls.getCiphers().indexOf('AES256-SHA'));

0 commit comments

Comments
 (0)