diff options
| author | nelsonb%netscape.com <devnull@localhost> | 2000-10-05 04:04:37 +0000 |
|---|---|---|
| committer | nelsonb%netscape.com <devnull@localhost> | 2000-10-05 04:04:37 +0000 |
| commit | 3b9ccda318fabc82bb4a43a64378051c3ba15ab1 (patch) | |
| tree | ab16ec73dc1c58ff00db5eb7fb9e10a5640c78fd | |
| parent | 6d299008d7ea03b798743e19298a91039d109f4d (diff) | |
| download | nss-hg-3b9ccda318fabc82bb4a43a64378051c3ba15ab1.tar.gz | |
Make the "nocerts" option for this script work properly.
Also, add a new "verbose" option to this script.
| -rwxr-xr-x | security/nss/tests/ssl/ssl.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/security/nss/tests/ssl/ssl.sh b/security/nss/tests/ssl/ssl.sh index bdb397139..2838861d8 100755 --- a/security/nss/tests/ssl/ssl.sh +++ b/security/nss/tests/ssl/ssl.sh @@ -51,6 +51,8 @@ do none=0; stress=1;; [Nn][Oo][Ss]*) stress=0;; + [Vv][Ee][Rr][Bb]*) + verbose=-v;; f) fileout=1; esac @@ -68,6 +70,10 @@ fi # trap "rm -f ${TEMPFILES}; exit" 2 3 +CADIR=${HOSTDIR}/CA +SERVERDIR=${HOSTDIR}/server +CLIENTDIR=${HOSTDIR}/client + if [ $certs -eq 1 ]; then # Generate noise for our CA cert. # @@ -85,7 +91,6 @@ date >> ${NOISE_FILE} 2>&1 # echo "<TABLE BORDER=1><TR><TH COLSPAN=3>Certutil Tests</TH></TR>" >> ${RESULTS} echo "<TR><TH width=500>Test Case</TH><TH width=50>Result</TH></TR>" >> ${RESULTS} -CADIR=${HOSTDIR}/CA echo "********************** Creating a CA Certificate **********************" if [ ! -d ${CADIR} ]; then mkdir -p ${CADIR} @@ -119,7 +124,6 @@ fi echo "**************** Creating Client CA Issued Certificate ****************" netstat >> ${NOISE_FILE} 2>&1 date >> ${NOISE_FILE} 2>&1 -CLIENTDIR=${HOSTDIR}/client if [ ! -d ${CLIENTDIR} ]; then mkdir -p ${CLIENTDIR} fi @@ -167,7 +171,6 @@ fi echo "***** Creating Server CA Issued Certificate for ${HOST}.${DOMSUF} *****" netstat >> ${NOISE_FILE} 2>&1 date >> ${NOISE_FILE} 2>&1 -SERVERDIR=${HOSTDIR}/server if [ ! -d ${SERVERDIR} ]; then mkdir -p ${SERVERDIR} fi @@ -296,15 +299,16 @@ do echo "********************* $testname ****************************" sparam=`echo $sparam | sed -e 's;_; ;g'` cparam=`echo $cparam | sed -e 's;_; ;g'` - echo "selfserv -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} &" + echo "selfserv -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} $verbose &" if [ ${fileout} -eq 1 ]; then - selfserv -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} > ${SERVEROUTFILE} 2>&1 & + selfserv -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} $verbose > ${SERVEROUTFILE} 2>&1 & else - selfserv -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} & + selfserv -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} $verbose & fi sleep 20 - strsclnt -p ${PORT} ${HOST} -d . -w nss $cparam + echo "strsclnt -p ${PORT} -d . -w nss $cparam $verbose ${HOST}.${DOMSUF} " + strsclnt -p ${PORT} -d . -w nss $cparam $verbose ${HOST}.${DOMSUF} if [ $? -ne $value ]; then echo "<TR><TD>"${testname}"</TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS} else |