test: remove hasOpenSSL3x utils

In favor of `hasOpenSSL`. PR-URL: #56164 Refs: https://github.com/nodejs/node/pull/56160/files#r1874118863 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Juan José Arboleda <[email protected]>

Author: aduh95

test/common/index.js

@@ -1051,14 +1051,6 @@ const common ={
 returnhasOpenSSL(3);
 },
 
-gethasOpenSSL31(){
-returnhasOpenSSL(3,1);
-},
-
-gethasOpenSSL32(){
-returnhasOpenSSL(3,2);
-},
-
 getinFreeBSDJail(){
 if(inFreeBSDJail!==null)returninFreeBSDJail;
 

test/parallel/test-https-agent-session-eviction.js

@@ -56,7 +56,7 @@ function faultyServer(port){
 functionsecond(server,session){
 constreq=https.request({
 port: server.address().port,
-ciphers: (common.hasOpenSSL31 ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT'),
+ciphers: (common.hasOpenSSL(3,1) ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT'),
 rejectUnauthorized: false
 },function(res){
 res.resume();

test/parallel/test-tls-alert.js

@@ -42,7 +42,7 @@ const server = tls.Server({
 cert: loadPEM('agent2-cert')
 },null).listen(0,common.mustCall(()=>{
 constargs=['s_client','-quiet','-tls1_1',
-'-cipher',(common.hasOpenSSL31 ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT'),
+'-cipher',(common.hasOpenSSL(3,1) ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT'),
 '-connect',`127.0.0.1:${server.address().port}`];
 
 execFile(common.opensslCli,args,common.mustCall((err,_,stderr)=>{

test/parallel/test-tls-empty-sni-context.js

@@ -26,7 +26,7 @@ const server = tls.createServer(options, (c) =>{
 },common.mustNotCall());
 
 c.on('error',common.mustCall((err)=>{
-constexpectedErr=common.hasOpenSSL32 ?
+constexpectedErr=common.hasOpenSSL(3,2) ?
 'ERR_SSL_SSL/TLS_ALERT_HANDSHAKE_FAILURE' : 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE';
 assert.strictEqual(err.code,expectedErr);
 }));

test/parallel/test-tls-getprotocol.js

@@ -14,11 +14,11 @@ const clientConfigs = [
 {
 secureProtocol: 'TLSv1_method',
 version: 'TLSv1',
-ciphers: (common.hasOpenSSL31 ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT')
+ciphers: (common.hasOpenSSL(3,1) ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT')
 },{
 secureProtocol: 'TLSv1_1_method',
 version: 'TLSv1.1',
-ciphers: (common.hasOpenSSL31 ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT')
+ciphers: (common.hasOpenSSL(3,1) ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT')
 },{
 secureProtocol: 'TLSv1_2_method',
 version: 'TLSv1.2'

test/parallel/test-tls-min-max-version.js

@@ -22,7 +22,7 @@ function test(cmin, cmax, cprot, smin, smax, sprot, proto, cerr, serr){
 if(serr!=='ERR_SSL_UNSUPPORTED_PROTOCOL')
 ciphers='ALL@SECLEVEL=0';
 }
-if(common.hasOpenSSL31&&cerr==='ERR_SSL_TLSV1_ALERT_PROTOCOL_VERSION'){
+if(common.hasOpenSSL(3,1)&&cerr==='ERR_SSL_TLSV1_ALERT_PROTOCOL_VERSION'){
 ciphers='DEFAULT@SECLEVEL=0';
 }
 // Report where test was called from. Strip leading garbage from

test/parallel/test-tls-psk-circuit.js

@@ -62,11 +62,11 @@ test({psk: USERS.UserA, identity: 'UserA'},{minVersion: 'TLSv1.3'});
 test({psk: USERS.UserB,identity: 'UserB'});
 test({psk: USERS.UserB,identity: 'UserB'},{minVersion: 'TLSv1.3'});
 // Unrecognized user should fail handshake
-constexpectedHandshakeErr=common.hasOpenSSL32 ?
+constexpectedHandshakeErr=common.hasOpenSSL(3,2) ?
 'ERR_SSL_SSL/TLS_ALERT_HANDSHAKE_FAILURE' : 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE';
 test({psk: USERS.UserB,identity: 'UserC'},{},expectedHandshakeErr);
 // Recognized user but incorrect secret should fail handshake
-constexpectedIllegalParameterErr=common.hasOpenSSL32 ?
+constexpectedIllegalParameterErr=common.hasOpenSSL(3,2) ?
 'ERR_SSL_SSL/TLS_ALERT_ILLEGAL_PARAMETER' : 'ERR_SSL_SSLV3_ALERT_ILLEGAL_PARAMETER';
 test({psk: USERS.UserA,identity: 'UserB'},{},expectedIllegalParameterErr);
 test({psk: USERS.UserB,identity: 'UserB'});

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

@@ -100,7 +100,7 @@ function doTest(testOptions, callback){
 constargs=[
 's_client',
 '-tls1',
-'-cipher',(common.hasOpenSSL31 ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT'),
+'-cipher',(common.hasOpenSSL(3,1) ? 'DEFAULT:@SECLEVEL=0' : 'DEFAULT'),
 '-connect',`localhost:${this.address().port}`,
 '-servername','ohgod',
 '-key',fixtures.path('keys/rsa_private.pem'),