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 <[email protected]>
Reviewed-By: Rod Vagg <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>

Author: shigeki

test/parallel/test-https-foafssl.js

@@ -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) {

test/parallel/test-tls-alert.js

@@ -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');

test/parallel/test-tls-dhe.js

@@ -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');

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

@@ -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) {

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

@@ -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.

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

@@ -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) {

test/parallel/test-tls-ecdh.js

@@ -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));

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

@@ -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);

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

@@ -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);
 
 

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

@@ -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) {

test/parallel/test-tls-session-cache.js

@@ -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' ]

test/parallel/test-tls-set-ciphers.js

@@ -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;