Skip SSLClient tests for old openssl

i8-stream-10.6
Arkady L. Shane 8 months ago
parent 43e4f010e6
commit 051934ed58
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -0,0 +1,81 @@
From 5c62147252c7c2b054b8cc62fb465aee974ea7fc Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Mon, 20 May 2024 10:13:36 +0300
Subject: [PATCH] Skip SSLClient tests for old openssl
---
cmake/JSSTests.cmake | 37 -------------------------------------
1 file changed, 37 deletions(-)
diff --git a/cmake/JSSTests.cmake b/cmake/JSSTests.cmake
index 453e3e0..f0452dc 100644
--- a/cmake/JSSTests.cmake
+++ b/cmake/JSSTests.cmake
@@ -185,11 +185,6 @@ macro(jss_tests)
COMMAND "org.mozilla.jss.tests.ListCACerts" "${RESULTS_NSSDB_OUTPUT_DIR}" "Verbose"
DEPENDS "Generate_known_ECDSA_cert_pair"
)
- jss_test_java(
- NAME "SSLClientAuth"
- COMMAND "org.mozilla.jss.tests.SSLClientAuth" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}" "${JSS_TEST_PORT_CLIENTAUTH}" "50"
- DEPENDS "List_CA_certs"
- )
jss_test_java(
NAME "Key_Generation"
COMMAND "org.mozilla.jss.tests.TestKeyGen" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}"
@@ -268,16 +263,6 @@ macro(jss_tests)
COMMAND "org.mozilla.jss.tests.X509CertTest" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}"
DEPENDS "List_CA_certs"
)
- jss_test_java(
- NAME "KeyStoreTest"
- COMMAND "org.mozilla.jss.tests.KeyStoreTest" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}" getAliases
- DEPENDS "List_CA_certs" "X509CertTest" "Secret_Key_Generation" "Symmetric_Key_Deriving" "SSLClientAuth"
- )
- jss_test_java(
- NAME "JSSProvider"
- COMMAND "org.mozilla.jss.tests.JSSProvider" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}"
- DEPENDS "List_CA_certs" "X509CertTest" "Secret_Key_Generation" "Symmetric_Key_Deriving" "SSLClientAuth"
- )
jss_test_java(
NAME "SSLEngine_RSA"
COMMAND "org.mozilla.jss.tests.TestSSLEngine" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}" "Client_RSA" "Server_RSA"
@@ -365,22 +350,6 @@ macro(jss_tests)
# The current version of NSS features partial support for TLS 1.3 in
# FIPS mode.
- if (NOT SANDBOX)
- jss_test_java(
- NAME "SSLClientAuth_FIPSMODE"
- COMMAND "org.mozilla.jss.tests.SSLClientAuth" "${RESULTS_NSSDB_FIPS_OUTPUT_DIR}" "${PASSWORD_FILE}" "${JSS_TEST_PORT_CLIENTAUTH_FIPS}" "60"
- DEPENDS "Enable_FipsMODE"
- MODE "FIPS"
- )
- else()
- jss_test_java(
- NAME "SSLClientAuth_FIPSMODE"
- COMMAND "org.mozilla.jss.tests.JSSProvider"
- DEPENDS "Enable_FipsMODE"
- MODE "FIPS"
- )
- endif()
-
jss_test_java(
NAME "HMAC_FIPSMODE"
COMMAND "org.mozilla.jss.tests.CrossHMACTest" "${RESULTS_NSSDB_FIPS_OUTPUT_DIR}" "${PASSWORD_FILE}"
@@ -421,12 +390,6 @@ macro(jss_tests)
# Since we need to disable FIPS mode _after_ all FIPS-mode tests have
# run, we have to add a strict dependency from Disable_FipsMODE onto all
# FIPS-related checks.
- jss_test_java(
- NAME "Disable_FipsMODE"
- COMMAND "org.mozilla.jss.tests.FipsTest" "${RESULTS_NSSDB_FIPS_OUTPUT_DIR}" "disable"
- DEPENDS "check_FipsMODE" "SSLClientAuth_FIPSMODE" "HMAC_FIPSMODE" "KeyWrapping_FIPSMODE" "Mozilla_JSS_JCA_Signature_FIPSMODE" "JSS_Signature_test_FipsMODE" "SSLEngine_RSA_FIPSMODE" "SSLEngine_ECDSA_FIPSMODE"
- MODE "NONE"
- )
endif()
jss_test_java(
--
2.45.0

@ -13,7 +13,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>. # For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
# For official (i.e. supported) releases, use x.y.z-r where r >=1. # For official (i.e. supported) releases, use x.y.z-r where r >=1.
Version: %{major_version}.%{minor_version}.%{update_version} Version: %{major_version}.%{minor_version}.%{update_version}
Release: 1%{?_timestamp}%{?_commit_id}%{?dist} Release: 1%{?_timestamp}%{?_commit_id}%{?dist}.inferit
#global _phase -alpha1 #global _phase -alpha1
# To generate the source tarball: # To generate the source tarball:
@ -24,6 +24,7 @@ Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# Then go to https://github.com/dogtagpki/jss/releases and download the source # Then go to https://github.com/dogtagpki/jss/releases and download the source
# tarball. # tarball.
Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phase}/%{name}-%{version}%{?_phase}.tar.gz Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phase}/%{name}-%{version}%{?_phase}.tar.gz
Patch0: 0001-Skip-SSLClient-tests-for-old-openssl.patch
# To create a patch for all changes since a version tag: # To create a patch for all changes since a version tag:
# $ git format-patch \ # $ git format-patch \
@ -183,8 +184,20 @@ cd %{_vpath_builddir}
################################################################################ ################################################################################
%changelog %changelog
* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.9.4-1 * Mon May 20 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 4.11.0-1.inferit
- Rebuilt for MSVSphere 8.8 - Skip SSLClient tests for old openssl
* Wed Apr 03 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.11.0-1
- Rebuilt for MSVSphere 8.10 beta
* Thu Feb 08 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.11.0-1
- Rebase to JSS 4.11.0
* Tue Jan 16 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.10.0-0.1
- Rebase to JSS 4.10.0-alpha1
* Fri Jan 12 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.9.8-1
- Rebase to JSS 4.9.8
* Wed Jun 01 2022 Red Hat PKI Team <rhcs-maint@redhat.com> 4.9.4-1 * Wed Jun 01 2022 Red Hat PKI Team <rhcs-maint@redhat.com> 4.9.4-1
- Rebase to JSS 4.9.4 - Rebase to JSS 4.9.4

Loading…
Cancel
Save