Network Security Services
CentOS Sources
2018-05-14 74449011e876d8839a7a1053f27fcea5cd1ccf4e
commit | author | age
5f1c2b 1 diff -up nss/tests/ssl/ssl.sh.disableSSL2tests nss/tests/ssl/ssl.sh
744490 2 --- nss/tests/ssl/ssl.sh.disableSSL2tests    2018-03-05 16:58:32.000000000 +0100
CS 3 +++ nss/tests/ssl/ssl.sh    2018-03-09 17:24:07.047568191 +0100
4 @@ -68,9 +68,14 @@ ssl_init()
5    NSS_SSL_RUN=${NSS_SSL_RUN:-$nss_ssl_run}
6    
652e94 7    # Test case files
744490 8 -  SSLCOV=${QADIR}/ssl/sslcov.txt
2533fc 9 +  if [ "${NSS_NO_SSL2}" = "1" ]; then
CS 10 +    SSLCOV=${QADIR}/ssl/sslcov.noSSL2orExport.txt
11 +    SSLSTRESS=${QADIR}/ssl/sslstress.noSSL2orExport.txt
12 +  else
13 +    SSLCOV=${QADIR}/ssl/sslcov.txt
14 +    SSLSTRESS=${QADIR}/ssl/sslstress.txt
15 +  fi
1b6f66 16    SSLAUTH=${QADIR}/ssl/sslauth.txt
CS 17 -  SSLSTRESS=${QADIR}/ssl/sslstress.txt
5f1c2b 18    SSLPOLICY=${QADIR}/ssl/sslpolicy.txt
652e94 19    REQUEST_FILE=${QADIR}/ssl/sslreq.dat
CS 20  
744490 21 @@ -128,7 +133,11 @@ is_selfserv_alive()
652e94 22    fi
CS 23  
5f1c2b 24    echo "kill -0 ${PID} >/dev/null 2>/dev/null"
1b6f66 25 +  if [ "${NSS_NO_SSL2}" = "1" ] && [[ ${EXP} -eq 0 || ${SSL2} -eq 0 ]]; then
652e94 26 +  echo "No server to kill"
CS 27 +  else
28    kill -0 ${PID} >/dev/null 2>/dev/null || Exit 10 "Fatal - selfserv process not detectable"
29 +  fi
30  
31    echo "selfserv with PID ${PID} found at `date`"
32  }
744490 33 @@ -152,7 +161,11 @@ wait_for_selfserv()
7f4443 34        ${BINDIR}/tstclnt -4 -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \
5f1c2b 35                -d ${P_R_CLIENTDIR} $verbose < ${REQUEST_FILE}
652e94 36        if [ $? -ne 0 ]; then
1b6f66 37 +          if [ "${NSS_NO_SSL2}" = "1" ] && [[ ${EXP} -eq 0 || ${SSL2} -eq 0 ]]; then
652e94 38 +              html_passed "Server never started"
CS 39 +          else
40            html_failed "Waiting for Server"
41 +          fi
42        fi
43    fi
44    is_selfserv_alive
744490 45 @@ -275,7 +288,7 @@ ssl_cov()
1b6f66 46    start_selfserv # Launch the server
CS 47  
5f1c2b 48    VMIN="ssl3"
1b6f66 49 -  VMAX="tls1.1"
CS 50 +  VMAX="tls1.2"
5f1c2b 51  
7f4443 52    ignore_blank_lines ${SSLCOV} | \
652e94 53    while read ectype testmax param testname
744490 54 @@ -283,6 +296,12 @@ ssl_cov()
5f1c2b 55        echo "${testname}" | grep "EXPORT" > /dev/null
CS 56        EXP=$?
f57139 57  
5f1c2b 58 +      #  skip export tests
CS 59 +      if [ ${EXP} -eq 0 ]; then
60 +         echo "export test skipped"
1b6f66 61 +         continue
CS 62 +      fi
f57139 63 +
7f4443 64        if [ "$ectype" = "ECC" ] ; then
5f1c2b 65            echo "$SCRIPTNAME: skipping  $testname (ECC only)"
7f4443 66        else