[lint] fix a few more rules

Author: ljharb

.eslintrc

@@ -17,13 +17,10 @@
 	},
 
 	"rules": {
-		"consistent-return": "warn",
 		"func-style": "warn",
-		"id-denylist": "warn",
 		"max-params": "warn",
 		"multiline-comment-style": "off",
 		"no-param-reassign": "warn",
-		"no-use-before-define": "warn",
 		"sort-keys": "warn",
 	},
 
@@ -39,7 +36,6 @@
 				"func-style": "warn",
 				"max-params": "warn",
 				"no-param-reassign": "warn",
-				"no-use-before-define": "warn",
 				"no-var": "off",
 				"prefer-arrow-callback": "off",
 				"prefer-template": "off",

bench/index.js

@@ -4,10 +4,6 @@ var Benchmark = require('benchmark');
 var current = require('../lib/sync');
 var old = require('./old');
 
-run('hello', 'world', 100, 32, 'md5');
-run('hello', 'world', 100, 32, 'sha256');
-run('hello', 'world', 10000, 70, 'md5');
-run('hello', 'world', 10000, 70, 'sha256');
 function run(password, salt, iterations, keylen, digest) {
 	var suite = new Benchmark.Suite();
 	console.log(`password: ${password}`);
@@ -36,3 +32,8 @@ function run(password, salt, iterations, keylen, digest) {
 		})
 		.run();
 }
+
+run('hello', 'world', 100, 32, 'md5');
+run('hello', 'world', 100, 32, 'sha256');
+run('hello', 'world', 10000, 70, 'md5');
+run('hello', 'world', 10000, 70, 'sha256');

bench/old.js

@@ -4,8 +4,8 @@ var createHmac = require('create-hmac');
 var checkParameters = require('../lib/precondition');
 var defaultEncoding = require('../lib/default-encoding');
 var Buffer = require('safe-buffer').Buffer;
-module.exports = pbkdf2;
-function pbkdf2(password, salt, iterations, keylen, digest) {
+
+module.exports = function pbkdf2(password, salt, iterations, keylen, digest) {
 	if (!Buffer.isBuffer(password)) {
 		password = Buffer.from(password, defaultEncoding);
 	}
@@ -52,4 +52,4 @@ function pbkdf2(password, salt, iterations, keylen, digest) {
 	}
 
 	return DK;
-}
+};

index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var native = require('crypto');
+var nativeImpl = require('crypto');
 
 var checkParameters = require('./lib/precondition');
 var defaultEncoding = require('./lib/default-encoding');
@@ -19,19 +19,19 @@ function nativePBKDF2(password, salt, iterations, keylen, digest, callback) {
 		throw new Error('No callback provided to pbkdf2');
 	}
 
-	return native.pbkdf2(password, salt, iterations, keylen, digest, callback);
+	return nativeImpl.pbkdf2(password, salt, iterations, keylen, digest, callback);
 }
 
 function nativePBKDF2Sync(password, salt, iterations, keylen, digest) {
 	checkParameters(iterations, keylen);
 	password = toBuffer(password, defaultEncoding, 'Password');
 	salt = toBuffer(salt, defaultEncoding, 'Salt');
 	digest = digest || 'sha1';
-	return native.pbkdf2Sync(password, salt, iterations, keylen, digest);
+	return nativeImpl.pbkdf2Sync(password, salt, iterations, keylen, digest);
 }
 
 /* istanbul ignore next */
-if (!native.pbkdf2Sync || native.pbkdf2Sync.toString().indexOf('keylen, digest') === -1) {
+if (!nativeImpl.pbkdf2Sync || nativeImpl.pbkdf2Sync.toString().indexOf('keylen, digest') === -1) {
 	/* eslint global-require: 0 */
 	exports.pbkdf2Sync = require('./lib/sync');
 	exports.pbkdf2 = require('./lib/async');

lib/async.js

@@ -21,25 +21,6 @@ var toBrowser = {
 	sha512: 'SHA-512'
 };
 var checks = [];
-function checkNative(algo) {
-	if (global.process && !global.process.browser) {
-		return Promise.resolve(false);
-	}
-	if (!subtle || !subtle.importKey || !subtle.deriveBits) {
-		return Promise.resolve(false);
-	}
-	if (checks[algo] !== undefined) {
-		return checks[algo];
-	}
-	ZERO_BUF = ZERO_BUF || Buffer.alloc(8);
-	var prom = browserPbkdf2(ZERO_BUF, ZERO_BUF, 10, 128, algo)
-		.then(
-			function () { return true; },
-			function () { return false; }
-		);
-	checks[algo] = prom;
-	return prom;
-}
 var nextTick;
 function getNextTick() {
 	if (nextTick) {
@@ -70,6 +51,25 @@ function browserPbkdf2(password, salt, iterations, length, algo) {
 		return Buffer.from(res);
 	});
 }
+function checkNative(algo) {
+	if (global.process && !global.process.browser) {
+		return Promise.resolve(false);
+	}
+	if (!subtle || !subtle.importKey || !subtle.deriveBits) {
+		return Promise.resolve(false);
+	}
+	if (checks[algo] !== undefined) {
+		return checks[algo];
+	}
+	ZERO_BUF = ZERO_BUF || Buffer.alloc(8);
+	var prom = browserPbkdf2(ZERO_BUF, ZERO_BUF, 10, 128, algo)
+		.then(
+			function () { return true; },
+			function () { return false; }
+		);
+	checks[algo] = prom;
+	return prom;
+}
 
 function resolvePromise(promise, callback) {
 	promise.then(function (out) {
@@ -97,7 +97,8 @@ module.exports = function (password, salt, iterations, keylen, digest, callback)
 			try {
 				out = sync(password, salt, iterations, keylen, digest);
 			} catch (e) {
-				return callback(e);
+				callback(e);
+				return;
 			}
 			callback(null, out);
 		});

lib/sync-browser.js

@@ -21,6 +21,23 @@ var sizes = {
 	ripemd160: 20
 };
 
+function getDigest(alg) {
+	function shaFunc(data) {
+		return sha(alg).update(data).digest();
+	}
+	function rmd160Func(data) {
+		return new RIPEMD160().update(data).digest();
+	}
+
+	if (alg === 'rmd160' || alg === 'ripemd160') {
+		return rmd160Func;
+	}
+	if (alg === 'md5') {
+		return md5;
+	}
+	return shaFunc;
+}
+
 function Hmac(alg, key, saltLen) {
 	var hash = getDigest(alg);
 	var blocksize = alg === 'sha512' || alg === 'sha384' ? 128 : 64;
@@ -56,23 +73,6 @@ Hmac.prototype.run = function (data, ipad) {
 	return this.hash(this.opad);
 };
 
-function getDigest(alg) {
-	function shaFunc(data) {
-		return sha(alg).update(data).digest();
-	}
-	function rmd160Func(data) {
-		return new RIPEMD160().update(data).digest();
-	}
-
-	if (alg === 'rmd160' || alg === 'ripemd160') {
-		return rmd160Func;
-	}
-	if (alg === 'md5') {
-		return md5;
-	}
-	return shaFunc;
-}
-
 function pbkdf2(password, salt, iterations, keylen, digest) {
 	checkParameters(iterations, keylen);
 	password = toBuffer(password, defaultEncoding, 'Password');