1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: simplify loadDHParam in TLS test

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/18103
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
Tobias Nießen 2018-01-11 17:32:05 +01:00
parent 4e2e7d11e1
commit eb68a06a3e
No known key found for this signature in database
GPG Key ID: 718207F8FD156B70
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/parallel/test-tls-client-getephemeralkeyinfo.js
View File

@ -6,7 +6,6 @@ const fixtures = require('../common/fixtures');
const assert = require('assert'); const assert = require('assert');
const tls = require('tls'); const tls = require('tls');
const fs = require('fs');
const key = fixtures.readKey('agent2-key.pem'); const key = fixtures.readKey('agent2-key.pem');
const cert = fixtures.readKey('agent2-cert.pem'); const cert = fixtures.readKey('agent2-cert.pem');
@ -15,9 +14,7 @@ let ntests = 0;
let nsuccess = 0; let nsuccess = 0;
function loadDHParam(n) { function loadDHParam(n) {
let path = fixtures.fixturesDir; return fixtures.readKey(`dh${n}.pem`);
if (n !== 'error') path += '/keys';
return fs.readFileSync(`${path}/dh${n}.pem`);
} }
const cipherlist = { const cipherlist = {

5
test/parallel/test-tls-client-mindhsize.js
View File

@ -14,10 +14,7 @@ let nsuccess = 0;
let nerror = 0; let nerror = 0;
function loadDHParam(n) { function loadDHParam(n) {
const params = [`dh${n}.pem`]; return fixtures.readKey(`dh${n}.pem`);
if (n !== 'error')
params.unshift('keys');
return fixtures.readSync(params);
} }
function test(size, err, next) { function test(size, err, next) {