From e2c12581e77b880638ccd2a8365e71f914ea4030 Mon Sep 17 00:00:00 2001 From: "kaie%kuix.de" Date: Sat, 16 Feb 2013 14:48:46 +0000 Subject: [PATCH] Bug 360420, fix Windows deadlock bustage, add missing html request to tstclnt invocation, r=bustage git-svn-id: svn://10.0.0.236/trunk@264746 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/tests/ocsp/ocsp.sh | 42 +++++++++++++------------ 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/mozilla/security/nss/tests/ocsp/ocsp.sh b/mozilla/security/nss/tests/ocsp/ocsp.sh index f3040313747..d6603eda088 100644 --- a/mozilla/security/nss/tests/ocsp/ocsp.sh +++ b/mozilla/security/nss/tests/ocsp/ocsp.sh @@ -44,6 +44,8 @@ ocsp_init() SCRIPTNAME=ocsp.sh echo "$SCRIPTNAME: OCSP tests ===============================" + REQF=${QADIR}/ssl/sslreq.dat + cd ${CLIENTDIR} } @@ -51,62 +53,62 @@ ocsp_stapling() { TESTNAME="startssl valid, supports OCSP stapling" echo "$SCRIPTNAME: $TESTNAME" - echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5143 -d ." - ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5143 -d . + echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5143 -d . < ${REQF}" + ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5143 -d . < ${REQF} html_msg $? 0 "$TESTNAME" TESTNAME="startssl revoked, supports OCSP stapling" echo "$SCRIPTNAME: $TESTNAME" - echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5144 -d ." - ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5144 -d . + echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5144 -d . < ${REQF}" + ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5144 -d . < ${REQF} html_msg $? 3 "$TESTNAME" TESTNAME="comodo trial test expired revoked, supports OCSP stapling" echo "$SCRIPTNAME: $TESTNAME" - echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5145 -d ." - ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5145 -d . + echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5145 -d . < ${REQF}" + ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5145 -d . < ${REQF} html_msg $? 1 "$TESTNAME" TESTNAME="thawte (expired) valid, supports OCSP stapling" echo "$SCRIPTNAME: $TESTNAME" - echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5146 -d ." - ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5146 -d . + echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5146 -d . < ${REQF}" + ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5146 -d . < ${REQF} html_msg $? 1 "$TESTNAME" TESTNAME="thawte (expired) revoked, supports OCSP stapling" echo "$SCRIPTNAME: $TESTNAME" - echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5147 -d ." - ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5147 -d . + echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5147 -d . < ${REQF}" + ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5147 -d . < ${REQF} html_msg $? 1 "$TESTNAME" TESTNAME="digicert valid, supports OCSP stapling" echo "$SCRIPTNAME: $TESTNAME" - echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5148 -d ." - ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5148 -d . + echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5148 -d . < ${REQF}" + ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5148 -d . < ${REQF} html_msg $? 0 "$TESTNAME" TESTNAME="digicert revoked, supports OCSP stapling" echo "$SCRIPTNAME: $TESTNAME" - echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5149 -d ." - ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5149 -d . + echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5149 -d . < ${REQF}" + ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5149 -d . < ${REQF} html_msg $? 3 "$TESTNAME" TESTNAME="live valid, supports OCSP stapling" echo "$SCRIPTNAME: $TESTNAME" - echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h login.live.com -p 443 -d ." - ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h login.live.com -p 443 -d . + echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h login.live.com -p 443 -d . < ${REQF}" + ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h login.live.com -p 443 -d . < ${REQF} html_msg $? 0 "$TESTNAME" TESTNAME="startssl valid, doesn't support OCSP stapling" echo "$SCRIPTNAME: $TESTNAME" - echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 443 -d ." - ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 443 -d . + echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 443 -d . < ${REQF}" + ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 443 -d . < ${REQF} html_msg $? 2 "$TESTNAME" TESTNAME="cacert untrusted, doesn't support OCSP stapling" echo "$SCRIPTNAME: $TESTNAME" - echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h www.cacert.org -p 443 -d ." - ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h www.cacert.org -p 443 -d . + echo "tstclnt -V tls1.0: -T -v -F -M 1 -O -h www.cacert.org -p 443 -d . < ${REQF}" + ${BINDIR}/tstclnt -V tls1.0: -T -v -F -M 1 -O -h www.cacert.org -p 443 -d . < ${REQF} html_msg $? 1 "$TESTNAME" }