Revert of Perform CRLSet evaluation during Path Building on NSS

net/data/ssl/scripts/generate-multi-root-test-chains.sh

 #!/bin/sh
 
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # The following documentation uses the annotation approach from RFC 4158.
 # CAs (entities that share the same name and public key) are denoted in boxes,
 # while the indication that a CA Foo signed a certificate for CA Bar is denoted
 # by directed arrows.
@@ skipping 190 matching lines @@
     > ../certificates/multi-root-chain2.pem"
 cp out/B.pem ../certificates/multi-root-B-by-C.pem
 cp out/B2.pem ../certificates/multi-root-B-by-F.pem
 cp out/C.pem ../certificates/multi-root-C-by-D.pem
 cp out/C2.pem ../certificates/multi-root-C-by-E.pem
 cp out/F.pem ../certificates/multi-root-F-by-E.pem
 cp out/D.pem ../certificates/multi-root-D-by-D.pem
 cp out/E.pem ../certificates/multi-root-E-by-E.pem
 
 echo "Generating CRLSets"
-# Block D and E by SPKI; invalidates all paths.
-python crlsetutil.py -o ../certificates/multi-root-crlset-D-and-E.raw \
-<<CRLSETDOCBLOCK
-{
-  "BlockedBySPKI": [
-    "out/D.pem",
-    "out/E.pem"
-  ]
-}
-CRLSETDOCBLOCK
-
-# Block E by SPKI.
-python crlsetutil.py -o ../certificates/multi-root-crlset-E.raw \
-<<CRLSETDOCBLOCK
-{
-  "BlockedBySPKI": [
-    "out/E.pem"
-  ]
-}
-CRLSETDOCBLOCK
-
-# Block C-by-D (serial number 0x1000) and F-by-E (serial number 0x1001) by
-# way of serial number.
-python crlsetutil.py -o ../certificates/multi-root-crlset-CD-and-FE.raw \
-<<CRLSETDOCBLOCK
+# Block C-by-E (serial number 0x1001) by way of serial number.
+python crlsetutil.py -o ../certificates/multi-root-crlset-C-by-E.raw \
+<<CRLSETBYSERIAL
 {
   "BlockedByHash": {
-    "out/D.pem": [4096],
     "out/E.pem": [4097]
   }
 }
-CRLSETDOCBLOCK
+CRLSETBYSERIAL
 
-# Block C (all versions) by way of SPKI
-python crlsetutil.py -o ../certificates/multi-root-crlset-C.raw \
-<<CRLSETDOCBLOCK
+# Block F (all versions) by way of SPKI
+python crlsetutil.py -o ../certificates/multi-root-crlset-F.raw \
+<<CRLSETBYSPKI
 {
-  "BlockedBySPKI": [ "out/C.pem" ]
+  "BlockedBySPKI": [ "out/F.pem" ]
 }
-CRLSETDOCBLOCK
-
-# Block an unrelated/unissued serial (0x0FFF) to enable all paths.
-python crlsetutil.py -o ../certificates/multi-root-crlset-unrelated.raw \
-<<CRLSETDOCBLOCK
-{
-  "BlockedByHash": {
-    "out/E.pem": [4095]
-  }
-}
-CRLSETDOCBLOCK
+CRLSETBYSPKI