mirrors/nodejs
mirrors/nodejs
0
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2024-11-29 07:00:59 +01:00
Code Issues Releases Activity

test: remove openssl -no_rand_screen opts

Browse Source 
This option was made from the floating patch of d269e07.
It is no longer needed because the issue was resolved in
OpenSSL-1.1.0.

Fixes: https://github.com/nodejs/node/issues/4270
PR-URL: https://github.com/nodejs/node/pull/19794
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
This commit is contained in:
Shigeki Ohtsu 2018-02-26 01:20:17 +09:00
parent 08af7dba2a
commit 425c5ca27d
12 changed files with 3 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/parallel/test-https-foafssl.js
View File

@ -72,10 +72,6 @@ server.listen(0, function() {
'-cert', fixtures.path('foafssl.crt'),
'-key', fixtures.path('foafssl.key')];
// for the performance and stability issue in s_client on Windows
if (common.isWindows)
args.push('-no_rand_screen');
const client = spawn(common.opensslCli, args);
client.stdout.on('data', function(data) {

4
test/parallel/test-tls-alert.js
View File

@ -46,10 +46,6 @@ const server = tls.Server({
const args = ['s_client', '-quiet', '-tls1_1',
'-connect', `127.0.0.1:${this.address().port}`];
// for the performance and stability issue in s_client on Windows
if (common.isWindows)
args.push('-no_rand_screen');
const client = spawn(common.opensslCli, args);
let out = '';
client.stderr.setEncoding('utf8');

4
test/parallel/test-tls-dhe.js
View File

@ -72,10 +72,6 @@ function test(keylen, expectedCipher, cb) {
const args = ['s_client', '-connect', `127.0.0.1:${this.address().port}`,
'-cipher', ciphers];
// for the performance and stability issue in s_client on Windows
if (common.isWindows)
args.push('-no_rand_screen');
const client = spawn(common.opensslCli, args);
let out = '';
client.stdout.setEncoding('utf8');

4
test/parallel/test-tls-ecdh-auto.js
View File

@ -39,10 +39,6 @@ server.listen(0, function() {
'-cipher', `${options.ciphers}`,
'-connect', `127.0.0.1:${this.address().port}`];
// for the performance and stability issue in s_client on Windows
if (common.isWindows)
args.push('-no_rand_screen');
const client = spawn(common.opensslCli, args);
client.stdout.on('data', function(data) {

6
test/parallel/test-tls-ecdh-disable.js
View File

@ -54,13 +54,9 @@ common.expectWarning('DeprecationWarning',
const server = tls.createServer(options, common.mustNotCall());
server.listen(0, '127.0.0.1', common.mustCall(function() {
let cmd = `"${common.opensslCli}" s_client -cipher ${
const cmd = `"${common.opensslCli}" s_client -cipher ${
options.ciphers} -connect 127.0.0.1:${this.address().port}`;
// for the performance and stability issue in s_client on Windows
if (common.isWindows)
cmd += ' -no_rand_screen';
exec(cmd, common.mustCall(function(err, stdout, stderr) {
// Old versions of openssl will still exit with 0 so we
// can't just check if err is not null.

4
test/parallel/test-tls-ecdh-multiple.js
View File

@ -39,10 +39,6 @@ server.listen(0, function() {
'-cipher', `${options.ciphers}`,
'-connect', `127.0.0.1:${this.address().port}`];
// for the performance and stability issue in s_client on Windows
if (common.isWindows)
args.push('-no_rand_screen');
const client = spawn(common.opensslCli, args);
client.stdout.on('data', function(data) {

6
test/parallel/test-tls-ecdh.js
View File

@ -48,13 +48,9 @@ const server = tls.createServer(options, common.mustCall(function(conn) {
}));
server.listen(0, '127.0.0.1', common.mustCall(function() {
let cmd = `"${common.opensslCli}" s_client -cipher ${
const cmd = `"${common.opensslCli}" s_client -cipher ${
options.ciphers} -connect 127.0.0.1:${this.address().port}`;
// for the performance and stability issue in s_client on Windows
if (common.isWindows)
cmd += ' -no_rand_screen';
exec(cmd, common.mustCall(function(err, stdout, stderr) {
assert.ifError(err);
assert(stdout.includes(reply));

4
test/parallel/test-tls-no-sslv3.js
View File

@ -23,10 +23,6 @@ server.listen(0, '127.0.0.1', function() {
'-ssl3',
'-connect', address];
// for the performance and stability issue in s_client on Windows
if (common.isWindows)
args.push('-no_rand_screen');
const client = spawn(common.opensslCli, args, { stdio: 'pipe' });
client.stdout.pipe(process.stdout);
client.stderr.pipe(process.stderr);

4
test/parallel/test-tls-securepair-server.js
View File

@ -113,10 +113,6 @@ server.listen(0, common.mustCall(function() {
const args = ['s_client', '-connect', `127.0.0.1:${this.address().port}`];
// for the performance and stability issue in s_client on Windows
if (common.isWindows)
args.push('-no_rand_screen');
const client = spawn(common.opensslCli, args);

4
test/parallel/test-tls-server-verify.js
View File

@ -149,10 +149,6 @@ function runClient(prefix, port, options, cb) {
const args = ['s_client', '-connect', `127.0.0.1:${port}`];
// for the performance issue in s_client on Windows
if (common.isWindows)
args.push('-no_rand_screen');
console.log(`${prefix} connecting with`, options.name);
switch (options.name) {

4
test/parallel/test-tls-session-cache.js
View File

@ -105,10 +105,6 @@ function doTest(testOptions, callback) {
'-reconnect'
].concat(testOptions.tickets ? [] : '-no_ticket');
// for the performance and stability issue in s_client on Windows
if (common.isWindows)
args.push('-no_rand_screen');
function spawnClient() {
const client = spawn(common.opensslCli, args, {
stdio: [ 0, 1, 'pipe' ]

6
test/parallel/test-tls-set-ciphers.js
View File

@ -51,13 +51,9 @@ const server = tls.createServer(options, common.mustCall(function(conn) {
}));
server.listen(0, '127.0.0.1', function() {
let cmd = `"${common.opensslCli}" s_client -cipher ${
const cmd = `"${common.opensslCli}" s_client -cipher ${
options.ciphers} -connect 127.0.0.1:${this.address().port}`;
// for the performance and stability issue in s_client on Windows
if (common.isWindows)
cmd += ' -no_rand_screen';
exec(cmd, function(err, stdout, stderr) {
assert.ifError(err);
response = stdout;