52a319230b
- add patch for upstream bug 488646 and add newer paypal certs in order to
make the test suite pass
67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
diff -up ./mozilla/security/nss/tests/chains/chains.sh.bug488646 ./mozilla/security/nss/tests/chains/chains.sh
|
|
--- ./mozilla/security/nss/tests/chains/chains.sh.bug488646 2009-05-08 21:37:48.000000000 +0200
|
|
+++ ./mozilla/security/nss/tests/chains/chains.sh 2009-05-08 21:38:03.000000000 +0200
|
|
@@ -695,6 +695,37 @@ verify_cert()
|
|
fi
|
|
}
|
|
|
|
+
|
|
+check_ocsp()
|
|
+{
|
|
+ OCSP_CERT=$1
|
|
+
|
|
+ CERT_NICK=`echo ${OCSP_CERT} | cut -d: -f1`
|
|
+ CERT_ISSUER=`echo ${OCSP_CERT} | cut -d: -f2`
|
|
+
|
|
+ if [ "${CERT_ISSUER}" = "x" ]; then
|
|
+ CERT_ISSUER=
|
|
+ CERT=${CERT_NICK}.cert
|
|
+ CERT_FILE="${QADIR}/libpkix/certs/${CERT}"
|
|
+ else
|
|
+ CERT=${CERT_NICK}${CERT_ISSUER}.der
|
|
+ CERT_FILE=${CERT}
|
|
+ fi
|
|
+
|
|
+ OCSP_HOST=$(${BINDIR}/pp -t certificate -i ${CERT_FILE} | grep URI | sed "s/.*:\/\///" | sed "s/:.*//")
|
|
+
|
|
+ if [ "${OS_ARCH}" = "WINNT" ]; then
|
|
+ ping -n 1 ${OCSP_HOST}
|
|
+ return $?
|
|
+ elif [ "${OS_ARCH}" = "HP-UX" ]; then
|
|
+ ping ${OCSP_HOST} -c 1
|
|
+ return $?
|
|
+ else
|
|
+ ping -c 1 ${OCSP_HOST}
|
|
+ return $?
|
|
+ fi
|
|
+}
|
|
+
|
|
############################ parse_result ##############################
|
|
# local shell function to process expected result value
|
|
# this function was created for case that expected result depends on
|
|
@@ -865,6 +896,13 @@ parse_config()
|
|
"break")
|
|
break
|
|
;;
|
|
+ "check_ocsp")
|
|
+ check_ocsp ${VALUE}
|
|
+ if [ $? -ne 0 ]; then
|
|
+ echo "OCSP server not accessible, skipping OCSP tests"
|
|
+ break;
|
|
+ fi
|
|
+ ;;
|
|
"")
|
|
if [ -n "${ENTITY}" ]; then
|
|
if [ -z "${DB}" ]; then
|
|
diff -up ./mozilla/security/nss/tests/chains/scenarios/ocsp.cfg.bug488646 ./mozilla/security/nss/tests/chains/scenarios/ocsp.cfg
|
|
--- ./mozilla/security/nss/tests/chains/scenarios/ocsp.cfg.bug488646 2009-05-08 21:37:58.000000000 +0200
|
|
+++ ./mozilla/security/nss/tests/chains/scenarios/ocsp.cfg 2009-05-08 21:38:03.000000000 +0200
|
|
@@ -1,5 +1,7 @@
|
|
scenario OCSP
|
|
|
|
+check_ocsp OCSPEE11:x
|
|
+
|
|
db OCSPRoot
|
|
import OCSPRoot:x:CT,C,C
|
|
|