From 09040cd82a3d611901b8ed069c3a1e5911519cd4 Mon Sep 17 00:00:00 2001
From: Elio Maldonado <emaldona@redhat.com>
Date: Sat, 12 Dec 2015 12:31:23 -0800
Subject: [PATCH] Update the patch on account of new sources

---
 disableSSL2tests.patch | 66 +++++-------------------------------------
 1 file changed, 8 insertions(+), 58 deletions(-)

diff --git a/disableSSL2tests.patch b/disableSSL2tests.patch
index 9011bfe..78e468e 100644
--- a/disableSSL2tests.patch
+++ b/disableSSL2tests.patch
@@ -1,12 +1,7 @@
-diff --git a/tests/ssl/ssl.sh b/tests/ssl/ssl.sh
---- a/tests/ssl/ssl.sh
-+++ b/tests/ssl/ssl.sh
-@@ -57,19 +57,24 @@ ssl_init()
-   fi
- 
-   PORT=${PORT-8443}
-   NSS_SSL_TESTS=${NSS_SSL_TESTS:-normal_normal}
-   nss_ssl_run="stapling cov auth stress"
+diff -up ./tests/ssl/ssl.sh.disableSSL2tests ./tests/ssl/ssl.sh
+--- ./tests/ssl/ssl.sh.disableSSL2tests	2015-12-12 12:03:41.000000000 -0800
++++ ./tests/ssl/ssl.sh	2015-12-12 12:25:30.310865617 -0800
+@@ -62,9 +62,14 @@ ssl_init()
    NSS_SSL_RUN=${NSS_SSL_RUN:-$nss_ssl_run}
  
    # Test case files
@@ -23,17 +18,7 @@ diff --git a/tests/ssl/ssl.sh b/tests/ssl/ssl.sh
    REQUEST_FILE=${QADIR}/ssl/sslreq.dat
  
    #temparary files
-   SERVEROUTFILE=${TMP}/tests_server.$$
-   SERVERPID=${TMP}/tests_pid.$$
- 
-   R_SERVERPID=../tests_pid.$$
- 
-@@ -115,17 +120,21 @@ is_selfserv_alive()
-   if [ "${OS_ARCH}" = "WINNT" ] && \
-      [ "$OS_NAME" = "CYGWIN_NT" -o "$OS_NAME" = "MINGW32_NT" ]; then
-       PID=${SHELL_SERVERPID}
-   else
-       PID=`cat ${SERVERPID}`
+@@ -120,7 +125,11 @@ is_selfserv_alive()
    fi
  
    echo "kill -0 ${PID} >/dev/null 2>/dev/null" 
@@ -45,17 +30,7 @@ diff --git a/tests/ssl/ssl.sh b/tests/ssl/ssl.sh
  
    echo "selfserv with PID ${PID} found at `date`"
  }
- 
- ########################### wait_for_selfserv ##########################
- # local shell function to wait until selfserver is running and initialized
- ########################################################################
- wait_for_selfserv()
-@@ -138,17 +147,21 @@ wait_for_selfserv()
-   if [ $? -ne 0 ]; then
-       sleep 5
-       echo "retrying to connect to selfserv at `date`"
-       echo "tstclnt -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \\"
-       echo "        -d ${P_R_CLIENTDIR} -v < ${REQUEST_FILE}"
+@@ -143,7 +152,11 @@ wait_for_selfserv()
        ${BINDIR}/tstclnt -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \
                -d ${P_R_CLIENTDIR} -v < ${REQUEST_FILE}
        if [ $? -ne 0 ]; then
@@ -67,17 +42,7 @@ diff --git a/tests/ssl/ssl.sh b/tests/ssl/ssl.sh
        fi
    fi
    is_selfserv_alive
- }
- 
- ########################### kill_selfserv ##############################
- # local shell function to kill the selfserver after the tests are done
- ########################################################################
-@@ -209,25 +222,26 @@ start_selfserv()
-       ECC_OPTIONS=""
-   fi
-   if [ "$1" = "mixed" ]; then
-       ECC_OPTIONS="-e ${HOSTADDR}-ecmixed"
-   fi
+@@ -214,15 +227,16 @@ start_selfserv()
    echo "selfserv starting at `date`"
    echo "selfserv -D -p ${PORT} -d ${P_R_SERVERDIR} -n ${HOSTADDR} ${SERVER_OPTIONS} \\"
    echo "         ${ECC_OPTIONS} -S ${HOSTADDR}-dsa -w nss ${sparam} -i ${R_SERVERPID}\\"
@@ -97,17 +62,7 @@ diff --git a/tests/ssl/ssl.sh b/tests/ssl/ssl.sh
        RET=$?
    fi
  
-   # The PID $! returned by the MKS or Cygwin shell is not the PID of
-   # the real background process, but rather the PID of a helper
-   # process (sh.exe).  MKS's kill command has a bug: invoking kill
-   # on the helper process does not terminate the real background
-   # process.  Our workaround has been to have selfserv save its PID
-@@ -274,16 +288,22 @@ ssl_cov()
-   exec < ${SSLCOV}
-   while read ectype testmax param testname
-   do
-       echo "${testname}" | grep "EXPORT" > /dev/null 
-       EXP=$?
+@@ -279,6 +293,12 @@ ssl_cov()
        echo "${testname}" | grep "SSL2" > /dev/null
        SSL2=$?
  
@@ -120,8 +75,3 @@ diff --git a/tests/ssl/ssl.sh b/tests/ssl/ssl.sh
        if [ "${SSL2}" -eq 0 ] ; then
            # We cannot use asynchronous cert verification with SSL2
            SSL2_FLAGS=-O
-           VMIN="ssl2"
-       else
-           # Do not enable SSL2 for non-SSL2-specific tests. SSL2 is disabled by
-           # default in libssl but it is enabled by default in tstclnt; we want
-           # to test the libssl default whenever possible.