diff -up ./tests/ssl/ssl.sh.disableSSL2tests ./tests/ssl/ssl.sh

--- ./tests/ssl/ssl.sh.disableSSL2tests	2021-05-28 02:50:43.000000000 -0700

+++ ./tests/ssl/ssl.sh	2021-06-03 15:22:02.725514179 -0700

@@ -88,9 +88,14 @@ ssl_init()

   NSS_SSL_RUN=${NSS_SSL_RUN:-$nss_ssl_run}

   # Test case files

-  SSLCOV=${QADIR}/ssl/sslcov.txt

+  if [ "${NSS_NO_SSL2}" = "1" ]; then

+    SSLCOV=${QADIR}/ssl/sslcov.noSSL2orExport.txt

+    SSLSTRESS=${QADIR}/ssl/sslstress.noSSL2orExport.txt

+  else

+    SSLCOV=${QADIR}/ssl/sslcov.txt

+    SSLSTRESS=${QADIR}/ssl/sslstress.txt

+  fi

   SSLAUTH=${QADIR}/ssl/sslauth.txt

-  SSLSTRESS=${QADIR}/ssl/sslstress.txt

   SSLPOLICY=${QADIR}/ssl/sslpolicy.txt

   REQUEST_FILE=${QADIR}/ssl/sslreq.dat

@@ -159,7 +164,11 @@ is_selfserv_alive()

   fi

   echo "kill -0 ${PID} >/dev/null 2>/dev/null"

+  if [ "${NSS_NO_SSL2}" = "1" ] && [[ ${EXP} -eq 0 || ${SSL2} -eq 0 ]]; then

+  echo "No server to kill"

+  else

   kill -0 ${PID} >/dev/null 2>/dev/null || Exit 10 "Fatal - selfserv process not detectable"

+  fi

   echo "selfserv with PID ${PID} found at `date`"

 }

@@ -183,7 +192,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

+          if [ "${NSS_NO_SSL2}" = "1" ] && [[ ${EXP} -eq 0 || ${SSL2} -eq 0 ]]; then

+              html_passed "Server never started"

+          else

           html_failed "Waiting for Server"

+          fi

       fi

   fi

   is_selfserv_alive

@@ -332,6 +345,12 @@ ssl_cov()

       echo "${testname}" | grep "EXPORT" > /dev/null

       EXP=$?

+      #  skip export tests

+      if [ ${EXP} -eq 0 ]; then

+         echo "export test skipped"

+         continue

+      fi

+

       # RSA-PSS tests are handled in a separate function

       case $testname in

         *RSA-PSS)