Fix OpenSSL FIPS tests on SLE16

os-autoinst · Feb 4, 2025 · c8ce639 · c8ce639
1 parent 7520675
commit c8ce639
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/lib/security/openssl_misc_utils.pm b/lib/security/openssl_misc_utils.pm
@@ -49,7 +49,7 @@ sub has_default_openssl3 {
 
 sub install_openssl {
     zypper_call 'in openssl' unless is_transactional;
-    if (is_sle('>=15-SP6') || is_sle('<16')) {
+    if (is_sle('>=15-SP6') && is_sle('<16')) {
         if (has_no_legacy_module()) {
             install_11_workaround_when_no_legacy();
         } else {

diff --git a/tests/fips/openssl/openssl_fips_alglist.pm b/tests/fips/openssl/openssl_fips_alglist.pm
@@ -82,7 +82,7 @@ sub run {
     my $ver = get_openssl_full_version;
     record_info("Testing OpenSSL $ver");
     run_alglist_fips_tests;
-    if (is_sle '>=15-SP6') {
+    if (is_sle('>=15-SP6') && is_sle('<16')) {
         $ver = get_openssl_full_version(OPENSSL1_BINARY);
         record_info("Testing OpenSSL $ver");
         run_alglist_fips_tests(OPENSSL1_BINARY);

diff --git a/tests/fips/openssl/openssl_fips_cipher.pm b/tests/fips/openssl/openssl_fips_cipher.pm
@@ -63,7 +63,7 @@ sub run {
     my $ver = get_openssl_full_version;
     record_info("Testing OpenSSL $ver");
     run_fips_cipher_tests;
-    if (is_sle '>=15-SP6') {
+    if (is_sle('>=15-SP6') && is_sle('<16')) {
         $ver = get_openssl_full_version(OPENSSL1_BINARY);
         record_info("Testing OpenSSL $ver");
         run_fips_cipher_tests(OPENSSL1_BINARY);

diff --git a/tests/fips/openssl/openssl_fips_dhparam.pm b/tests/fips/openssl/openssl_fips_dhparam.pm
@@ -53,7 +53,7 @@ sub run {
     my $ver = get_openssl_full_version;
     record_info("Testing OpenSSL $ver");
     run_fips_dhparam_tests;
-    if (is_sle '>=15-SP6') {
+    if (is_sle('>=15-SP6') && is_sle('<16')) {
         $ver = get_openssl_full_version(OPENSSL1_BINARY);
         record_info("Testing OpenSSL $ver");
         run_fips_dhparam_tests(OPENSSL1_BINARY);

diff --git a/tests/fips/openssl/openssl_fips_hash.pm b/tests/fips/openssl/openssl_fips_hash.pm
@@ -62,7 +62,7 @@ sub run {
     my $ver = get_openssl_full_version;
     record_info("Testing OpenSSL $ver");
     run_fips_hash_tests;
-    if (is_sle '>=15-SP6') {
+    if (is_sle('>=15-SP6') && is_sle('<16')) {
         $ver = get_openssl_full_version(OPENSSL1_BINARY);
         record_info("Testing OpenSSL $ver");
         run_fips_hash_tests(OPENSSL1_BINARY);

diff --git a/tests/fips/openssl/openssl_pubkey_dsa.pm b/tests/fips/openssl/openssl_pubkey_dsa.pm
@@ -98,7 +98,7 @@ sub run {
     my $ver = get_openssl_full_version;
     record_info("Testing OpenSSL $ver");
     run_fips_dsa_tests;
-    if (is_sle '>=15-SP6') {
+    if (is_sle('>=15-SP6') && is_sle('<16')) {
         $ver = get_openssl_full_version(OPENSSL1_BINARY);
         record_info("Testing OpenSSL $ver");
         run_fips_dsa_tests(OPENSSL1_BINARY);

diff --git a/tests/fips/openssl/openssl_pubkey_rsa.pm b/tests/fips/openssl/openssl_pubkey_rsa.pm
@@ -81,7 +81,7 @@ sub run {
     my $ver = get_openssl_full_version;
     record_info("Testing OpenSSL $ver");
     run_fips_rsa_tests;
-    if (is_sle '>=15-SP6') {
+    if (is_sle('>=15-SP6') && is_sle('<16')) {
         $ver = get_openssl_full_version(OPENSSL1_BINARY);
         record_info("Testing OpenSSL $ver");
         run_fips_rsa_tests(OPENSSL1_BINARY);

diff --git a/tests/fips/openssl/openssl_tlsv1_3.pm b/tests/fips/openssl/openssl_tlsv1_3.pm
@@ -40,7 +40,7 @@ sub run {
     my $ver = get_openssl_full_version;
     record_info("Testing OpenSSL $ver");
     run_fips_tls1_3_tests;
-    if (is_sle '>=15-SP6') {
+    if (is_sle('>=15-SP6') && is_sle('<16')) {
         $ver = get_openssl_full_version(OPENSSL1_BINARY);
         record_info("Testing OpenSSL $ver");
         run_fips_tls1_3_tests();