diff options
| author | Daiki Ueno <dueno@redhat.com> | 2017-08-24 15:51:16 +0200 |
|---|---|---|
| committer | Daiki Ueno <dueno@redhat.com> | 2017-08-24 15:51:16 +0200 |
| commit | f4cff777c106e7d2ee2bf8f115f4a86e656e351f (patch) | |
| tree | c41a834cf0a0ee5b97a93dcfa274e8a0b78c4130 /tests/ssl | |
| parent | 49162cb660c3aead00be4ca024aa88fe0bad1889 (diff) | |
| download | nss-hg-f4cff777c106e7d2ee2bf8f115f4a86e656e351f.tar.gz | |
Bug 1320708, tests: Check if strsclnt doesn't stuck with empty DB password, r=fkiefer
Diffstat (limited to 'tests/ssl')
| -rwxr-xr-x | tests/ssl/ssl.sh | 15 | ||||
| -rw-r--r-- | tests/ssl/sslstress.txt | 1 |
2 files changed, 14 insertions, 2 deletions
diff --git a/tests/ssl/ssl.sh b/tests/ssl/ssl.sh index f1b263514..930724642 100755 --- a/tests/ssl/ssl.sh +++ b/tests/ssl/ssl.sh @@ -554,6 +554,8 @@ ssl_stress() echo "${testname}" | grep "client auth" > /dev/null CAUTH=$? + echo "${testname}" | grep "no login" > /dev/null + NOLOGIN=$? if [ "$ectype" = "SNI" -a "$NORM_EXT" = "Extended Test" ] ; then echo "$SCRIPTNAME: skipping $testname for $NORM_EXT" @@ -561,6 +563,9 @@ ssl_stress() echo "$SCRIPTNAME: skipping $testname (ECC only)" elif [ "${CLIENT_MODE}" = "fips" -a "${CAUTH}" -ne 0 ] ; then echo "$SCRIPTNAME: skipping $testname (non-FIPS only)" + elif [ "${NOLOGIN}" -eq 0 ] && \ + [ "${CLIENT_MODE}" = "fips" -o "$NORM_EXT" = "Extended Test" ] ; then + echo "$SCRIPTNAME: skipping $testname for $NORM_EXT" elif [ "`echo $ectype | cut -b 1`" != "#" ]; then cparam=`echo $cparam | sed -e 's;_; ;g' -e "s/TestUser/$USER_NICKNAME/g" ` if [ "$ectype" = "SNI" ]; then @@ -575,10 +580,16 @@ ssl_stress() ps -ef | grep selfserv fi - echo "strsclnt -q -p ${PORT} -d ${P_R_CLIENTDIR} ${CLIENT_OPTIONS} -w nss $cparam \\" + if [ "${NOLOGIN}" -eq 0 ] ; then + dbdir=${P_R_NOLOGINDIR} + else + dbdir=${P_R_CLIENTDIR} + fi + + echo "strsclnt -q -p ${PORT} -d ${dbdir} ${CLIENT_OPTIONS} -w nss $cparam \\" echo " -V ssl3:tls1.2 $verbose ${HOSTADDR}" echo "strsclnt started at `date`" - ${PROFTOOL} ${BINDIR}/strsclnt -q -p ${PORT} -d ${P_R_CLIENTDIR} ${CLIENT_OPTIONS} -w nss $cparam \ + ${PROFTOOL} ${BINDIR}/strsclnt -q -p ${PORT} -d ${dbdir} ${CLIENT_OPTIONS} -w nss $cparam \ -V ssl3:tls1.2 $verbose ${HOSTADDR} ret=$? echo "strsclnt completed at `date`" diff --git a/tests/ssl/sslstress.txt b/tests/ssl/sslstress.txt index e9defc502..a87eedad7 100644 --- a/tests/ssl/sslstress.txt +++ b/tests/ssl/sslstress.txt @@ -21,6 +21,7 @@ # add client auth versions here... # noECC 0 -r_-r -c_100_-C_c_-V_ssl3:ssl3_-N_-n_TestUser Stress SSL3 RC4 128 with MD5 (no reuse, client auth) + noECC 0 -r_-r -c_100_-C_c_-V_ssl3:ssl3_-N_-n_TestUser Stress SSL3 RC4 128 with MD5 (no reuse, client auth, no login) noECC 0 -r_-r -c_100_-C_c_-N_-n_TestUser Stress TLS RC4 128 with MD5 (no reuse, client auth) noECC 0 -r_-r_-u -V_ssl3:tls1.2_-c_100_-C_c_-n_TestUser_-u Stress TLS RC4 128 with MD5 (session ticket, client auth) noECC 0 -r_-r_-z -V_ssl3:tls1.2_-c_100_-C_c_-n_TestUser_-z Stress TLS RC4 128 with MD5 (compression, client auth) |