test: refactor and fix test-crypto

* var -> const.
* Group and sort imports.
* Replace use of the deprecated crypto.createCredentials.
* Fix incorrect use of string instead of RegExp in `throws` assertions.
* Clone array with `.slice()` and remove dependency on util.
* assert.notEqual -> assert.notStrictEqual.
* indexOf -> includes.
PR-URL: #9807
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

Author: targos

test/parallel/test-crypto.js

@@ -1,34 +1,33 @@
 'use strict';
-varcommon=require('../common');
-varassert=require('assert');
-varutil=require('util');
+constcommon=require('../common');
 
 if(!common.hasCrypto){
 common.skip('missing crypto');
 return;
 }
-varcrypto=require('crypto');
 
-crypto.DEFAULT_ENCODING='buffer';
+constassert=require('assert');
+constcrypto=require('crypto');
+constfs=require('fs');
+consttls=require('tls');
 
-varfs=require('fs');
+crypto.DEFAULT_ENCODING='buffer';
 
 // Test Certificates
-varcaPem=fs.readFileSync(common.fixturesDir+'/test_ca.pem','ascii');
-varcertPem=fs.readFileSync(common.fixturesDir+'/test_cert.pem','ascii');
-varcertPfx=fs.readFileSync(common.fixturesDir+'/test_cert.pfx');
-varkeyPem=fs.readFileSync(common.fixturesDir+'/test_key.pem','ascii');
-vartls=require('tls');
+constcaPem=fs.readFileSync(common.fixturesDir+'/test_ca.pem','ascii');
+constcertPem=fs.readFileSync(common.fixturesDir+'/test_cert.pem','ascii');
+constcertPfx=fs.readFileSync(common.fixturesDir+'/test_cert.pfx');
+constkeyPem=fs.readFileSync(common.fixturesDir+'/test_key.pem','ascii');
 
 // 'this' safety
 // https://github.com/joyent/node/issues/6690
 assert.throws(function(){
-varoptions={key: keyPem,cert: certPem,ca: caPem};
-varcredentials=crypto.createCredentials(options);
-varcontext=credentials.context;
-varnotcontext={setOptions: context.setOptions,setKey: context.setKey};
-crypto.createCredentials({secureOptions: 1},notcontext);
-},TypeError);
+constoptions={key: keyPem,cert: certPem,ca: caPem};
+constcredentials=tls.createSecureContext(options);
+constcontext=credentials.context;
+constnotcontext={setOptions: context.setOptions,setKey: context.setKey};
+tls.createSecureContext({secureOptions: 1},notcontext);
+},/^TypeError:Illegalinvocation$/);
 
 // PFX tests
 assert.doesNotThrow(function(){
@@ -37,55 +36,55 @@ assert.doesNotThrow(function() {
 
 assert.throws(function(){
 tls.createSecureContext({pfx: certPfx});
-},'mac verify failure');
+},/^Error:macverifyfailure$/);
 
 assert.throws(function(){
 tls.createSecureContext({pfx: certPfx,passphrase: 'test'});
-},'mac verify failure');
+},/^Error:macverifyfailure$/);
 
 assert.throws(function(){
 tls.createSecureContext({pfx: 'sample',passphrase: 'test'});
-},'not enough data');
+},/^Error:notenoughdata$/);
 
 
 // update() should only take buffers / strings
 assert.throws(function(){
 crypto.createHash('sha1').update({foo: 'bar'});
-},/buffer/);
+},/^TypeError:Datamustbeastringorabuffer$/);
 
 
 functionassertSorted(list){
 // Array#sort() modifies the list in place so make a copy.
-varsorted=util._extend([],list).sort();
+constsorted=list.slice().sort();
 assert.deepStrictEqual(list,sorted);
 }
 
 // Assume that we have at least AES-128-CBC.
-assert.notEqual(0,crypto.getCiphers().length);
-assert.notEqual(-1,crypto.getCiphers().indexOf('aes-128-cbc'));
-assert.equal(-1,crypto.getCiphers().indexOf('AES-128-CBC'));
+assert.notStrictEqual(0,crypto.getCiphers().length);
+assert(crypto.getCiphers().includes('aes-128-cbc'));
+assert(!crypto.getCiphers().includes('AES-128-CBC'));
 assertSorted(crypto.getCiphers());
 
 // Assume that we have at least AES256-SHA.
-assert.notEqual(0,tls.getCiphers().length);
-assert.notEqual(-1,tls.getCiphers().indexOf('aes256-sha'));
-assert.equal(-1,tls.getCiphers().indexOf('AES256-SHA'));
+assert.notStrictEqual(0,tls.getCiphers().length);
+assert(tls.getCiphers().includes('aes256-sha'));
+assert(!tls.getCiphers().includes('AES256-SHA'));
 assertSorted(tls.getCiphers());
 
 // Assert that we have sha and sha1 but not SHA and SHA1.
-assert.notEqual(0,crypto.getHashes().length);
-assert.notEqual(-1,crypto.getHashes().indexOf('sha1'));
-assert.notEqual(-1,crypto.getHashes().indexOf('sha'));
-assert.equal(-1,crypto.getHashes().indexOf('SHA1'));
-assert.equal(-1,crypto.getHashes().indexOf('SHA'));
-assert.notEqual(-1,crypto.getHashes().indexOf('RSA-SHA1'));
-assert.equal(-1,crypto.getHashes().indexOf('rsa-sha1'));
+assert.notStrictEqual(0,crypto.getHashes().length);
+assert(crypto.getHashes().includes('sha1'));
+assert(crypto.getHashes().includes('sha'));
+assert(!crypto.getHashes().includes('SHA1'));
+assert(!crypto.getHashes().includes('SHA'));
+assert(crypto.getHashes().includes('RSA-SHA1'));
+assert(!crypto.getHashes().includes('rsa-sha1'));
 assertSorted(crypto.getHashes());
 
 // Assume that we have at least secp384r1.
-assert.notEqual(0,crypto.getCurves().length);
-assert.notEqual(-1,crypto.getCurves().indexOf('secp384r1'));
-assert.equal(-1,crypto.getCurves().indexOf('SECP384R1'));
+assert.notStrictEqual(0,crypto.getCurves().length);
+assert(crypto.getCurves().includes('secp384r1'));
+assert(!crypto.getCurves().includes('SECP384R1'));
 assertSorted(crypto.getCurves());
 
 // Regression tests for #5725: hex input that's not a power of two should
@@ -100,18 +99,18 @@ assert.throws(function() {
 
 assert.throws(function(){
 crypto.createHash('sha1').update('0','hex');
-},/Badinputstring/);
+},/^TypeError:Badinputstring$/);
 
 assert.throws(function(){
 crypto.createSign('RSA-SHA1').update('0','hex');
-},/Badinputstring/);
+},/^TypeError:Badinputstring$/);
 
 assert.throws(function(){
 crypto.createVerify('RSA-SHA1').update('0','hex');
-},/Badinputstring/);
+},/^TypeError:Badinputstring$/);
 
 assert.throws(function(){
-varpriv=[
+constpriv=[
 '-----BEGIN RSA PRIVATE KEY-----',
 'MIGrAgEAAiEA+3z+1QNF2/unumadiwEr+C5vfhezsb3hp4jAnCNRpPcCAwEAAQIgQNriSQK4',
 'EFwczDhMZp2dvbcz7OUUyt36z3S4usFPHSECEQD/41K7SujrstBfoCPzwC1xAhEA+5kt4BJy',
@@ -121,7 +120,7 @@ assert.throws(function() {
 ''
 ].join('\n');
 crypto.createSign('RSA-SHA256').update('test').sign(priv);
-},/digesttoobigforrsakey/);
+},/digesttoobigforrsakey$/);
 
 assert.throws(function(){
 // The correct header inside `test_bad_rsa_privkey.pem` should have been
@@ -133,7 +132,7 @@ assert.throws(function() {
 // $ openssl pkcs8 -topk8 -inform PEM -outform PEM -in mykey.pem \
 // -out private_key.pem -nocrypt;
 // Then open private_key.pem and change its header and footer.
-varsha1_privateKey=fs.readFileSync(common.fixturesDir+
+constsha1_privateKey=fs.readFileSync(common.fixturesDir+
 '/test_bad_rsa_privkey.pem','ascii');
 // this would inject errors onto OpenSSL's error stack
 crypto.createSign('sha1').sign(sha1_privateKey);