Bug 484360: CRLDP tests + some small fixes. r=alexei

git-svn-id: svn://10.0.0.236/trunk@257787 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/security/nss/tests/chains/chains.sh

@@ -74,7 +74,8 @@ chains_init()
     CERT_SN_CNT=$(date '+%m%d%H%M%S' | sed "s/^0*//")
     CERT_SN_FIX=$(expr ${CERT_SN_CNT} - 1000)
 
-    PK7_NONCE=$CERT_SN_CNT;
+    PK7_NONCE=$CERT_SN_CNT
+    SCEN_CNT=0
 
     AIA_FILES="${HOSTDIR}/aiafiles"
 
@@ -415,16 +416,16 @@ process_crldp()
 "
 
         for ITEM in ${CRLDP}; do
-            CRL_PUBLIC="${HOST}-$$-${ITEM}.crl"
+            CRL_PUBLIC="${HOST}-$$-${ITEM}-${SCEN_CNT}.crl"
 
             EXT_DATA="${EXT_DATA}7
 ${NSS_AIA_HTTP}/${CRL_PUBLIC}
 "
         done
 
-        EXT_DATA="${EXT_DATA}0
-0
-0
+        EXT_DATA="${EXT_DATA}-1
+-1
+-1
 n
 n
 "
@@ -459,7 +460,7 @@ copy_crl()
     fi
 
     CRL_LOCAL="${COPYCRL}.crl"
-    CRL_PUBLIC="${HOST}-$$-${COPYCRL}.crl"
+    CRL_PUBLIC="${HOST}-$$-${COPYCRL}-${SCEN_CNT}.crl"
 
     cp ${CRL_LOCAL} ${NSS_AIA_PATH}/${CRL_PUBLIC} 2> /dev/null
     chmod a+r ${NSS_AIA_PATH}/${CRL_PUBLIC}
@@ -857,6 +858,7 @@ parse_config()
             EXT_KU=
             EXT_NS=
             EXT_EKU=
+            SERIAL=
             ;;
         "type")
             TYPE="${VALUE}"
@@ -978,6 +980,8 @@ parse_config()
                 LOGNAME="libpkix-${VALUE}"
                 LOGFILE="${LOGDIR}/${LOGNAME}"
             fi
+
+            SCEN_CNT=$(expr ${SCEN_CNT} + 1)
             ;;
         "sleep")
             sleep ${VALUE}

mozilla/security/nss/tests/chains/scenarios/crldp.cfg

@@ -0,0 +1,97 @@
+scenario CRLDP
+
+entity Root
+  type Root
+
+entity CA0
+  type Intermediate
+  issuer Root
+
+entity CA1
+  type Intermediate
+  crldp CA0
+  issuer CA0
+  serial 10
+    aia CA0:Root
+
+entity EE11
+  type EE
+  crldp CA0
+  issuer CA1
+
+entity CA2
+  type Intermediate
+  crldp CA0
+  issuer CA0
+  serial 20
+    aia CA0:Root
+
+entity EE21
+  type EE
+  issuer CA2
+
+entity EE1
+  type EE
+  crldp CA0
+  issuer CA0
+  serial 30
+    aia CA0:Root
+
+entity EE2
+  type EE
+  crldp CA0
+  issuer CA0
+  serial 40
+    aia CA0:Root
+
+crl Root
+crl CA0
+crl CA1
+crl CA2
+
+revoke CA0
+  serial 20
+
+revoke CA0
+  serial 40
+
+copycrl CA0
+
+db All
+
+import Root::CTu,CTu,CTu
+
+# intermediate CA - OK, EE - OK
+verify EE11:CA1
+  cert CA1:CA0
+  trust Root:
+  fetch
+  rev_type chain
+  rev_mtype crl
+  result pass
+
+# intermediate CA - revoked, EE - OK
+verify EE21:CA2
+  cert CA2:CA0
+  trust Root:
+  fetch
+  rev_type chain
+  rev_mtype crl
+  result fail
+
+# direct EE - OK 
+verify EE1:CA0
+  trust Root:
+  fetch
+  rev_type leaf
+  rev_mtype crl
+  result pass
+
+# direct EE - revoked
+verify EE2:CA0
+  trust Root:
+  fetch
+  rev_type leaf
+  rev_mtype crl
+  result fail
+

mozilla/security/nss/tests/chains/scenarios/scenarios

@@ -15,3 +15,4 @@ realcerts.cfg
 dsa.cfg
 revoc.cfg
 ocsp.cfg
+crldp.cfg