Update patch

i8-stream-10.6 changed/i8-stream-10.6/jss-4.9.4-1.module+el8.7.0+15532+95bac9ee.inferit
Arkady L. Shane 8 months ago
parent 051934ed58
commit 926d3e77da
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -1,14 +1,14 @@
From 5c62147252c7c2b054b8cc62fb465aee974ea7fc Mon Sep 17 00:00:00 2001 From 52f273439a4012bb1426e59b14195c2d4f2d45e5 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru> From: tigro <tigro@msvsphere-os.ru>
Date: Mon, 20 May 2024 10:13:36 +0300 Date: Mon, 20 May 2024 10:13:36 +0300
Subject: [PATCH] Skip SSLClient tests for old openssl Subject: [PATCH] Skip SSLClient tests for old openssl
--- ---
cmake/JSSTests.cmake | 37 ------------------------------------- cmake/JSSTests.cmake | 69 --------------------------------------------
1 file changed, 37 deletions(-) 1 file changed, 69 deletions(-)
diff --git a/cmake/JSSTests.cmake b/cmake/JSSTests.cmake diff --git a/cmake/JSSTests.cmake b/cmake/JSSTests.cmake
index 453e3e0..f0452dc 100644 index 453e3e0..4f93ce3 100644
--- a/cmake/JSSTests.cmake --- a/cmake/JSSTests.cmake
+++ b/cmake/JSSTests.cmake +++ b/cmake/JSSTests.cmake
@@ -185,11 +185,6 @@ macro(jss_tests) @@ -185,11 +185,6 @@ macro(jss_tests)
@ -23,7 +23,7 @@ index 453e3e0..f0452dc 100644
jss_test_java( jss_test_java(
NAME "Key_Generation" NAME "Key_Generation"
COMMAND "org.mozilla.jss.tests.TestKeyGen" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}" COMMAND "org.mozilla.jss.tests.TestKeyGen" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}"
@@ -268,16 +263,6 @@ macro(jss_tests) @@ -268,26 +263,6 @@ macro(jss_tests)
COMMAND "org.mozilla.jss.tests.X509CertTest" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}" COMMAND "org.mozilla.jss.tests.X509CertTest" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}"
DEPENDS "List_CA_certs" DEPENDS "List_CA_certs"
) )
@ -37,10 +37,42 @@ index 453e3e0..f0452dc 100644
- COMMAND "org.mozilla.jss.tests.JSSProvider" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}" - COMMAND "org.mozilla.jss.tests.JSSProvider" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}"
- DEPENDS "List_CA_certs" "X509CertTest" "Secret_Key_Generation" "Symmetric_Key_Deriving" "SSLClientAuth" - 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"
- DEPENDS "List_CA_certs"
- )
- jss_test_java(
- NAME "SSLEngine_ECDSA"
- COMMAND "org.mozilla.jss.tests.TestSSLEngine" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}" "Client_ECDSA" "Server_ECDSA"
- DEPENDS "SSLEngine_RSA"
- )
if(NOT FIPS_ENABLED)
jss_test_java( jss_test_java(
NAME "SSLEngine_RSA" @@ -321,21 +296,11 @@ macro(jss_tests)
COMMAND "org.mozilla.jss.tests.TestSSLEngine" "${RESULTS_NSSDB_OUTPUT_DIR}" "${PASSWORD_FILE}" "Client_RSA" "Server_RSA" )
@@ -365,22 +350,6 @@ macro(jss_tests)
# SSL Engine related tests
- jss_test_exec(
- NAME "TestBufferPRFDSSL_RSA"
- COMMAND "${BIN_OUTPUT_DIR}/TestBufferPRFDSSL" "${RESULTS_NSSDB_OUTPUT_DIR}" "${DB_PWD}" "Server_RSA"
- DEPENDS "List_CA_certs" "generate_c_TestBufferPRFDSSL"
- )
jss_test_exec(
NAME "TestBufferPRFDSSL_ECDSA"
COMMAND "${BIN_OUTPUT_DIR}/TestBufferPRFDSSL" "${RESULTS_NSSDB_OUTPUT_DIR}" "${DB_PWD}" "Server_ECDSA"
DEPENDS "List_CA_certs" "generate_c_TestBufferPRFDSSL"
)
- jss_test_java(
- NAME "JSS_Test_BufferPRFD"
- COMMAND "org.mozilla.jss.tests.TestBufferPRFD" "${RESULTS_NSSDB_OUTPUT_DIR}" "${DB_PWD}"
- DEPENDS "List_CA_certs"
- )
# FIPS-related tests
jss_test_java(
@@ -365,22 +330,6 @@ macro(jss_tests)
# The current version of NSS features partial support for TLS 1.3 in # The current version of NSS features partial support for TLS 1.3 in
# FIPS mode. # FIPS mode.
@ -63,7 +95,23 @@ index 453e3e0..f0452dc 100644
jss_test_java( jss_test_java(
NAME "HMAC_FIPSMODE" NAME "HMAC_FIPSMODE"
COMMAND "org.mozilla.jss.tests.CrossHMACTest" "${RESULTS_NSSDB_FIPS_OUTPUT_DIR}" "${PASSWORD_FILE}" COMMAND "org.mozilla.jss.tests.CrossHMACTest" "${RESULTS_NSSDB_FIPS_OUTPUT_DIR}" "${PASSWORD_FILE}"
@@ -421,12 +390,6 @@ macro(jss_tests) @@ -405,28 +354,10 @@ macro(jss_tests)
DEPENDS "Enable_FipsMODE"
MODE "FIPS"
)
- jss_test_java(
- NAME "SSLEngine_RSA_FIPSMODE"
- COMMAND "org.mozilla.jss.tests.TestSSLEngine" "${RESULTS_NSSDB_FIPS_OUTPUT_DIR}" "${PASSWORD_FILE}" "Client_RSA" "Server_RSA"
- DEPENDS "Enable_FipsMODE" "SSLEngine_ECDSA"
- MODE "FIPS"
- )
- jss_test_java(
- NAME "SSLEngine_ECDSA_FIPSMODE"
- COMMAND "org.mozilla.jss.tests.TestSSLEngine" "${RESULTS_NSSDB_FIPS_OUTPUT_DIR}" "${PASSWORD_FILE}" "Client_ECDSA" "Server_ECDSA"
- DEPENDS "SSLEngine_RSA_FIPSMODE" "SSLEngine_ECDSA"
- MODE "FIPS"
- )
# Since we need to disable FIPS mode _after_ all FIPS-mode tests have # 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 # run, we have to add a strict dependency from Disable_FipsMODE onto all
# FIPS-related checks. # FIPS-related checks.

Loading…
Cancel
Save