diff options
author | Alex Aubuchon <alex@aub.dev> | 2019-05-29 11:43:44 -0700 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2019-06-10 09:56:55 -0700 |
commit | 6326ced2de39e7d58237cb27ca884c675621a10d (patch) | |
tree | 4d63e76a6b62aeaa2e34b67de755601a3d175623 /benchmark | |
parent | 17c65d334432b0f663903b14f60f874577c5f440 (diff) | |
download | android-node-v8-6326ced2de39e7d58237cb27ca884c675621a10d.tar.gz android-node-v8-6326ced2de39e7d58237cb27ca884c675621a10d.tar.bz2 android-node-v8-6326ced2de39e7d58237cb27ca884c675621a10d.zip |
test: move test_[key|ca|cert] to fixtures/keys/
Lots of changes, but mostly just search/replace of
fixtures.readSync(...) to fixtures.readKey([new key]...)
Benchmarks modified to use fixtures.readKey(...):
benchmark/tls/throughput.js
benchmark/tls/tls-connect.js
benchmark/tls/secure-pair.js
Also be sure to review the change to L16 of
test/parallel/test-crypto-sign-verify.js
PR-URL: https://github.com/nodejs/node/pull/27962
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'benchmark')
-rw-r--r-- | benchmark/tls/secure-pair.js | 10 | ||||
-rw-r--r-- | benchmark/tls/throughput.js | 10 | ||||
-rw-r--r-- | benchmark/tls/tls-connect.js | 10 |
3 files changed, 12 insertions, 18 deletions
diff --git a/benchmark/tls/secure-pair.js b/benchmark/tls/secure-pair.js index ed678b9060..c0409febac 100644 --- a/benchmark/tls/secure-pair.js +++ b/benchmark/tls/secure-pair.js @@ -6,21 +6,19 @@ const bench = common.createBenchmark(main, { size: [2, 1024, 1024 * 1024] }); -const fs = require('fs'); +const fixtures = require('../../test/common/fixtures'); const tls = require('tls'); const net = require('net'); -const path = require('path'); -const cert_dir = path.resolve(__dirname, '../../test/fixtures'); const REDIRECT_PORT = 28347; function main({ dur, size, securing }) { const chunk = Buffer.alloc(size, 'b'); const options = { - key: fs.readFileSync(`${cert_dir}/test_key.pem`), - cert: fs.readFileSync(`${cert_dir}/test_cert.pem`), - ca: [ fs.readFileSync(`${cert_dir}/test_ca.pem`) ], + key: fixtures.readKey('rsa_private.pem'), + cert: fixtures.readKey('rsa_cert.crt'), + ca: fixtures.readKey('rsa_ca.crt'), ciphers: 'AES256-GCM-SHA384', isServer: true, requestCert: true, diff --git a/benchmark/tls/throughput.js b/benchmark/tls/throughput.js index cd957ff1ed..a8f2d19649 100644 --- a/benchmark/tls/throughput.js +++ b/benchmark/tls/throughput.js @@ -6,9 +6,7 @@ const bench = common.createBenchmark(main, { size: [2, 1024, 1024 * 1024] }); -const path = require('path'); -const fs = require('fs'); -const cert_dir = path.resolve(__dirname, '../../test/fixtures'); +const fixtures = require('../../test/common/fixtures'); var options; const tls = require('tls'); @@ -32,9 +30,9 @@ function main({ dur, type, size }) { } options = { - key: fs.readFileSync(`${cert_dir}/test_key.pem`), - cert: fs.readFileSync(`${cert_dir}/test_cert.pem`), - ca: [ fs.readFileSync(`${cert_dir}/test_ca.pem`) ], + key: fixtures.readKey('rsa_private.pem'), + cert: fixtures.readKey('rsa_cert.crt'), + ca: fixtures.readKey('rsa_ca.crt'), ciphers: 'AES256-GCM-SHA384' }; diff --git a/benchmark/tls/tls-connect.js b/benchmark/tls/tls-connect.js index fa6e2cb80a..4300f6841f 100644 --- a/benchmark/tls/tls-connect.js +++ b/benchmark/tls/tls-connect.js @@ -1,6 +1,5 @@ 'use strict'; -const fs = require('fs'); -const path = require('path'); +const fixtures = require('../../test/common/fixtures'); const tls = require('tls'); const common = require('../common.js'); @@ -18,11 +17,10 @@ var running = true; function main(conf) { dur = conf.dur; concurrency = conf.concurrency; - const cert_dir = path.resolve(__dirname, '../../test/fixtures'); const options = { - key: fs.readFileSync(`${cert_dir}/test_key.pem`), - cert: fs.readFileSync(`${cert_dir}/test_cert.pem`), - ca: [ fs.readFileSync(`${cert_dir}/test_ca.pem`) ], + key: fixtures.readKey('rsa_private.pem'), + cert: fixtures.readKey('rsa_cert.crt'), + ca: fixtures.readKey('rsa_ca.crt'), ciphers: 'AES256-GCM-SHA384' }; |