Network Security Services
CentOS Sources
2018-05-14 74449011e876d8839a7a1053f27fcea5cd1ccf4e
SOURCES/Bug-1001841-disable-sslv2-tests.patch
@@ -1,10 +1,11 @@
diff -up nss/tests/ssl/ssl.sh.disableSSL2tests nss/tests/ssl/ssl.sh
--- nss/tests/ssl/ssl.sh.disableSSL2tests   2017-09-20 08:47:27.000000000 +0200
+++ nss/tests/ssl/ssl.sh   2017-10-06 16:19:10.812108552 +0200
@@ -69,8 +69,14 @@ ssl_init()
--- nss/tests/ssl/ssl.sh.disableSSL2tests   2018-03-05 16:58:32.000000000 +0100
+++ nss/tests/ssl/ssl.sh   2018-03-09 17:24:07.047568191 +0100
@@ -68,9 +68,14 @@ ssl_init()
   NSS_SSL_RUN=${NSS_SSL_RUN:-$nss_ssl_run}
   # Test case files
   SSLCOV=${QADIR}/ssl/sslcov.txt
-  SSLCOV=${QADIR}/ssl/sslcov.txt
+  if [ "${NSS_NO_SSL2}" = "1" ]; then
+    SSLCOV=${QADIR}/ssl/sslcov.noSSL2orExport.txt
+    SSLSTRESS=${QADIR}/ssl/sslstress.noSSL2orExport.txt
@@ -17,7 +18,7 @@
   SSLPOLICY=${QADIR}/ssl/sslpolicy.txt
   REQUEST_FILE=${QADIR}/ssl/sslreq.dat
 
@@ -128,7 +134,11 @@ is_selfserv_alive()
@@ -128,7 +133,11 @@ is_selfserv_alive()
   fi
 
   echo "kill -0 ${PID} >/dev/null 2>/dev/null"
@@ -29,7 +30,7 @@
 
   echo "selfserv with PID ${PID} found at `date`"
 }
@@ -152,7 +162,11 @@ wait_for_selfserv()
@@ -152,7 +161,11 @@ wait_for_selfserv()
       ${BINDIR}/tstclnt -4 -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \
               -d ${P_R_CLIENTDIR} $verbose < ${REQUEST_FILE}
       if [ $? -ne 0 ]; then
@@ -41,7 +42,7 @@
       fi
   fi
   is_selfserv_alive
@@ -275,7 +289,7 @@ ssl_cov()
@@ -275,7 +288,7 @@ ssl_cov()
   start_selfserv # Launch the server
 
   VMIN="ssl3"
@@ -50,7 +51,7 @@
 
   ignore_blank_lines ${SSLCOV} | \
   while read ectype testmax param testname
@@ -283,6 +297,12 @@ ssl_cov()
@@ -283,6 +296,12 @@ ssl_cov()
       echo "${testname}" | grep "EXPORT" > /dev/null
       EXP=$?