172 lines
6.8 KiB
Diff
172 lines
6.8 KiB
Diff
From f77af2f052c870403cfedfce66bb8923f66e80ce Mon Sep 17 00:00:00 2001
|
|
From: Alethea Rose <alethea@alethearose.com>
|
|
Date: Wed, 15 Feb 2017 21:34:13 -0500
|
|
Subject: [PATCH 09/11] Remove -no_rand_screen from s_client invocation
|
|
|
|
---
|
|
test/parallel/test-https-foafssl.js | 4 ----
|
|
test/parallel/test-tls-alert.js | 4 ----
|
|
test/parallel/test-tls-dhe.js | 4 ----
|
|
test/parallel/test-tls-ecdh-disable.js | 4 ----
|
|
test/parallel/test-tls-ecdh.js | 4 ----
|
|
test/parallel/test-tls-no-sslv3.js | 4 ----
|
|
test/parallel/test-tls-securepair-server.js | 4 ----
|
|
test/parallel/test-tls-server-verify.js | 4 ----
|
|
test/parallel/test-tls-session-cache.js | 4 ----
|
|
test/parallel/test-tls-set-ciphers.js | 4 ----
|
|
10 files changed, 40 deletions(-)
|
|
|
|
diff --git a/test/parallel/test-https-foafssl.js b/test/parallel/test-https-foafssl.js
|
|
index 5a9b8eb..ba07a3c 100644
|
|
--- a/test/parallel/test-https-foafssl.js
|
|
+++ b/test/parallel/test-https-foafssl.js
|
|
@@ -57,10 +57,6 @@ server.listen(0, function() {
|
|
'-cert', join(common.fixturesDir, 'foafssl.crt'),
|
|
'-key', join(common.fixturesDir, '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) {
|
|
diff --git a/test/parallel/test-tls-alert.js b/test/parallel/test-tls-alert.js
|
|
index a8c6016..22d54cc 100644
|
|
--- a/test/parallel/test-tls-alert.js
|
|
+++ b/test/parallel/test-tls-alert.js
|
|
@@ -34,10 +34,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');
|
|
diff --git a/test/parallel/test-tls-dhe.js b/test/parallel/test-tls-dhe.js
|
|
index 80a2d78..e154285 100644
|
|
--- a/test/parallel/test-tls-dhe.js
|
|
+++ b/test/parallel/test-tls-dhe.js
|
|
@@ -50,10 +50,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');
|
|
diff --git a/test/parallel/test-tls-ecdh-disable.js b/test/parallel/test-tls-ecdh-disable.js
|
|
index eec22c3..d3464f7 100644
|
|
--- a/test/parallel/test-tls-ecdh-disable.js
|
|
+++ b/test/parallel/test-tls-ecdh-disable.js
|
|
@@ -30,10 +30,6 @@ server.listen(0, '127.0.0.1', common.mustCall(function() {
|
|
let 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.
|
|
diff --git a/test/parallel/test-tls-ecdh.js b/test/parallel/test-tls-ecdh.js
|
|
index 56348d5..012c041 100644
|
|
--- a/test/parallel/test-tls-ecdh.js
|
|
+++ b/test/parallel/test-tls-ecdh.js
|
|
@@ -34,10 +34,6 @@ server.listen(0, '127.0.0.1', common.mustCall(function() {
|
|
let 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) {
|
|
if (err) throw err;
|
|
assert(stdout.includes(reply));
|
|
diff --git a/test/parallel/test-tls-no-sslv3.js b/test/parallel/test-tls-no-sslv3.js
|
|
index e7ee788..9865961 100644
|
|
--- a/test/parallel/test-tls-no-sslv3.js
|
|
+++ b/test/parallel/test-tls-no-sslv3.js
|
|
@@ -28,10 +28,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);
|
|
diff --git a/test/parallel/test-tls-securepair-server.js b/test/parallel/test-tls-securepair-server.js
|
|
index 76d2f88..e0a4cb5 100644
|
|
--- a/test/parallel/test-tls-securepair-server.js
|
|
+++ b/test/parallel/test-tls-securepair-server.js
|
|
@@ -99,10 +99,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);
|
|
|
|
|
|
diff --git a/test/parallel/test-tls-server-verify.js b/test/parallel/test-tls-server-verify.js
|
|
index 61330e2..3eef879 100644
|
|
--- a/test/parallel/test-tls-server-verify.js
|
|
+++ b/test/parallel/test-tls-server-verify.js
|
|
@@ -135,10 +135,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) {
|
|
diff --git a/test/parallel/test-tls-session-cache.js b/test/parallel/test-tls-session-cache.js
|
|
index 0b29422..f0cf6be 100644
|
|
--- a/test/parallel/test-tls-session-cache.js
|
|
+++ b/test/parallel/test-tls-session-cache.js
|
|
@@ -82,10 +82,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' ]
|
|
diff --git a/test/parallel/test-tls-set-ciphers.js b/test/parallel/test-tls-set-ciphers.js
|
|
index 83dcc1f..17ad2b7 100644
|
|
--- a/test/parallel/test-tls-set-ciphers.js
|
|
+++ b/test/parallel/test-tls-set-ciphers.js
|
|
@@ -37,10 +37,6 @@ server.listen(0, '127.0.0.1', function() {
|
|
let 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) {
|
|
if (err) throw err;
|
|
response = stdout;
|
|
--
|
|
2.13.0
|
|
|