|
1 | | -var nodeunit = require('nodeunit'); |
| 1 | +"use strict"; |
2 | 2 |
|
3 | | -var scrypt = require('../scrypt.js'); |
| 3 | +const assert = require("assert"); |
4 | 4 |
|
5 | | -var testVectors = require('./test-vectors.json'); |
| 5 | +const scrypt = require('../scrypt.js'); |
6 | 6 |
|
7 | | -function makeTest(options) { |
8 | | - var password = new Buffer(options.password, 'hex'); |
9 | | - var salt = new Buffer(options.salt, 'hex'); |
10 | | - var N = options.N; |
11 | | - var p = options.p; |
12 | | - var r = options.r; |
13 | | - var dkLen = options.dkLen; |
| 7 | +const testVectors = require('./test-vectors.json'); |
14 | 8 |
|
15 | | - var derivedKeyHex = options.derivedKey; |
| 9 | +for (let i = 0; i < testVectors.length; i++) { |
| 10 | + const test = testVectors[i]; |
16 | 11 |
|
17 | | - return function (test) { |
| 12 | + const password = new Buffer(test.password, 'hex'); |
| 13 | + const salt = new Buffer(test.salt, 'hex'); |
| 14 | + const N = test.N; |
| 15 | + const p = test.p; |
| 16 | + const r = test.r; |
| 17 | + const dkLen = test.dkLen; |
| 18 | + |
| 19 | + const derivedKeyHex = test.derivedKey; |
| 20 | + |
| 21 | + it("Test async " + String(i), function() { |
| 22 | + this.timeout(60000); |
| 23 | + |
| 24 | + return new Promise(function(resolve, reject) { |
18 | 25 | scrypt(password, salt, N, r, p, dkLen, function(error, progress, key) { |
19 | 26 | if (error) { |
20 | 27 | console.log(error); |
| 28 | + assert.ok(false); |
| 29 | + reject(error); |
21 | 30 |
|
22 | 31 | } else if (key) { |
23 | | - key = new Buffer(key); |
24 | | - test.equal(derivedKeyHex, key.toString('hex'), 'failed to generate correct derived key'); |
25 | | - test.done(); |
| 32 | + assert.equal(derivedKeyHex, Buffer.from(key).toString('hex'), 'failed to match derived key'); |
| 33 | + resolve(); |
26 | 34 | } else { |
27 | 35 | } |
28 | 36 | }); |
29 | | - } |
| 37 | + }); |
| 38 | + }); |
30 | 39 | } |
31 | 40 |
|
32 | | -var Tests = {scrypt: {}}; |
33 | | -for (var i = 0; i < testVectors.length; i++) { |
34 | | - var test = testVectors[i]; |
35 | | - Tests.scrypt['test-' + Object.keys(Tests.scrypt).length] = makeTest(test); |
36 | | -} |
37 | | - |
38 | | - |
39 | | -nodeunit.reporters.default.run(Tests); |
|
0 commit comments