|
 |
1b6f66 |
diff -up ./tests/ssl/ssl.sh.disableSSL2tests ./tests/ssl/ssl.sh
|
|
|
1b6f66 |
--- ./tests/ssl/ssl.sh.disableSSL2tests 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./tests/ssl/ssl.sh 2016-02-19 21:36:48.900345950 -0800
|
|
|
1b6f66 |
@@ -62,9 +62,14 @@ ssl_init()
|
|
|
652e94 |
NSS_SSL_RUN=${NSS_SSL_RUN:-$nss_ssl_run}
|
|
|
652e94 |
|
|
|
652e94 |
# Test case files
|
|
|
652e94 |
- SSLCOV=${QADIR}/ssl/sslcov.txt
|
|
|
2533fc |
+ if [ "${NSS_NO_SSL2}" = "1" ]; then
|
|
|
2533fc |
+ SSLCOV=${QADIR}/ssl/sslcov.noSSL2orExport.txt
|
|
|
2533fc |
+ SSLSTRESS=${QADIR}/ssl/sslstress.noSSL2orExport.txt
|
|
|
2533fc |
+ else
|
|
|
2533fc |
+ SSLCOV=${QADIR}/ssl/sslcov.txt
|
|
|
2533fc |
+ SSLSTRESS=${QADIR}/ssl/sslstress.txt
|
|
|
2533fc |
+ fi
|
|
|
1b6f66 |
SSLAUTH=${QADIR}/ssl/sslauth.txt
|
|
|
1b6f66 |
- SSLSTRESS=${QADIR}/ssl/sslstress.txt
|
|
|
652e94 |
REQUEST_FILE=${QADIR}/ssl/sslreq.dat
|
|
|
652e94 |
|
|
|
652e94 |
#temparary files
|
|
|
1b6f66 |
@@ -120,7 +125,11 @@ is_selfserv_alive()
|
|
|
652e94 |
fi
|
|
|
652e94 |
|
|
|
652e94 |
echo "kill -0 ${PID} >/dev/null 2>/dev/null"
|
|
|
1b6f66 |
+ if [ "${NSS_NO_SSL2}" = "1" ] && [[ ${EXP} -eq 0 || ${SSL2} -eq 0 ]]; then
|
|
|
652e94 |
+ echo "No server to kill"
|
|
|
652e94 |
+ else
|
|
|
652e94 |
kill -0 ${PID} >/dev/null 2>/dev/null || Exit 10 "Fatal - selfserv process not detectable"
|
|
|
652e94 |
+ fi
|
|
|
652e94 |
|
|
|
652e94 |
echo "selfserv with PID ${PID} found at `date`"
|
|
|
652e94 |
}
|
|
|
1b6f66 |
@@ -143,7 +152,11 @@ wait_for_selfserv()
|
|
|
652e94 |
${BINDIR}/tstclnt -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \
|
|
|
652e94 |
-d ${P_R_CLIENTDIR} -v < ${REQUEST_FILE}
|
|
|
652e94 |
if [ $? -ne 0 ]; then
|
|
|
1b6f66 |
+ if [ "${NSS_NO_SSL2}" = "1" ] && [[ ${EXP} -eq 0 || ${SSL2} -eq 0 ]]; then
|
|
|
652e94 |
+ html_passed "Server never started"
|
|
|
652e94 |
+ else
|
|
|
652e94 |
html_failed "Waiting for Server"
|
|
|
652e94 |
+ fi
|
|
|
652e94 |
fi
|
|
|
652e94 |
fi
|
|
|
652e94 |
is_selfserv_alive
|
|
|
1b6f66 |
@@ -214,15 +227,16 @@ start_selfserv()
|
|
|
1b6f66 |
echo "selfserv starting at `date`"
|
|
|
1b6f66 |
echo "selfserv -D -p ${PORT} -d ${P_R_SERVERDIR} -n ${HOSTADDR} ${SERVER_OPTIONS} \\"
|
|
|
1b6f66 |
echo " ${ECC_OPTIONS} -S ${HOSTADDR}-dsa -w nss ${sparam} -i ${R_SERVERPID}\\"
|
|
|
1b6f66 |
- echo " $verbose -H 1 &"
|
|
|
1b6f66 |
+ echo " $verbose -H 1 -V ssl3: &"
|
|
|
1b6f66 |
if [ ${fileout} -eq 1 ]; then
|
|
|
1b6f66 |
${PROFTOOL} ${BINDIR}/selfserv -D -p ${PORT} -d ${P_R_SERVERDIR} -n ${HOSTADDR} ${SERVER_OPTIONS} \
|
|
|
1b6f66 |
${ECC_OPTIONS} -S ${HOSTADDR}-dsa -w nss ${sparam} -i ${R_SERVERPID} $verbose -H 1 \
|
|
|
1b6f66 |
- > ${SERVEROUTFILE} 2>&1 &
|
|
|
1b6f66 |
+ -V ssl3:> ${SERVEROUTFILE} 2>&1 &
|
|
|
1b6f66 |
RET=$?
|
|
|
1b6f66 |
else
|
|
|
1b6f66 |
${PROFTOOL} ${BINDIR}/selfserv -D -p ${PORT} -d ${P_R_SERVERDIR} -n ${HOSTADDR} ${SERVER_OPTIONS} \
|
|
|
1b6f66 |
- ${ECC_OPTIONS} -S ${HOSTADDR}-dsa -w nss ${sparam} -i ${R_SERVERPID} $verbose -H 1 &
|
|
|
1b6f66 |
+ ${ECC_OPTIONS} -S ${HOSTADDR}-dsa -w nss ${sparam} -i ${R_SERVERPID} $verbose -H 1 \
|
|
|
1b6f66 |
+ -V ssl3: &
|
|
|
1b6f66 |
RET=$?
|
|
|
1b6f66 |
fi
|
|
|
1b6f66 |
|
|
|
1b6f66 |
@@ -269,7 +283,7 @@ ssl_cov()
|
|
|
1b6f66 |
start_selfserv # Launch the server
|
|
|
652e94 |
|
|
|
1b6f66 |
VMIN="ssl2"
|
|
|
1b6f66 |
- VMAX="tls1.1"
|
|
|
1b6f66 |
+ VMAX="tls1.2"
|
|
|
1b6f66 |
|
|
|
652e94 |
exec < ${SSLCOV}
|
|
|
652e94 |
while read ectype testmax param testname
|
|
|
1b6f66 |
@@ -279,6 +293,12 @@ ssl_cov()
|
|
|
f57139 |
echo "${testname}" | grep "SSL2" > /dev/null
|
|
|
f57139 |
SSL2=$?
|
|
|
f57139 |
|
|
|
f57139 |
+ # skip export and ssl2 tests when build has disabled SSL2
|
|
|
1b6f66 |
+ if [ "${NSS_NO_SSL2}" = "1" ] && [[ ${EXP} -eq 0 || ${SSL2} -eq 0 ]]; then
|
|
|
1b6f66 |
+ echo "exp/ssl2 test skipped: (NSS_NO_SSL2,EXP,SSL2)=(${NSS_NO_SSL2},${EXP},${SSL2})"
|
|
|
1b6f66 |
+ continue
|
|
|
1b6f66 |
+ fi
|
|
|
f57139 |
+
|
|
|
f57139 |
if [ "${SSL2}" -eq 0 ] ; then
|
|
|
f57139 |
# We cannot use asynchronous cert verification with SSL2
|
|
|
f57139 |
SSL2_FLAGS=-O
|