From 44ca940e0b456d0aee3333f00a97837f8d3214ac Mon Sep 17 00:00:00 2001
From: "kaie%kuix.de" <kaie%kuix.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 11 Apr 2012 19:30:16 +0000
Subject: [PATCH] Bug 741870, Update OCSP server testing, update the cert
 generation script and ocsp server config file template, r=rrelyea - not part
 of the build

git-svn-id: svn://10.0.0.236/trunk@263669 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/nss/tests/chains/ocspd-config/ocspd-certs.sh | 4 ++--
 .../nss/tests/chains/ocspd-config/ocspd.conf.template         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mozilla/security/nss/tests/chains/ocspd-config/ocspd-certs.sh b/mozilla/security/nss/tests/chains/ocspd-config/ocspd-certs.sh
index ccba63caed6..2f7d45898f4 100755
--- a/mozilla/security/nss/tests/chains/ocspd-config/ocspd-certs.sh
+++ b/mozilla/security/nss/tests/chains/ocspd-config/ocspd-certs.sh
@@ -31,9 +31,9 @@ convert_key()
 
     STATUS=0
     cat ${DATA_DIR}/${KEY_NAME}.key.tmp | while read LINE; do
-        echo "${LINE}" | grep "BEGIN RSA PRIVATE KEY" > /dev/null && STATUS=1
+        echo "${LINE}" | grep "BEGIN ENCRYPTED PRIVATE KEY" > /dev/null && STATUS=1
         [ ${STATUS} -eq 1 ] && echo "${LINE}"
-        echo "${LINE}" | grep "END RSA PRIVATE KEY" > /dev/null && break
+        echo "${LINE}" | grep "END ENCRYPTED PRIVATE KEY" > /dev/null && break
     done > ${DATA_DIR}/${KEY_NAME}.key
     
     rm ${DATA_DIR}/${KEY_NAME}.key.tmp
diff --git a/mozilla/security/nss/tests/chains/ocspd-config/ocspd.conf.template b/mozilla/security/nss/tests/chains/ocspd-config/ocspd.conf.template
index a33fed2e3f8..456c74a16d0 100644
--- a/mozilla/security/nss/tests/chains/ocspd-config/ocspd.conf.template
+++ b/mozilla/security/nss/tests/chains/ocspd-config/ocspd.conf.template
@@ -42,4 +42,5 @@ next_update_mins = 5
 
 crl_url = file:///@DIR@/@CA_CRL@
 ca_url  = file:///@DIR@/@CA_CERT@
+server_cert  = file:///@DIR@/@CA_CERT@