Skip to content

Commit 425c5ca

Browse files
committed
test: remove openssl -no_rand_screen opts
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: #4270 PR-URL: #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>
1 parent 08af7db commit 425c5ca

12 files changed

+3
-51
lines changed

test/parallel/test-https-foafssl.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ server.listen(0, function() {
7272
'-cert', fixtures.path('foafssl.crt'),
7373
'-key', fixtures.path('foafssl.key')];
7474

75-
// for the performance and stability issue in s_client on Windows
76-
if (common.isWindows)
77-
args.push('-no_rand_screen');
78-
7975
const client = spawn(common.opensslCli, args);
8076

8177
client.stdout.on('data', function(data) {

test/parallel/test-tls-alert.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ const server = tls.Server({
4646
const args = ['s_client', '-quiet', '-tls1_1',
4747
'-connect', `127.0.0.1:${this.address().port}`];
4848

49-
// for the performance and stability issue in s_client on Windows
50-
if (common.isWindows)
51-
args.push('-no_rand_screen');
52-
5349
const client = spawn(common.opensslCli, args);
5450
let out = '';
5551
client.stderr.setEncoding('utf8');

test/parallel/test-tls-dhe.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ function test(keylen, expectedCipher, cb) {
7272
const args = ['s_client', '-connect', `127.0.0.1:${this.address().port}`,
7373
'-cipher', ciphers];
7474

75-
// for the performance and stability issue in s_client on Windows
76-
if (common.isWindows)
77-
args.push('-no_rand_screen');
78-
7975
const client = spawn(common.opensslCli, args);
8076
let out = '';
8177
client.stdout.setEncoding('utf8');

test/parallel/test-tls-ecdh-auto.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ server.listen(0, function() {
3939
'-cipher', `${options.ciphers}`,
4040
'-connect', `127.0.0.1:${this.address().port}`];
4141

42-
// for the performance and stability issue in s_client on Windows
43-
if (common.isWindows)
44-
args.push('-no_rand_screen');
45-
4642
const client = spawn(common.opensslCli, args);
4743

4844
client.stdout.on('data', function(data) {

test/parallel/test-tls-ecdh-disable.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,9 @@ common.expectWarning('DeprecationWarning',
5454
const server = tls.createServer(options, common.mustNotCall());
5555

5656
server.listen(0, '127.0.0.1', common.mustCall(function() {
57-
let cmd = `"${common.opensslCli}" s_client -cipher ${
57+
const cmd = `"${common.opensslCli}" s_client -cipher ${
5858
options.ciphers} -connect 127.0.0.1:${this.address().port}`;
5959

60-
// for the performance and stability issue in s_client on Windows
61-
if (common.isWindows)
62-
cmd += ' -no_rand_screen';
63-
6460
exec(cmd, common.mustCall(function(err, stdout, stderr) {
6561
// Old versions of openssl will still exit with 0 so we
6662
// can't just check if err is not null.

test/parallel/test-tls-ecdh-multiple.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ server.listen(0, function() {
3939
'-cipher', `${options.ciphers}`,
4040
'-connect', `127.0.0.1:${this.address().port}`];
4141

42-
// for the performance and stability issue in s_client on Windows
43-
if (common.isWindows)
44-
args.push('-no_rand_screen');
45-
4642
const client = spawn(common.opensslCli, args);
4743

4844
client.stdout.on('data', function(data) {

test/parallel/test-tls-ecdh.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,9 @@ const server = tls.createServer(options, common.mustCall(function(conn) {
4848
}));
4949

5050
server.listen(0, '127.0.0.1', common.mustCall(function() {
51-
let cmd = `"${common.opensslCli}" s_client -cipher ${
51+
const cmd = `"${common.opensslCli}" s_client -cipher ${
5252
options.ciphers} -connect 127.0.0.1:${this.address().port}`;
5353

54-
// for the performance and stability issue in s_client on Windows
55-
if (common.isWindows)
56-
cmd += ' -no_rand_screen';
57-
5854
exec(cmd, common.mustCall(function(err, stdout, stderr) {
5955
assert.ifError(err);
6056
assert(stdout.includes(reply));

test/parallel/test-tls-no-sslv3.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ server.listen(0, '127.0.0.1', function() {
2323
'-ssl3',
2424
'-connect', address];
2525

26-
// for the performance and stability issue in s_client on Windows
27-
if (common.isWindows)
28-
args.push('-no_rand_screen');
29-
3026
const client = spawn(common.opensslCli, args, { stdio: 'pipe' });
3127
client.stdout.pipe(process.stdout);
3228
client.stderr.pipe(process.stderr);

test/parallel/test-tls-securepair-server.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,6 @@ server.listen(0, common.mustCall(function() {
113113

114114
const args = ['s_client', '-connect', `127.0.0.1:${this.address().port}`];
115115

116-
// for the performance and stability issue in s_client on Windows
117-
if (common.isWindows)
118-
args.push('-no_rand_screen');
119-
120116
const client = spawn(common.opensslCli, args);
121117

122118

test/parallel/test-tls-server-verify.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,6 @@ function runClient(prefix, port, options, cb) {
149149

150150
const args = ['s_client', '-connect', `127.0.0.1:${port}`];
151151

152-
// for the performance issue in s_client on Windows
153-
if (common.isWindows)
154-
args.push('-no_rand_screen');
155-
156152
console.log(`${prefix} connecting with`, options.name);
157153

158154
switch (options.name) {

0 commit comments

Comments
 (0)