Bug 473790: Adding more certs (+script to generate them). r=alexei.

10 files changed, 50 insertions, 2 deletions

diff --git a/security/nss/tests/chains/ocspd-config/ocspd-certs.sh b/security/nss/tests/chains/ocspd-config/ocspd-certs.sh
index c929296b2..ccba63cae 100755
--- a/security/nss/tests/chains/ocspd-config/ocspd-certs.sh
+++ b/security/nss/tests/chains/ocspd-config/ocspd-certs.sh
@@ -103,7 +103,14 @@ copy_cert OCSPEE13 OCSPCA1
 copy_cert OCSPEE14 OCSPCA1
 copy_cert OCSPEE15 OCSPCA1
 copy_cert OCSPEE21 OCSPCA2
+copy_cert OCSPEE22 OCSPCA2
+copy_cert OCSPEE23 OCSPCA2
 copy_cert OCSPEE31 OCSPCA3
+copy_cert OCSPEE32 OCSPCA3
+copy_cert OCSPEE33 OCSPCA3
 
+copy_key OCSPRoot
 copy_key OCSPCA1
+copy_key OCSPCA2
+copy_key OCSPCA3
 
diff --git a/security/nss/tests/chains/scenarios/ocspd.cfg b/security/nss/tests/chains/scenarios/ocspd.cfg
index c1a8fa92f..c0894055f 100644
--- a/security/nss/tests/chains/scenarios/ocspd.cfg
+++ b/security/nss/tests/chains/scenarios/ocspd.cfg
@@ -96,20 +96,48 @@ entity OCSPEE15
   serial 5
   ocsp 2599
 
-#EE - pointing to revoked OCSP
+#EE - valid EE, revoked CA
 entity OCSPEE21
   type EE
   issuer OCSPCA2
   serial 1
   ocsp 2602
 
-#EE - pointing to OCSP with unknown status
+#EE - revoked EE, revoked CA
+entity OCSPEE22
+  type EE 
+  issuer OCSPCA2 
+  serial 2
+  ocsp 2602
+
+#EE - revoked EE, CA pointing to invalid OCSP
+entity OCSPEE23
+  type EE 
+  issuer OCSPCA2 
+  serial 3
+  ocsp 2599
+
+#EE - valid EE, CA pointing to invalid OCSP
 entity OCSPEE31
   type EE
   issuer OCSPCA3
   serial 1
   ocsp 2603
 
+#EE - revoked EE, CA pointing to invalid OCSP
+entity OCSPEE32
+  type EE 
+  issuer OCSPCA3 
+  serial 2
+  ocsp 2603
+
+#EE - EE pointing to invalid OCSP, CA pointing to invalid OCSP
+entity OCSPEE33
+  type EE 
+  issuer OCSPCA3 
+  serial 3
+  ocsp 2599
+
 crl OCSPRoot
 
 revoke OCSPRoot
@@ -124,5 +152,18 @@ revoke OCSPCA1
   serial 4
 
 crl OCSPCA2
+
+revoke OCSPCA2
+  serial 2
+
+revoke OCSPCA2
+  serial 3
+
 crl OCSPCA3
 
+revoke OCSPCA3
+  serial 2
+
+revoke OCSPCA3
+  serial 3
+
diff --git a/security/nss/tests/libpkix/certs/OCSPCA1.p12 b/security/nss/tests/libpkix/certs/OCSPCA1.p12
index f829d9b07..b3d3c6d5f 100644
--- a/security/nss/tests/libpkix/certs/OCSPCA1.p12
+++ b/security/nss/tests/libpkix/certs/OCSPCA1.p12
diff --git a/security/nss/tests/libpkix/certs/OCSPCA2.p12 b/security/nss/tests/libpkix/certs/OCSPCA2.p12
new file mode 100644
index 000000000..e7c1f037b
--- /dev/null
+++ b/security/nss/tests/libpkix/certs/OCSPCA2.p12
diff --git a/security/nss/tests/libpkix/certs/OCSPCA3.p12 b/security/nss/tests/libpkix/certs/OCSPCA3.p12
new file mode 100644
index 000000000..1e9899392
--- /dev/null
+++ b/security/nss/tests/libpkix/certs/OCSPCA3.p12
diff --git a/security/nss/tests/libpkix/certs/OCSPEE22.cert b/security/nss/tests/libpkix/certs/OCSPEE22.cert
new file mode 100644
index 000000000..ee20cc9c7
--- /dev/null
+++ b/security/nss/tests/libpkix/certs/OCSPEE22.cert
diff --git a/security/nss/tests/libpkix/certs/OCSPEE23.cert b/security/nss/tests/libpkix/certs/OCSPEE23.cert
new file mode 100644
index 000000000..8efe3f72b
--- /dev/null
+++ b/security/nss/tests/libpkix/certs/OCSPEE23.cert
diff --git a/security/nss/tests/libpkix/certs/OCSPEE32.cert b/security/nss/tests/libpkix/certs/OCSPEE32.cert
new file mode 100644
index 000000000..9a82e9ff5
--- /dev/null
+++ b/security/nss/tests/libpkix/certs/OCSPEE32.cert
diff --git a/security/nss/tests/libpkix/certs/OCSPEE33.cert b/security/nss/tests/libpkix/certs/OCSPEE33.cert
new file mode 100644
index 000000000..d362c0580
--- /dev/null
+++ b/security/nss/tests/libpkix/certs/OCSPEE33.cert
diff --git a/security/nss/tests/libpkix/certs/OCSPRoot.p12 b/security/nss/tests/libpkix/certs/OCSPRoot.p12
new file mode 100644
index 000000000..eb2fdafd3
--- /dev/null
+++ b/security/nss/tests/libpkix/certs/OCSPRoot.p12