diff options
| author | nelsonb%netscape.com <devnull@localhost> | 2004-01-17 05:04:42 +0000 |
|---|---|---|
| committer | nelsonb%netscape.com <devnull@localhost> | 2004-01-17 05:04:42 +0000 |
| commit | b6540fff1709917968cceb53b3139ed6f12d5651 (patch) | |
| tree | 8421b5ee722c54d3538835333ca6e2ae493b1409 | |
| parent | c0f38bfb4ce57ec5c34ed5951a6a199ef921d5e1 (diff) | |
| download | nss-hg-b6540fff1709917968cceb53b3139ed6f12d5651.tar.gz | |
Correct this script to more accurately report errors. Bug 231221.
| -rwxr-xr-x | security/nss/tests/pkits/pkits.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/security/nss/tests/pkits/pkits.sh b/security/nss/tests/pkits/pkits.sh index 7c04ca42a..91170a68d 100755 --- a/security/nss/tests/pkits/pkits.sh +++ b/security/nss/tests/pkits/pkits.sh @@ -107,7 +107,8 @@ pkits_init() echo "certs" $certs echo "crls" $crls - certutil -N -d ${PKITSdb} + echo nss > ${PKITSdb}/pw + certutil -N -d ${PKITSdb} -f ${PKITSdb}/pw certutil -A -n TrustAnchorRootCertificate -t "C,C,C" -i \ $certs/TrustAnchorRootCertificate.crt -d $PKITSdb certutil -A -n GoodCACert -t ",," -i $certs/GoodCACert.crt -d $PKITSdb @@ -132,9 +133,10 @@ pkits_log() pkits() { echo "$SCRIPTNAME: ${VFY_ACTION} --------------------------" - echo "vfychain -d PKITSdb $*" - vfychain -d $PKITSdb $* - RET=$? + echo "vfychain -d PKITSdb -u 4 $*" + vfychain -d $PKITSdb -u 4 $* > ${PKITSDIR}/cmdout.txt 2>&1 + RET=$(grep -c ERROR ${PKITSDIR}/cmdout.txt) + cat ${PKITSDIR}/cmdout.txt if [ "$RET" -ne 0 ]; then html_failed "<TR><TD>${VFY_ACTION} ($RET) " @@ -155,11 +157,12 @@ pkits() pkitsn() { echo "$SCRIPTNAME: ${VFY_ACTION} --------------------------" - echo "vfychain -d PKITSdb $*" - vfychain -d $PKITSdb $* - RET=$? + echo "vfychain -d PKITSdb -u 4 $*" + vfychain -d $PKITSdb -u 4 $* > ${PKITSDIR}/cmdout.txt 2>&1 + RET=$(grep -c ERROR ${PKITSDIR}/cmdout.txt) + cat ${PKITSDIR}/cmdout.txt - if [ "$RET" -e 0 ]; then + if [ "$RET" -eq 0 ]; then html_failed "<TR><TD>${VFY_ACTION} ($RET) " pkits_log "ERROR: ${VFY_ACTION} failed $RET" else @@ -196,6 +199,7 @@ pkits_SignatureVerification() VFY_ACTION="Valid DSA Parameter Inheritance Test5" pkits $certs/ValidDSAParameterInheritanceTest5EE.crt \ + $certs/DSAParametersInheritedCACert.crt \ $certs/DSACACert.crt $certs/TrustAnchorRootCertificate.crt VFY_ACTION="Invalid DSA Signature Test6" |