|
 |
5f1c2b |
diff -up nss/tests/ssl/ssl.sh.disableSSL2tests nss/tests/ssl/ssl.sh
|
|
|
7f4443 |
--- nss/tests/ssl/ssl.sh.disableSSL2tests 2017-09-20 08:47:27.000000000 +0200
|
|
|
7f4443 |
+++ nss/tests/ssl/ssl.sh 2017-10-06 16:19:10.812108552 +0200
|
|
|
7f4443 |
@@ -69,8 +69,14 @@ ssl_init()
|
|
|
652e94 |
|
|
|
652e94 |
# Test case files
|
|
|
5f1c2b |
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
|
|
|
5f1c2b |
SSLPOLICY=${QADIR}/ssl/sslpolicy.txt
|
|
|
652e94 |
REQUEST_FILE=${QADIR}/ssl/sslreq.dat
|
|
|
652e94 |
|
|
|
7f4443 |
@@ -128,7 +134,11 @@ is_selfserv_alive()
|
|
|
652e94 |
fi
|
|
|
652e94 |
|
|
|
5f1c2b |
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 |
}
|
|
|
7f4443 |
@@ -152,7 +162,11 @@ wait_for_selfserv()
|
|
|
7f4443 |
${BINDIR}/tstclnt -4 -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \
|
|
|
5f1c2b |
-d ${P_R_CLIENTDIR} $verbose < ${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
|
|
|
7f4443 |
@@ -275,7 +289,7 @@ ssl_cov()
|
|
|
1b6f66 |
start_selfserv # Launch the server
|
|
|
652e94 |
|
|
|
5f1c2b |
VMIN="ssl3"
|
|
|
1b6f66 |
- VMAX="tls1.1"
|
|
|
1b6f66 |
+ VMAX="tls1.2"
|
|
|
5f1c2b |
|
|
|
7f4443 |
ignore_blank_lines ${SSLCOV} | \
|
|
|
652e94 |
while read ectype testmax param testname
|
|
|
7f4443 |
@@ -283,6 +297,12 @@ ssl_cov()
|
|
|
5f1c2b |
echo "${testname}" | grep "EXPORT" > /dev/null
|
|
|
5f1c2b |
EXP=$?
|
|
|
f57139 |
|
|
|
5f1c2b |
+ # skip export tests
|
|
|
5f1c2b |
+ if [ ${EXP} -eq 0 ]; then
|
|
|
5f1c2b |
+ echo "export test skipped"
|
|
|
1b6f66 |
+ continue
|
|
|
1b6f66 |
+ fi
|
|
|
f57139 |
+
|
|
|
7f4443 |
if [ "$ectype" = "ECC" ] ; then
|
|
|
5f1c2b |
echo "$SCRIPTNAME: skipping $testname (ECC only)"
|
|
|
7f4443 |
else
|