aboutsummaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorlloyd <[email protected]>2006-06-06 16:11:37 +0000
committerlloyd <[email protected]>2006-06-06 16:11:37 +0000
commit34599f47dc2fda43440e7191acd6f608f5cecdd2 (patch)
tree4a78db43fc10a5ae9f192c918efc4a2a1e48873a /misc
parent69df9ac7fdaf575474e3904e08ad6974d06e9379 (diff)
Add the NIST X.509 test suite into misc/nist_tests
Diffstat (limited to 'misc')
-rw-r--r--misc/nist_tests/Makefile13
-rw-r--r--misc/nist_tests/failure.txt12
-rw-r--r--misc/nist_tests/readme.txt26
-rw-r--r--misc/nist_tests/tests/test01/End Certificate CP.01.01.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test01/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test01/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test02/End Certificate CP.01.02.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test02/Intermediate CRL CP.01.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test02/Intermediate Certificate CP.01.02.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test02/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test02/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test03/End Certificate CP.01.03.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test03/Intermediate CRL CP.01.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test03/Intermediate Certificate CP.01.03.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test03/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test03/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test04/End Certificate CP.02.01.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test04/Intermediate CRL 1 CP.02.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test04/Intermediate CRL 2 CP.02.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test04/Intermediate Certificate 1 CP.02.01.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test04/Intermediate Certificate 2 CP.02.01.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test04/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test04/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test05/End Certificate CP.02.02.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test05/Intermediate CRL CP.02.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test05/Intermediate Certificate CP.02.02.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test05/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test05/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test06/End Certificate CP.02.03.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test06/Intermediate CRL CP.02.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test06/Intermediate Certificate CP.02.03.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test06/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test06/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test07/End Certificate CP.02.04.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test07/Intermediate CRL CP.02.04.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test07/Intermediate Certificate CP.02.04.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test07/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test07/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test08/End Certificate CP.02.05.crtbin0 -> 652 bytes
-rw-r--r--misc/nist_tests/tests/test08/Intermediate CRL CP.02.05.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test08/Intermediate Certificate CP.02.05.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test08/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test08/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test09/End Certificate CP.03.01.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test09/Intermediate CRL CP.03.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test09/Intermediate Certificate CP.03.01.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test09/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test09/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test10/End Certificate CP.03.02.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test10/Intermediate CRL CP.03.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test10/Intermediate Certificate CP.03.02.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test10/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test10/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test11/End Certificate CP.03.03.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test11/Intermediate CRL CP.03.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test11/Intermediate Certificate CP.03.03.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test11/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test11/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test12/End Certificate CP.03.04.crtbin0 -> 652 bytes
-rw-r--r--misc/nist_tests/tests/test12/Intermediate CRL CP.03.04.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test12/Intermediate Certificate CP.03.04.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test12/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test12/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test13/End Certificate CP.04.01.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test13/Intermediate CRL CP.04.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test13/Intermediate Certificate CP.04.01.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test13/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test13/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test14/End Certificate CP.04.02.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test14/Intermediate CRL CP.04.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test14/Intermediate Certificate CP.04.02.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test14/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test14/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test15/End Certificate CP.04.03.crtbin0 -> 654 bytes
-rw-r--r--misc/nist_tests/tests/test15/Intermediate CRL CP.04.03.crlbin0 -> 341 bytes
-rw-r--r--misc/nist_tests/tests/test15/Intermediate Certificate CP.04.03.crtbin0 -> 671 bytes
-rw-r--r--misc/nist_tests/tests/test15/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test15/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test15/x14
-rw-r--r--misc/nist_tests/tests/test16/End Certificate CP.04.04.crtbin0 -> 657 bytes
-rw-r--r--misc/nist_tests/tests/test16/Intermediate CRL CP.04.04.crlbin0 -> 337 bytes
-rw-r--r--misc/nist_tests/tests/test16/Intermediate Certificate CP.04.04.crtbin0 -> 667 bytes
-rw-r--r--misc/nist_tests/tests/test16/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test16/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test17/End Certificate CP.04.05.crtbin0 -> 652 bytes
-rw-r--r--misc/nist_tests/tests/test17/Intermediate CRL CP.04.05.crlbin0 -> 337 bytes
-rw-r--r--misc/nist_tests/tests/test17/Intermediate Certificate CP.04.05.crtbin0 -> 667 bytes
-rw-r--r--misc/nist_tests/tests/test17/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test17/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test18/End Certificate CP.04.06.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test18/Intermediate CRL CP.04.06.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test18/Intermediate Certificate CP.04.06.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test18/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test18/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test19/End Certificate CP.05.01.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test19/Intermediate Certificate CP.05.01.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test19/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test19/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test20/End Certificate CP.06.01.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test20/Intermediate CRL CP.06.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test20/Intermediate Certificate CP.06.01.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test20/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test20/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test21/End Certificate CP.06.02.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test21/Intermediate CRL CP.06.02.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test21/Intermediate Certificate CP.06.02.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test21/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test21/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test22/End Certificate IC.01.01.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test22/Intermediate CRL IC.01.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test22/Intermediate Certificate IC.01.01.crtbin0 -> 648 bytes
-rw-r--r--misc/nist_tests/tests/test22/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test22/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test23/End Certificate IC.02.01.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test23/Intermediate CRL IC.02.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test23/Intermediate Certificate IC.02.01.crtbin0 -> 662 bytes
-rw-r--r--misc/nist_tests/tests/test23/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test23/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test24/End Certificate IC.02.02.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test24/Intermediate CRL IC.02.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test24/Intermediate Certificate IC.02.02.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test24/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test24/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test25/End Certificate IC.02.03.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test25/Intermediate CRL IC.02.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test25/Intermediate Certificate IC.02.03.crtbin0 -> 659 bytes
-rw-r--r--misc/nist_tests/tests/test25/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test25/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test26/End Certificate IC.02.04.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test26/Intermediate CRL IC.02.04.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test26/Intermediate Certificate IC.02.04.crtbin0 -> 662 bytes
-rw-r--r--misc/nist_tests/tests/test26/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test26/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test27/End Certificate IC.04.01.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test27/Intermediate CRL IC.04.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test27/Intermediate Certificate IC.04.01.crtbin0 -> 659 bytes
-rw-r--r--misc/nist_tests/tests/test27/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test27/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test28/End Certificate IC.05.01.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test28/Intermediate CRL IC.05.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test28/Intermediate Certificate IC.05.01.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test28/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test28/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test29/End Certificate IC.05.02.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test29/Intermediate CRL IC.05.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test29/Intermediate Certificate IC.05.02.crtbin0 -> 662 bytes
-rw-r--r--misc/nist_tests/tests/test29/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test29/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test30/End Certificate IC.05.03.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test30/Intermediate CRL IC.05.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test30/Intermediate Certificate IC.05.03.crtbin0 -> 662 bytes
-rw-r--r--misc/nist_tests/tests/test30/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test30/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test31/End Certificate IC.06.01.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test31/Intermediate CRL IC.06.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test31/Intermediate Certificate IC.06.01.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test31/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test31/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test32/End Certificate IC.06.02.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test32/Intermediate CRL IC.06.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test32/Intermediate Certificate IC.06.02.crtbin0 -> 662 bytes
-rw-r--r--misc/nist_tests/tests/test32/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test32/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test33/End Certificate IC.06.03.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test33/Intermediate CRL IC.06.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test33/Intermediate Certificate IC.06.03.crtbin0 -> 662 bytes
-rw-r--r--misc/nist_tests/tests/test33/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test33/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test34/End Certificate PP.01.01.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test34/Intermediate CRL PP.01.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test34/Intermediate Certificate PP.01.01.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test34/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test34/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test35/End Certificate PP.01.02.crtbin0 -> 626 bytes
-rw-r--r--misc/nist_tests/tests/test35/Intermediate CRL PP.01.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test35/Intermediate Certificate PP.01.02.crtbin0 -> 641 bytes
-rw-r--r--misc/nist_tests/tests/test35/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test35/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test36/End Certificate PP.01.03.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test36/Intermediate CRL 1 PP.01.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test36/Intermediate CRL 2 PP.01.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test36/Intermediate Certificate 1 PP.01.03.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test36/Intermediate Certificate 2 PP.01.03.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test36/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test36/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test37/End Certificate PP.01.04.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test37/Intermediate CRL 1 PP.01.04.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test37/Intermediate CRL 2 PP.01.04.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test37/Intermediate Certificate 1 PP.01.04.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test37/Intermediate Certificate 2 PP.01.04.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test37/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test37/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test38/End Certificate PP.01.05.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test38/Intermediate CRL 1 PP.01.05.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test38/Intermediate CRL 2 PP.01.05.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test38/Intermediate Certificate 1 PP.01.05.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test38/Intermediate Certificate 2 PP.01.05.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test38/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test38/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test39/End Certificate PP.01.06.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test39/Intermediate CRL 1 PP.01.06.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test39/Intermediate CRL 2 PP.01.06.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test39/Intermediate CRL 3 PP.01.06.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test39/Intermediate Certificate 1 PP.01.06.crtbin0 -> 706 bytes
-rw-r--r--misc/nist_tests/tests/test39/Intermediate Certificate 2 PP.01.06.crtbin0 -> 691 bytes
-rw-r--r--misc/nist_tests/tests/test39/Intermediate Certificate 3 PP.01.06.crtbin0 -> 678 bytes
-rw-r--r--misc/nist_tests/tests/test39/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test39/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test40/End Certificate PP.01.07.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test40/Intermediate CRL 1 PP.01.07.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test40/Intermediate CRL 2 PP.01.07.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test40/Intermediate CRL 3 PP.01.07.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test40/Intermediate Certificate 1 PP.01.07.crtbin0 -> 691 bytes
-rw-r--r--misc/nist_tests/tests/test40/Intermediate Certificate 2 PP.01.07.crtbin0 -> 678 bytes
-rw-r--r--misc/nist_tests/tests/test40/Intermediate Certificate 3 PP.01.07.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test40/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test40/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test41/End Certificate PP.01.08.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test41/Intermediate CRL 1 PP.01.08.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test41/Intermediate CRL 2 PP.01.08.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test41/Intermediate CRL 3 PP.01.08.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test41/Intermediate Certificate 1 PP.01.08.crtbin0 -> 678 bytes
-rw-r--r--misc/nist_tests/tests/test41/Intermediate Certificate 2 PP.01.08.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test41/Intermediate Certificate 3 PP.01.08.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test41/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test41/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test42/End Certificate PP.01.09.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test42/Intermediate CRL 1 PP.01.09.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test42/Intermediate CRL 2 PP.01.09.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test42/Intermediate CRL 3 PP.01.09.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test42/Intermediate CRL 4 PP.01.09.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test42/Intermediate Certificate 1 PP.01.09.crtbin0 -> 691 bytes
-rw-r--r--misc/nist_tests/tests/test42/Intermediate Certificate 2 PP.01.09.crtbin0 -> 678 bytes
-rw-r--r--misc/nist_tests/tests/test42/Intermediate Certificate 3 PP.01.09.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test42/Intermediate Certificate 4 PP.01.09.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test42/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test42/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test43/End Certificate PP.06.01.crtbin0 -> 626 bytes
-rw-r--r--misc/nist_tests/tests/test43/Intermediate CRL 1 PP.06.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test43/Intermediate CRL 2 PP.06.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test43/Intermediate CRL 3 PP.06.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test43/Intermediate CRL 4 PP.06.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test43/Intermediate Certificate 1 PP.06.01.crtbin0 -> 679 bytes
-rw-r--r--misc/nist_tests/tests/test43/Intermediate Certificate 2 PP.06.01.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test43/Intermediate Certificate 3 PP.06.01.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test43/Intermediate Certificate 4 PP.06.01.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test43/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test43/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test44/End Certificate PP.06.02.crtbin0 -> 626 bytes
-rw-r--r--misc/nist_tests/tests/test44/Intermediate CRL 1 PP.06.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test44/Intermediate CRL 2 PP.06.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test44/Intermediate CRL 3 PP.06.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test44/Intermediate CRL 4 PP.06.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test44/Intermediate Certificate 1 PP.06.02.crtbin0 -> 679 bytes
-rw-r--r--misc/nist_tests/tests/test44/Intermediate Certificate 2 PP.06.02.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test44/Intermediate Certificate 3 PP.06.02.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test44/Intermediate Certificate 4 PP.06.02.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test44/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test44/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test45/End Certificate PP.06.03.crtbin0 -> 626 bytes
-rw-r--r--misc/nist_tests/tests/test45/Intermediate CRL 1 PP.06.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test45/Intermediate CRL 2 PP.06.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test45/Intermediate CRL 3 PP.06.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test45/Intermediate CRL 4 PP.06.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test45/Intermediate Certificate 1 PP.06.03.crtbin0 -> 679 bytes
-rw-r--r--misc/nist_tests/tests/test45/Intermediate Certificate 2 PP.06.03.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test45/Intermediate Certificate 3 PP.06.03.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test45/Intermediate Certificate 4 PP.06.03.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test45/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test45/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test46/End Certificate PP.06.04.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test46/Intermediate CRL 1 PP.06.04.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test46/Intermediate CRL 2 PP.06.04.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test46/Intermediate CRL 3 PP.06.04.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test46/Intermediate CRL 4 PP.06.04.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test46/Intermediate Certificate 1 PP.06.04.crtbin0 -> 679 bytes
-rw-r--r--misc/nist_tests/tests/test46/Intermediate Certificate 2 PP.06.04.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test46/Intermediate Certificate 3 PP.06.04.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test46/Intermediate Certificate 4 PP.06.04.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test46/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test46/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test47/End Certificate PP.06.05.crtbin0 -> 626 bytes
-rw-r--r--misc/nist_tests/tests/test47/Intermediate CRL 1 PP.06.05.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test47/Intermediate CRL 2 PP.06.05.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test47/Intermediate CRL 3 PP.06.05.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test47/Intermediate CRL 4 PP.06.05.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test47/Intermediate Certificate 1 PP.06.05.crtbin0 -> 679 bytes
-rw-r--r--misc/nist_tests/tests/test47/Intermediate Certificate 2 PP.06.05.crtbin0 -> 679 bytes
-rw-r--r--misc/nist_tests/tests/test47/Intermediate Certificate 3 PP.06.05.crtbin0 -> 679 bytes
-rw-r--r--misc/nist_tests/tests/test47/Intermediate Certificate 4 PP.06.05.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test47/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test47/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test48/End Certificate PP.08.01.crtbin0 -> 650 bytes
-rw-r--r--misc/nist_tests/tests/test48/Intermediate CRL PP.08.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test48/Intermediate Certificate PP.08.01.crtbin0 -> 665 bytes
-rw-r--r--misc/nist_tests/tests/test48/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test48/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test49/End Certificate PP.08.02.crtbin0 -> 663 bytes
-rw-r--r--misc/nist_tests/tests/test49/Intermediate CRL PP.08.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test49/Intermediate Certificate PP.08.02.crtbin0 -> 678 bytes
-rw-r--r--misc/nist_tests/tests/test49/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test49/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test50/End Certificate PP.08.03.crtbin0 -> 645 bytes
-rw-r--r--misc/nist_tests/tests/test50/Intermediate CRL PP.08.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test50/Intermediate Certificate PP.08.03.crtbin0 -> 660 bytes
-rw-r--r--misc/nist_tests/tests/test50/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test50/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test51/End Certificate PP.08.04.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test51/Intermediate CRL PP.08.04.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test51/Intermediate Certificate PP.08.04.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test51/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test51/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test52/End Certificate PP.08.05.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test52/Intermediate CRL PP.08.05.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test52/Intermediate Certificate PP.08.05.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test52/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test52/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test53/End Certificate PP.08.06.crtbin0 -> 677 bytes
-rw-r--r--misc/nist_tests/tests/test53/Intermediate CRL PP.08.06.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test53/Intermediate Certificate PP.08.06.crtbin0 -> 692 bytes
-rw-r--r--misc/nist_tests/tests/test53/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test53/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test54/End Certificate PL.01.01.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test54/Intermediate CRL 1 PL.01.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test54/Intermediate CRL 2 PL.01.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test54/Intermediate Certificate 1 PL.01.01.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test54/Intermediate Certificate 2 PL.01.01.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test54/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test54/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test55/End Certificate PL.01.02.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test55/Intermediate CRL 1 PL.01.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test55/Intermediate CRL 2 PL.01.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test55/Intermediate Certificate 1 PL.01.02.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test55/Intermediate Certificate 2 PL.01.02.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test55/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test55/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test56/End Certificate PL.01.03.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test56/Intermediate CRL PL.01.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test56/Intermediate Certificate PL.01.03.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test56/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test56/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test57/End Certificate PL.01.04.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test57/Intermediate CRL PL.01.04.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test57/Intermediate Certificate PL.01.04.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test57/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test57/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test58/End Certificate PL.01.05.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test58/Intermediate CRL 1 PL.01.05.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test58/Intermediate CRL 2 PL.01.05.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test58/Intermediate CRL 3 PL.01.05.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test58/Intermediate Certificate 1 PL.01.05.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test58/Intermediate Certificate 2 PL.01.05.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test58/Intermediate Certificate 3 PL.01.05.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test58/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test58/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test59/End Certificate PL.01.06.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test59/Intermediate CRL 1 PL.01.06.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test59/Intermediate CRL 2 PL.01.06.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test59/Intermediate CRL 3 PL.01.06.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test59/Intermediate Certificate 1 PL.01.06.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test59/Intermediate Certificate 2 PL.01.06.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test59/Intermediate Certificate 3 PL.01.06.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test59/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test59/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test60/End Certificate PL.01.07.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test60/Intermediate CRL 1 PL.01.07.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test60/Intermediate CRL 2 PL.01.07.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test60/Intermediate CRL 3 PL.01.07.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test60/Intermediate CRL 4 PL.01.07.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test60/Intermediate Certificate 1 PL.01.07.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test60/Intermediate Certificate 2 PL.01.07.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test60/Intermediate Certificate 3 PL.01.07.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test60/Intermediate Certificate 4 PL.01.07.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test60/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test60/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test61/End Certificate PL.01.08.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test61/Intermediate CRL 1 PL.01.08.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test61/Intermediate CRL 2 PL.01.08.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test61/Intermediate CRL 3 PL.01.08.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test61/Intermediate CRL 4 PL.01.08.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test61/Intermediate Certificate 1 PL.01.08.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test61/Intermediate Certificate 2 PL.01.08.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test61/Intermediate Certificate 3 PL.01.08.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test61/Intermediate Certificate 4 PL.01.08.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test61/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test61/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test62/End Certificate PL.01.09.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test62/Intermediate CRL 1 PL.01.09.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test62/Intermediate CRL 2 PL.01.09.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test62/Intermediate CRL 3 PL.01.09.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test62/Intermediate CRL 4 PL.01.09.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test62/Intermediate Certificate 1 PL.01.09.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test62/Intermediate Certificate 2 PL.01.09.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test62/Intermediate Certificate 3 PL.01.09.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test62/Intermediate Certificate 4 PL.01.09.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test62/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test62/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test63/End Certificate PL.01.10.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test63/Intermediate CRL 1 PL.01.10.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test63/Intermediate CRL 2 PL.01.10.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test63/Intermediate CRL 3 PL.01.10.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test63/Intermediate CRL 4 PL.01.10.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test63/Intermediate Certificate 1 PL.01.10.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test63/Intermediate Certificate 2 PL.01.10.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test63/Intermediate Certificate 3 PL.01.10.crtbin0 -> 669 bytes
-rw-r--r--misc/nist_tests/tests/test63/Intermediate Certificate 4 PL.01.10.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test63/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test63/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test64/End Certificate RL.02.01.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test64/Intermediate CRL RL.02.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test64/Intermediate Certificate RL.02.01.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test64/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test64/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test65/End Certificate RL.03.01.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test65/Intermediate CRL RL.03.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test65/Intermediate Certificate 1 RL.03.01.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test65/Intermediate Certificate 2 RL.03.01.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test65/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test65/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test66/End Certificate RL.03.02.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test66/Intermediate CRL RL.03.02.crlbin0 -> 372 bytes
-rw-r--r--misc/nist_tests/tests/test66/Intermediate Certificate RL.03.02.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test66/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test66/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test67/End Certificate RL.03.03.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test67/Intermediate CRL 1 RL.03.03.crlbin0 -> 372 bytes
-rw-r--r--misc/nist_tests/tests/test67/Intermediate CRL 2 RL.03.03.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test67/Intermediate Certificate RL.03.03.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test67/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test67/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test68/End Certificate RL.05.01.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test68/Intermediate CRL 1 RL.05.01.crlbin0 -> 393 bytes
-rw-r--r--misc/nist_tests/tests/test68/Intermediate CRL 2 RL.05.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test68/Intermediate Certificate 1 RL.05.01.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test68/Intermediate Certificate 2 RL.05.01.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test68/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test68/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test69/End Certificate RL.05.02.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test69/Intermediate CRL RL.05.02.crlbin0 -> 393 bytes
-rw-r--r--misc/nist_tests/tests/test69/Intermediate Certificate RL.05.02.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test69/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test69/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test70/End Certificate RL.06.01.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test70/Intermediate CRL 1 RL.06.01.crlbin0 -> 393 bytes
-rw-r--r--misc/nist_tests/tests/test70/Intermediate CRL 2 RL.06.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test70/Intermediate Certificate 1 RL.06.01.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test70/Intermediate Certificate 2 RL.06.01.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test70/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test70/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test71/End Certificate RL.06.02.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test71/Intermediate CRL RL.06.02.crlbin0 -> 393 bytes
-rw-r--r--misc/nist_tests/tests/test71/Intermediate Certificate RL.06.02.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test71/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test71/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test72/End Certificate RL.07.01.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test72/Intermediate CRL RL.07.01.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test72/Intermediate Certificate RL.07.01.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test72/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test72/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test73/End Certificate RL.07.02.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test73/Intermediate CRL RL.07.02.crlbin0 -> 335 bytes
-rw-r--r--misc/nist_tests/tests/test73/Intermediate Certificate RL.07.02.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test73/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test73/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test74/End Certificate RL.07.03.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test74/Intermediate CRL RL.07.03.crlbin0 -> 337 bytes
-rw-r--r--misc/nist_tests/tests/test74/Intermediate Certificate RL.07.03.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test74/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test74/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test75/End Certificate RL.08.01.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test75/Intermediate CRL RL.08.01.crlbin0 -> 350 bytes
-rw-r--r--misc/nist_tests/tests/test75/Intermediate Certificate RL.08.01.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test75/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test75/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/tests/test76/End Certificate RL.09.01.crtbin0 -> 651 bytes
-rw-r--r--misc/nist_tests/tests/test76/Intermediate CRL RL.09.01.crlbin0 -> 352 bytes
-rw-r--r--misc/nist_tests/tests/test76/Intermediate Certificate RL.09.01.crtbin0 -> 666 bytes
-rw-r--r--misc/nist_tests/tests/test76/Trust Anchor CP.01.01.crtbin0 -> 624 bytes
-rw-r--r--misc/nist_tests/tests/test76/Trust Anchor CRL CP.01.01.crlbin0 -> 371 bytes
-rw-r--r--misc/nist_tests/x509test.cpp411
480 files changed, 476 insertions, 0 deletions
diff --git a/misc/nist_tests/Makefile b/misc/nist_tests/Makefile
new file mode 100644
index 000000000..6d0ebb78f
--- /dev/null
+++ b/misc/nist_tests/Makefile
@@ -0,0 +1,13 @@
+
+BOTAN_CONFIG=botan-config
+
+CC=g++
+FLAGS=-g -Os -W -Wall -ansi
+LDFLAGS=$(shell $(BOTAN_CONFIG) --libs)
+CFLAGS=$(shell $(BOTAN_CONFIG) --cflags)
+
+x509test: x509test.cpp
+ $(CC) $(FLAGS) $(CFLAGS) x509test.cpp $(LDFLAGS) -o x509test
+
+clean:
+ rm -f x509test
diff --git a/misc/nist_tests/failure.txt b/misc/nist_tests/failure.txt
new file mode 100644
index 000000000..0166e0ee6
--- /dev/null
+++ b/misc/nist_tests/failure.txt
@@ -0,0 +1,12 @@
+Known Failures/Problems
+
+Policy extensions are not implemented, so we skip tests #34-#53.
+
+Tests #75 and #76 are skipped as they make use of relatively obscure CRL
+extensions which are not supported.
+
+In addition, please note that some of the tests have their results altered from
+what the test result should be according to NIST's documentation. The changes
+are clearly marked (see x509test.cpp; search for "CHANGE OF TEST RESULT") and
+there are comments explaining why the results where changed. Currently, tests
+#19, #65, and #67 have had their results changed from the official results.
diff --git a/misc/nist_tests/readme.txt b/misc/nist_tests/readme.txt
new file mode 100644
index 000000000..b992a5b30
--- /dev/null
+++ b/misc/nist_tests/readme.txt
@@ -0,0 +1,26 @@
+
+This package contains a program to exercise Botan's path validation
+algorithm, as contained in the X509_Store object. The data used is
+NIST's X.509v3 certificate path validation testing data, as found on
+NIST's web site (version 1.0.7 of the testing data is currently
+used). The PKCS #7 and PKCS #12 data files have been removed, as they
+are not used in this test.
+
+Currently, some tests fail or are not be run for various reasons (in
+particular, we don't have support policy extensions yet, so that
+excludes running a good number of the tests). Even if all of the tests
+DO pass, that does not imply that Botan's path validation and
+certificate processing code is bug free, as there are many (*very
+many*) possible options in X.509 which this testing data does not make
+use of at all. However, it is helpful for implementation testing and
+assurance (I have found a good number of bugs using these tests).
+
+Currently, we do not make use of the S/MIME or PKCS #12 testing data
+contained in these tests, because Botan does not support either of
+these standards.
+
+To use this, compile x509test.cpp, and run the resulting
+executable. The results are written to standard output. Your system
+must have a POSIX.1 dirent.h, and the code assumes Unix-style paths.
+
+Email me with any questions or comments about these tests.
diff --git a/misc/nist_tests/tests/test01/End Certificate CP.01.01.crt b/misc/nist_tests/tests/test01/End Certificate CP.01.01.crt
new file mode 100644
index 000000000..d7e64d6de
--- /dev/null
+++ b/misc/nist_tests/tests/test01/End Certificate CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test01/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test01/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test01/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test01/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test01/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test01/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test02/End Certificate CP.01.02.crt b/misc/nist_tests/tests/test02/End Certificate CP.01.02.crt
new file mode 100644
index 000000000..f97da0509
--- /dev/null
+++ b/misc/nist_tests/tests/test02/End Certificate CP.01.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test02/Intermediate CRL CP.01.02.crl b/misc/nist_tests/tests/test02/Intermediate CRL CP.01.02.crl
new file mode 100644
index 000000000..e7dfa96ee
--- /dev/null
+++ b/misc/nist_tests/tests/test02/Intermediate CRL CP.01.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test02/Intermediate Certificate CP.01.02.crt b/misc/nist_tests/tests/test02/Intermediate Certificate CP.01.02.crt
new file mode 100644
index 000000000..0aba75048
--- /dev/null
+++ b/misc/nist_tests/tests/test02/Intermediate Certificate CP.01.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test02/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test02/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test02/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test02/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test02/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test02/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test03/End Certificate CP.01.03.crt b/misc/nist_tests/tests/test03/End Certificate CP.01.03.crt
new file mode 100644
index 000000000..9b0463a67
--- /dev/null
+++ b/misc/nist_tests/tests/test03/End Certificate CP.01.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test03/Intermediate CRL CP.01.03.crl b/misc/nist_tests/tests/test03/Intermediate CRL CP.01.03.crl
new file mode 100644
index 000000000..528f3237c
--- /dev/null
+++ b/misc/nist_tests/tests/test03/Intermediate CRL CP.01.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test03/Intermediate Certificate CP.01.03.crt b/misc/nist_tests/tests/test03/Intermediate Certificate CP.01.03.crt
new file mode 100644
index 000000000..c8cfc0550
--- /dev/null
+++ b/misc/nist_tests/tests/test03/Intermediate Certificate CP.01.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test03/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test03/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test03/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test03/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test03/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test03/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test04/End Certificate CP.02.01.crt b/misc/nist_tests/tests/test04/End Certificate CP.02.01.crt
new file mode 100644
index 000000000..75d2fd50e
--- /dev/null
+++ b/misc/nist_tests/tests/test04/End Certificate CP.02.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test04/Intermediate CRL 1 CP.02.01.crl b/misc/nist_tests/tests/test04/Intermediate CRL 1 CP.02.01.crl
new file mode 100644
index 000000000..2f30c77b5
--- /dev/null
+++ b/misc/nist_tests/tests/test04/Intermediate CRL 1 CP.02.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test04/Intermediate CRL 2 CP.02.01.crl b/misc/nist_tests/tests/test04/Intermediate CRL 2 CP.02.01.crl
new file mode 100644
index 000000000..e8596c314
--- /dev/null
+++ b/misc/nist_tests/tests/test04/Intermediate CRL 2 CP.02.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test04/Intermediate Certificate 1 CP.02.01.crt b/misc/nist_tests/tests/test04/Intermediate Certificate 1 CP.02.01.crt
new file mode 100644
index 000000000..f4e88d58c
--- /dev/null
+++ b/misc/nist_tests/tests/test04/Intermediate Certificate 1 CP.02.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test04/Intermediate Certificate 2 CP.02.01.crt b/misc/nist_tests/tests/test04/Intermediate Certificate 2 CP.02.01.crt
new file mode 100644
index 000000000..727035b6c
--- /dev/null
+++ b/misc/nist_tests/tests/test04/Intermediate Certificate 2 CP.02.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test04/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test04/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test04/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test04/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test04/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test04/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test05/End Certificate CP.02.02.crt b/misc/nist_tests/tests/test05/End Certificate CP.02.02.crt
new file mode 100644
index 000000000..a3a658923
--- /dev/null
+++ b/misc/nist_tests/tests/test05/End Certificate CP.02.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test05/Intermediate CRL CP.02.02.crl b/misc/nist_tests/tests/test05/Intermediate CRL CP.02.02.crl
new file mode 100644
index 000000000..a34ef279b
--- /dev/null
+++ b/misc/nist_tests/tests/test05/Intermediate CRL CP.02.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test05/Intermediate Certificate CP.02.02.crt b/misc/nist_tests/tests/test05/Intermediate Certificate CP.02.02.crt
new file mode 100644
index 000000000..610df750e
--- /dev/null
+++ b/misc/nist_tests/tests/test05/Intermediate Certificate CP.02.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test05/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test05/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test05/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test05/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test05/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test05/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test06/End Certificate CP.02.03.crt b/misc/nist_tests/tests/test06/End Certificate CP.02.03.crt
new file mode 100644
index 000000000..1e68f0de1
--- /dev/null
+++ b/misc/nist_tests/tests/test06/End Certificate CP.02.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test06/Intermediate CRL CP.02.03.crl b/misc/nist_tests/tests/test06/Intermediate CRL CP.02.03.crl
new file mode 100644
index 000000000..d87cd7e26
--- /dev/null
+++ b/misc/nist_tests/tests/test06/Intermediate CRL CP.02.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test06/Intermediate Certificate CP.02.03.crt b/misc/nist_tests/tests/test06/Intermediate Certificate CP.02.03.crt
new file mode 100644
index 000000000..5bb74d259
--- /dev/null
+++ b/misc/nist_tests/tests/test06/Intermediate Certificate CP.02.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test06/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test06/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test06/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test06/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test06/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test06/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test07/End Certificate CP.02.04.crt b/misc/nist_tests/tests/test07/End Certificate CP.02.04.crt
new file mode 100644
index 000000000..0f97e6f5a
--- /dev/null
+++ b/misc/nist_tests/tests/test07/End Certificate CP.02.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test07/Intermediate CRL CP.02.04.crl b/misc/nist_tests/tests/test07/Intermediate CRL CP.02.04.crl
new file mode 100644
index 000000000..8064e91bc
--- /dev/null
+++ b/misc/nist_tests/tests/test07/Intermediate CRL CP.02.04.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test07/Intermediate Certificate CP.02.04.crt b/misc/nist_tests/tests/test07/Intermediate Certificate CP.02.04.crt
new file mode 100644
index 000000000..5c1ddd3e3
--- /dev/null
+++ b/misc/nist_tests/tests/test07/Intermediate Certificate CP.02.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test07/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test07/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test07/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test07/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test07/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test07/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test08/End Certificate CP.02.05.crt b/misc/nist_tests/tests/test08/End Certificate CP.02.05.crt
new file mode 100644
index 000000000..cb99c2ac5
--- /dev/null
+++ b/misc/nist_tests/tests/test08/End Certificate CP.02.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test08/Intermediate CRL CP.02.05.crl b/misc/nist_tests/tests/test08/Intermediate CRL CP.02.05.crl
new file mode 100644
index 000000000..d5ee3c3ce
--- /dev/null
+++ b/misc/nist_tests/tests/test08/Intermediate CRL CP.02.05.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test08/Intermediate Certificate CP.02.05.crt b/misc/nist_tests/tests/test08/Intermediate Certificate CP.02.05.crt
new file mode 100644
index 000000000..d26979cdd
--- /dev/null
+++ b/misc/nist_tests/tests/test08/Intermediate Certificate CP.02.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test08/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test08/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test08/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test08/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test08/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test08/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test09/End Certificate CP.03.01.crt b/misc/nist_tests/tests/test09/End Certificate CP.03.01.crt
new file mode 100644
index 000000000..4dd2352b4
--- /dev/null
+++ b/misc/nist_tests/tests/test09/End Certificate CP.03.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test09/Intermediate CRL CP.03.01.crl b/misc/nist_tests/tests/test09/Intermediate CRL CP.03.01.crl
new file mode 100644
index 000000000..fbd85145c
--- /dev/null
+++ b/misc/nist_tests/tests/test09/Intermediate CRL CP.03.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test09/Intermediate Certificate CP.03.01.crt b/misc/nist_tests/tests/test09/Intermediate Certificate CP.03.01.crt
new file mode 100644
index 000000000..c107dd756
--- /dev/null
+++ b/misc/nist_tests/tests/test09/Intermediate Certificate CP.03.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test09/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test09/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test09/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test09/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test09/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test09/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test10/End Certificate CP.03.02.crt b/misc/nist_tests/tests/test10/End Certificate CP.03.02.crt
new file mode 100644
index 000000000..de3924003
--- /dev/null
+++ b/misc/nist_tests/tests/test10/End Certificate CP.03.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test10/Intermediate CRL CP.03.02.crl b/misc/nist_tests/tests/test10/Intermediate CRL CP.03.02.crl
new file mode 100644
index 000000000..daefd50c8
--- /dev/null
+++ b/misc/nist_tests/tests/test10/Intermediate CRL CP.03.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test10/Intermediate Certificate CP.03.02.crt b/misc/nist_tests/tests/test10/Intermediate Certificate CP.03.02.crt
new file mode 100644
index 000000000..2d691abce
--- /dev/null
+++ b/misc/nist_tests/tests/test10/Intermediate Certificate CP.03.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test10/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test10/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test10/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test10/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test10/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test10/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test11/End Certificate CP.03.03.crt b/misc/nist_tests/tests/test11/End Certificate CP.03.03.crt
new file mode 100644
index 000000000..6e14527d2
--- /dev/null
+++ b/misc/nist_tests/tests/test11/End Certificate CP.03.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test11/Intermediate CRL CP.03.03.crl b/misc/nist_tests/tests/test11/Intermediate CRL CP.03.03.crl
new file mode 100644
index 000000000..cc91ad51d
--- /dev/null
+++ b/misc/nist_tests/tests/test11/Intermediate CRL CP.03.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test11/Intermediate Certificate CP.03.03.crt b/misc/nist_tests/tests/test11/Intermediate Certificate CP.03.03.crt
new file mode 100644
index 000000000..87fa07962
--- /dev/null
+++ b/misc/nist_tests/tests/test11/Intermediate Certificate CP.03.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test11/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test11/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test11/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test11/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test11/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test11/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test12/End Certificate CP.03.04.crt b/misc/nist_tests/tests/test12/End Certificate CP.03.04.crt
new file mode 100644
index 000000000..158c6ae01
--- /dev/null
+++ b/misc/nist_tests/tests/test12/End Certificate CP.03.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test12/Intermediate CRL CP.03.04.crl b/misc/nist_tests/tests/test12/Intermediate CRL CP.03.04.crl
new file mode 100644
index 000000000..7ce6928bb
--- /dev/null
+++ b/misc/nist_tests/tests/test12/Intermediate CRL CP.03.04.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test12/Intermediate Certificate CP.03.04.crt b/misc/nist_tests/tests/test12/Intermediate Certificate CP.03.04.crt
new file mode 100644
index 000000000..a55333b63
--- /dev/null
+++ b/misc/nist_tests/tests/test12/Intermediate Certificate CP.03.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test12/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test12/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test12/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test12/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test12/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test12/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test13/End Certificate CP.04.01.crt b/misc/nist_tests/tests/test13/End Certificate CP.04.01.crt
new file mode 100644
index 000000000..d1ddf4b44
--- /dev/null
+++ b/misc/nist_tests/tests/test13/End Certificate CP.04.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test13/Intermediate CRL CP.04.01.crl b/misc/nist_tests/tests/test13/Intermediate CRL CP.04.01.crl
new file mode 100644
index 000000000..df86506d8
--- /dev/null
+++ b/misc/nist_tests/tests/test13/Intermediate CRL CP.04.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test13/Intermediate Certificate CP.04.01.crt b/misc/nist_tests/tests/test13/Intermediate Certificate CP.04.01.crt
new file mode 100644
index 000000000..abc6fe537
--- /dev/null
+++ b/misc/nist_tests/tests/test13/Intermediate Certificate CP.04.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test13/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test13/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test13/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test13/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test13/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test13/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test14/End Certificate CP.04.02.crt b/misc/nist_tests/tests/test14/End Certificate CP.04.02.crt
new file mode 100644
index 000000000..f43e03826
--- /dev/null
+++ b/misc/nist_tests/tests/test14/End Certificate CP.04.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test14/Intermediate CRL CP.04.02.crl b/misc/nist_tests/tests/test14/Intermediate CRL CP.04.02.crl
new file mode 100644
index 000000000..ae372f38b
--- /dev/null
+++ b/misc/nist_tests/tests/test14/Intermediate CRL CP.04.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test14/Intermediate Certificate CP.04.02.crt b/misc/nist_tests/tests/test14/Intermediate Certificate CP.04.02.crt
new file mode 100644
index 000000000..6e97ee2b8
--- /dev/null
+++ b/misc/nist_tests/tests/test14/Intermediate Certificate CP.04.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test14/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test14/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test14/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test14/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test14/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test14/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test15/End Certificate CP.04.03.crt b/misc/nist_tests/tests/test15/End Certificate CP.04.03.crt
new file mode 100644
index 000000000..a2408315c
--- /dev/null
+++ b/misc/nist_tests/tests/test15/End Certificate CP.04.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test15/Intermediate CRL CP.04.03.crl b/misc/nist_tests/tests/test15/Intermediate CRL CP.04.03.crl
new file mode 100644
index 000000000..626049aaf
--- /dev/null
+++ b/misc/nist_tests/tests/test15/Intermediate CRL CP.04.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test15/Intermediate Certificate CP.04.03.crt b/misc/nist_tests/tests/test15/Intermediate Certificate CP.04.03.crt
new file mode 100644
index 000000000..23fb78c0f
--- /dev/null
+++ b/misc/nist_tests/tests/test15/Intermediate Certificate CP.04.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test15/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test15/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test15/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test15/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test15/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test15/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test15/x b/misc/nist_tests/tests/test15/x
new file mode 100644
index 000000000..2ef4223aa
--- /dev/null
+++ b/misc/nist_tests/tests/test15/x
@@ -0,0 +1,14 @@
+Subject
+ Name: User1-CP.04.03
+ Organization: U.S. Government
+ Organizational Unit: DoD Testing
+ Country: US
+Issuer
+ Name: ca1 - CP.04.03
+ Organization: U.S. Government
+ Organizational Unit: Dod Testing
+ Country: US
+Validity
+ Not before: 1998/1/1 12:01:00 UTC
+ Not after: 2048/1/1 12:01:00 UTC
+Signature algorithm: RSA/EMSA3(SHA-160)
diff --git a/misc/nist_tests/tests/test16/End Certificate CP.04.04.crt b/misc/nist_tests/tests/test16/End Certificate CP.04.04.crt
new file mode 100644
index 000000000..108a75d73
--- /dev/null
+++ b/misc/nist_tests/tests/test16/End Certificate CP.04.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test16/Intermediate CRL CP.04.04.crl b/misc/nist_tests/tests/test16/Intermediate CRL CP.04.04.crl
new file mode 100644
index 000000000..d345a338e
--- /dev/null
+++ b/misc/nist_tests/tests/test16/Intermediate CRL CP.04.04.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test16/Intermediate Certificate CP.04.04.crt b/misc/nist_tests/tests/test16/Intermediate Certificate CP.04.04.crt
new file mode 100644
index 000000000..6f2a332ad
--- /dev/null
+++ b/misc/nist_tests/tests/test16/Intermediate Certificate CP.04.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test16/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test16/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test16/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test16/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test16/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test16/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test17/End Certificate CP.04.05.crt b/misc/nist_tests/tests/test17/End Certificate CP.04.05.crt
new file mode 100644
index 000000000..b90340872
--- /dev/null
+++ b/misc/nist_tests/tests/test17/End Certificate CP.04.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test17/Intermediate CRL CP.04.05.crl b/misc/nist_tests/tests/test17/Intermediate CRL CP.04.05.crl
new file mode 100644
index 000000000..0b1ba6fda
--- /dev/null
+++ b/misc/nist_tests/tests/test17/Intermediate CRL CP.04.05.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test17/Intermediate Certificate CP.04.05.crt b/misc/nist_tests/tests/test17/Intermediate Certificate CP.04.05.crt
new file mode 100644
index 000000000..25e7b48e5
--- /dev/null
+++ b/misc/nist_tests/tests/test17/Intermediate Certificate CP.04.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test17/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test17/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test17/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test17/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test17/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test17/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test18/End Certificate CP.04.06.crt b/misc/nist_tests/tests/test18/End Certificate CP.04.06.crt
new file mode 100644
index 000000000..2edb51394
--- /dev/null
+++ b/misc/nist_tests/tests/test18/End Certificate CP.04.06.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test18/Intermediate CRL CP.04.06.crl b/misc/nist_tests/tests/test18/Intermediate CRL CP.04.06.crl
new file mode 100644
index 000000000..2948246d7
--- /dev/null
+++ b/misc/nist_tests/tests/test18/Intermediate CRL CP.04.06.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test18/Intermediate Certificate CP.04.06.crt b/misc/nist_tests/tests/test18/Intermediate Certificate CP.04.06.crt
new file mode 100644
index 000000000..eac3e8693
--- /dev/null
+++ b/misc/nist_tests/tests/test18/Intermediate Certificate CP.04.06.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test18/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test18/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test18/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test18/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test18/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test18/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test19/End Certificate CP.05.01.crt b/misc/nist_tests/tests/test19/End Certificate CP.05.01.crt
new file mode 100644
index 000000000..a9c7a1fc6
--- /dev/null
+++ b/misc/nist_tests/tests/test19/End Certificate CP.05.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test19/Intermediate Certificate CP.05.01.crt b/misc/nist_tests/tests/test19/Intermediate Certificate CP.05.01.crt
new file mode 100644
index 000000000..eff60dd15
--- /dev/null
+++ b/misc/nist_tests/tests/test19/Intermediate Certificate CP.05.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test19/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test19/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test19/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test19/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test19/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test19/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test20/End Certificate CP.06.01.crt b/misc/nist_tests/tests/test20/End Certificate CP.06.01.crt
new file mode 100644
index 000000000..b26e77c19
--- /dev/null
+++ b/misc/nist_tests/tests/test20/End Certificate CP.06.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test20/Intermediate CRL CP.06.01.crl b/misc/nist_tests/tests/test20/Intermediate CRL CP.06.01.crl
new file mode 100644
index 000000000..5755a2eae
--- /dev/null
+++ b/misc/nist_tests/tests/test20/Intermediate CRL CP.06.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test20/Intermediate Certificate CP.06.01.crt b/misc/nist_tests/tests/test20/Intermediate Certificate CP.06.01.crt
new file mode 100644
index 000000000..d7daa69ef
--- /dev/null
+++ b/misc/nist_tests/tests/test20/Intermediate Certificate CP.06.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test20/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test20/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test20/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test20/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test20/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test20/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test21/End Certificate CP.06.02.crt b/misc/nist_tests/tests/test21/End Certificate CP.06.02.crt
new file mode 100644
index 000000000..798e5cf17
--- /dev/null
+++ b/misc/nist_tests/tests/test21/End Certificate CP.06.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test21/Intermediate CRL CP.06.02.crl b/misc/nist_tests/tests/test21/Intermediate CRL CP.06.02.crl
new file mode 100644
index 000000000..ea3cbb9d8
--- /dev/null
+++ b/misc/nist_tests/tests/test21/Intermediate CRL CP.06.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test21/Intermediate Certificate CP.06.02.crt b/misc/nist_tests/tests/test21/Intermediate Certificate CP.06.02.crt
new file mode 100644
index 000000000..9082c4d77
--- /dev/null
+++ b/misc/nist_tests/tests/test21/Intermediate Certificate CP.06.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test21/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test21/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test21/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test21/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test21/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test21/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test22/End Certificate IC.01.01.crt b/misc/nist_tests/tests/test22/End Certificate IC.01.01.crt
new file mode 100644
index 000000000..d130c7506
--- /dev/null
+++ b/misc/nist_tests/tests/test22/End Certificate IC.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test22/Intermediate CRL IC.01.01.crl b/misc/nist_tests/tests/test22/Intermediate CRL IC.01.01.crl
new file mode 100644
index 000000000..07e18398d
--- /dev/null
+++ b/misc/nist_tests/tests/test22/Intermediate CRL IC.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test22/Intermediate Certificate IC.01.01.crt b/misc/nist_tests/tests/test22/Intermediate Certificate IC.01.01.crt
new file mode 100644
index 000000000..d0f401bae
--- /dev/null
+++ b/misc/nist_tests/tests/test22/Intermediate Certificate IC.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test22/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test22/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test22/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test22/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test22/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test22/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test23/End Certificate IC.02.01.crt b/misc/nist_tests/tests/test23/End Certificate IC.02.01.crt
new file mode 100644
index 000000000..787941b16
--- /dev/null
+++ b/misc/nist_tests/tests/test23/End Certificate IC.02.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test23/Intermediate CRL IC.02.01.crl b/misc/nist_tests/tests/test23/Intermediate CRL IC.02.01.crl
new file mode 100644
index 000000000..2841be769
--- /dev/null
+++ b/misc/nist_tests/tests/test23/Intermediate CRL IC.02.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test23/Intermediate Certificate IC.02.01.crt b/misc/nist_tests/tests/test23/Intermediate Certificate IC.02.01.crt
new file mode 100644
index 000000000..2890b3967
--- /dev/null
+++ b/misc/nist_tests/tests/test23/Intermediate Certificate IC.02.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test23/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test23/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test23/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test23/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test23/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test23/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test24/End Certificate IC.02.02.crt b/misc/nist_tests/tests/test24/End Certificate IC.02.02.crt
new file mode 100644
index 000000000..0d145b2fa
--- /dev/null
+++ b/misc/nist_tests/tests/test24/End Certificate IC.02.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test24/Intermediate CRL IC.02.02.crl b/misc/nist_tests/tests/test24/Intermediate CRL IC.02.02.crl
new file mode 100644
index 000000000..f608de6bb
--- /dev/null
+++ b/misc/nist_tests/tests/test24/Intermediate CRL IC.02.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test24/Intermediate Certificate IC.02.02.crt b/misc/nist_tests/tests/test24/Intermediate Certificate IC.02.02.crt
new file mode 100644
index 000000000..a4633ee9a
--- /dev/null
+++ b/misc/nist_tests/tests/test24/Intermediate Certificate IC.02.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test24/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test24/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test24/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test24/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test24/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test24/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test25/End Certificate IC.02.03.crt b/misc/nist_tests/tests/test25/End Certificate IC.02.03.crt
new file mode 100644
index 000000000..d12670188
--- /dev/null
+++ b/misc/nist_tests/tests/test25/End Certificate IC.02.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test25/Intermediate CRL IC.02.03.crl b/misc/nist_tests/tests/test25/Intermediate CRL IC.02.03.crl
new file mode 100644
index 000000000..553e1bbd1
--- /dev/null
+++ b/misc/nist_tests/tests/test25/Intermediate CRL IC.02.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test25/Intermediate Certificate IC.02.03.crt b/misc/nist_tests/tests/test25/Intermediate Certificate IC.02.03.crt
new file mode 100644
index 000000000..5d06aac4a
--- /dev/null
+++ b/misc/nist_tests/tests/test25/Intermediate Certificate IC.02.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test25/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test25/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test25/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test25/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test25/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test25/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test26/End Certificate IC.02.04.crt b/misc/nist_tests/tests/test26/End Certificate IC.02.04.crt
new file mode 100644
index 000000000..5abc96600
--- /dev/null
+++ b/misc/nist_tests/tests/test26/End Certificate IC.02.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test26/Intermediate CRL IC.02.04.crl b/misc/nist_tests/tests/test26/Intermediate CRL IC.02.04.crl
new file mode 100644
index 000000000..9f2f1b0a8
--- /dev/null
+++ b/misc/nist_tests/tests/test26/Intermediate CRL IC.02.04.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test26/Intermediate Certificate IC.02.04.crt b/misc/nist_tests/tests/test26/Intermediate Certificate IC.02.04.crt
new file mode 100644
index 000000000..e9c273a05
--- /dev/null
+++ b/misc/nist_tests/tests/test26/Intermediate Certificate IC.02.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test26/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test26/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test26/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test26/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test26/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test26/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test27/End Certificate IC.04.01.crt b/misc/nist_tests/tests/test27/End Certificate IC.04.01.crt
new file mode 100644
index 000000000..2147dbd3a
--- /dev/null
+++ b/misc/nist_tests/tests/test27/End Certificate IC.04.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test27/Intermediate CRL IC.04.01.crl b/misc/nist_tests/tests/test27/Intermediate CRL IC.04.01.crl
new file mode 100644
index 000000000..fd769e5f3
--- /dev/null
+++ b/misc/nist_tests/tests/test27/Intermediate CRL IC.04.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test27/Intermediate Certificate IC.04.01.crt b/misc/nist_tests/tests/test27/Intermediate Certificate IC.04.01.crt
new file mode 100644
index 000000000..4de4a9f51
--- /dev/null
+++ b/misc/nist_tests/tests/test27/Intermediate Certificate IC.04.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test27/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test27/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test27/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test27/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test27/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test27/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test28/End Certificate IC.05.01.crt b/misc/nist_tests/tests/test28/End Certificate IC.05.01.crt
new file mode 100644
index 000000000..c72c97b81
--- /dev/null
+++ b/misc/nist_tests/tests/test28/End Certificate IC.05.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test28/Intermediate CRL IC.05.01.crl b/misc/nist_tests/tests/test28/Intermediate CRL IC.05.01.crl
new file mode 100644
index 000000000..35e87eb0b
--- /dev/null
+++ b/misc/nist_tests/tests/test28/Intermediate CRL IC.05.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test28/Intermediate Certificate IC.05.01.crt b/misc/nist_tests/tests/test28/Intermediate Certificate IC.05.01.crt
new file mode 100644
index 000000000..fee01f21e
--- /dev/null
+++ b/misc/nist_tests/tests/test28/Intermediate Certificate IC.05.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test28/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test28/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test28/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test28/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test28/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test28/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test29/End Certificate IC.05.02.crt b/misc/nist_tests/tests/test29/End Certificate IC.05.02.crt
new file mode 100644
index 000000000..e4e2dd072
--- /dev/null
+++ b/misc/nist_tests/tests/test29/End Certificate IC.05.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test29/Intermediate CRL IC.05.02.crl b/misc/nist_tests/tests/test29/Intermediate CRL IC.05.02.crl
new file mode 100644
index 000000000..2739bd933
--- /dev/null
+++ b/misc/nist_tests/tests/test29/Intermediate CRL IC.05.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test29/Intermediate Certificate IC.05.02.crt b/misc/nist_tests/tests/test29/Intermediate Certificate IC.05.02.crt
new file mode 100644
index 000000000..e830043fd
--- /dev/null
+++ b/misc/nist_tests/tests/test29/Intermediate Certificate IC.05.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test29/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test29/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test29/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test29/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test29/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test29/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test30/End Certificate IC.05.03.crt b/misc/nist_tests/tests/test30/End Certificate IC.05.03.crt
new file mode 100644
index 000000000..abdc0381f
--- /dev/null
+++ b/misc/nist_tests/tests/test30/End Certificate IC.05.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test30/Intermediate CRL IC.05.03.crl b/misc/nist_tests/tests/test30/Intermediate CRL IC.05.03.crl
new file mode 100644
index 000000000..fed695a3b
--- /dev/null
+++ b/misc/nist_tests/tests/test30/Intermediate CRL IC.05.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test30/Intermediate Certificate IC.05.03.crt b/misc/nist_tests/tests/test30/Intermediate Certificate IC.05.03.crt
new file mode 100644
index 000000000..26fd2cb6a
--- /dev/null
+++ b/misc/nist_tests/tests/test30/Intermediate Certificate IC.05.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test30/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test30/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test30/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test30/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test30/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test30/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test31/End Certificate IC.06.01.crt b/misc/nist_tests/tests/test31/End Certificate IC.06.01.crt
new file mode 100644
index 000000000..cd766ef7f
--- /dev/null
+++ b/misc/nist_tests/tests/test31/End Certificate IC.06.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test31/Intermediate CRL IC.06.01.crl b/misc/nist_tests/tests/test31/Intermediate CRL IC.06.01.crl
new file mode 100644
index 000000000..9014141f9
--- /dev/null
+++ b/misc/nist_tests/tests/test31/Intermediate CRL IC.06.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test31/Intermediate Certificate IC.06.01.crt b/misc/nist_tests/tests/test31/Intermediate Certificate IC.06.01.crt
new file mode 100644
index 000000000..396947b15
--- /dev/null
+++ b/misc/nist_tests/tests/test31/Intermediate Certificate IC.06.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test31/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test31/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test31/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test31/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test31/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test31/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test32/End Certificate IC.06.02.crt b/misc/nist_tests/tests/test32/End Certificate IC.06.02.crt
new file mode 100644
index 000000000..3804a27b4
--- /dev/null
+++ b/misc/nist_tests/tests/test32/End Certificate IC.06.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test32/Intermediate CRL IC.06.02.crl b/misc/nist_tests/tests/test32/Intermediate CRL IC.06.02.crl
new file mode 100644
index 000000000..2e2e505a0
--- /dev/null
+++ b/misc/nist_tests/tests/test32/Intermediate CRL IC.06.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test32/Intermediate Certificate IC.06.02.crt b/misc/nist_tests/tests/test32/Intermediate Certificate IC.06.02.crt
new file mode 100644
index 000000000..6df3396b7
--- /dev/null
+++ b/misc/nist_tests/tests/test32/Intermediate Certificate IC.06.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test32/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test32/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test32/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test32/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test32/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test32/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test33/End Certificate IC.06.03.crt b/misc/nist_tests/tests/test33/End Certificate IC.06.03.crt
new file mode 100644
index 000000000..6ef1d03a8
--- /dev/null
+++ b/misc/nist_tests/tests/test33/End Certificate IC.06.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test33/Intermediate CRL IC.06.03.crl b/misc/nist_tests/tests/test33/Intermediate CRL IC.06.03.crl
new file mode 100644
index 000000000..4008e3d46
--- /dev/null
+++ b/misc/nist_tests/tests/test33/Intermediate CRL IC.06.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test33/Intermediate Certificate IC.06.03.crt b/misc/nist_tests/tests/test33/Intermediate Certificate IC.06.03.crt
new file mode 100644
index 000000000..ba183696e
--- /dev/null
+++ b/misc/nist_tests/tests/test33/Intermediate Certificate IC.06.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test33/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test33/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test33/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test33/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test33/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test33/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test34/End Certificate PP.01.01.crt b/misc/nist_tests/tests/test34/End Certificate PP.01.01.crt
new file mode 100644
index 000000000..695de1cb4
--- /dev/null
+++ b/misc/nist_tests/tests/test34/End Certificate PP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test34/Intermediate CRL PP.01.01.crl b/misc/nist_tests/tests/test34/Intermediate CRL PP.01.01.crl
new file mode 100644
index 000000000..a8d11e788
--- /dev/null
+++ b/misc/nist_tests/tests/test34/Intermediate CRL PP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test34/Intermediate Certificate PP.01.01.crt b/misc/nist_tests/tests/test34/Intermediate Certificate PP.01.01.crt
new file mode 100644
index 000000000..5657ddaf6
--- /dev/null
+++ b/misc/nist_tests/tests/test34/Intermediate Certificate PP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test34/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test34/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test34/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test34/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test34/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test34/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test35/End Certificate PP.01.02.crt b/misc/nist_tests/tests/test35/End Certificate PP.01.02.crt
new file mode 100644
index 000000000..26846be18
--- /dev/null
+++ b/misc/nist_tests/tests/test35/End Certificate PP.01.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test35/Intermediate CRL PP.01.02.crl b/misc/nist_tests/tests/test35/Intermediate CRL PP.01.02.crl
new file mode 100644
index 000000000..f7021d32c
--- /dev/null
+++ b/misc/nist_tests/tests/test35/Intermediate CRL PP.01.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test35/Intermediate Certificate PP.01.02.crt b/misc/nist_tests/tests/test35/Intermediate Certificate PP.01.02.crt
new file mode 100644
index 000000000..6a6641823
--- /dev/null
+++ b/misc/nist_tests/tests/test35/Intermediate Certificate PP.01.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test35/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test35/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test35/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test35/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test35/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test35/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test36/End Certificate PP.01.03.crt b/misc/nist_tests/tests/test36/End Certificate PP.01.03.crt
new file mode 100644
index 000000000..ee6ec5f4b
--- /dev/null
+++ b/misc/nist_tests/tests/test36/End Certificate PP.01.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test36/Intermediate CRL 1 PP.01.03.crl b/misc/nist_tests/tests/test36/Intermediate CRL 1 PP.01.03.crl
new file mode 100644
index 000000000..d4ad1013d
--- /dev/null
+++ b/misc/nist_tests/tests/test36/Intermediate CRL 1 PP.01.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test36/Intermediate CRL 2 PP.01.03.crl b/misc/nist_tests/tests/test36/Intermediate CRL 2 PP.01.03.crl
new file mode 100644
index 000000000..d45cedcee
--- /dev/null
+++ b/misc/nist_tests/tests/test36/Intermediate CRL 2 PP.01.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test36/Intermediate Certificate 1 PP.01.03.crt b/misc/nist_tests/tests/test36/Intermediate Certificate 1 PP.01.03.crt
new file mode 100644
index 000000000..a300e8d67
--- /dev/null
+++ b/misc/nist_tests/tests/test36/Intermediate Certificate 1 PP.01.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test36/Intermediate Certificate 2 PP.01.03.crt b/misc/nist_tests/tests/test36/Intermediate Certificate 2 PP.01.03.crt
new file mode 100644
index 000000000..87c8253c3
--- /dev/null
+++ b/misc/nist_tests/tests/test36/Intermediate Certificate 2 PP.01.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test36/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test36/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test36/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test36/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test36/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test36/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test37/End Certificate PP.01.04.crt b/misc/nist_tests/tests/test37/End Certificate PP.01.04.crt
new file mode 100644
index 000000000..e5c5ae8c7
--- /dev/null
+++ b/misc/nist_tests/tests/test37/End Certificate PP.01.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test37/Intermediate CRL 1 PP.01.04.crl b/misc/nist_tests/tests/test37/Intermediate CRL 1 PP.01.04.crl
new file mode 100644
index 000000000..6b488fdb8
--- /dev/null
+++ b/misc/nist_tests/tests/test37/Intermediate CRL 1 PP.01.04.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test37/Intermediate CRL 2 PP.01.04.crl b/misc/nist_tests/tests/test37/Intermediate CRL 2 PP.01.04.crl
new file mode 100644
index 000000000..724051124
--- /dev/null
+++ b/misc/nist_tests/tests/test37/Intermediate CRL 2 PP.01.04.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test37/Intermediate Certificate 1 PP.01.04.crt b/misc/nist_tests/tests/test37/Intermediate Certificate 1 PP.01.04.crt
new file mode 100644
index 000000000..26b6b9605
--- /dev/null
+++ b/misc/nist_tests/tests/test37/Intermediate Certificate 1 PP.01.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test37/Intermediate Certificate 2 PP.01.04.crt b/misc/nist_tests/tests/test37/Intermediate Certificate 2 PP.01.04.crt
new file mode 100644
index 000000000..c0e986a08
--- /dev/null
+++ b/misc/nist_tests/tests/test37/Intermediate Certificate 2 PP.01.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test37/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test37/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test37/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test37/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test37/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test37/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test38/End Certificate PP.01.05.crt b/misc/nist_tests/tests/test38/End Certificate PP.01.05.crt
new file mode 100644
index 000000000..9331b90a2
--- /dev/null
+++ b/misc/nist_tests/tests/test38/End Certificate PP.01.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test38/Intermediate CRL 1 PP.01.05.crl b/misc/nist_tests/tests/test38/Intermediate CRL 1 PP.01.05.crl
new file mode 100644
index 000000000..81f75d4e5
--- /dev/null
+++ b/misc/nist_tests/tests/test38/Intermediate CRL 1 PP.01.05.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test38/Intermediate CRL 2 PP.01.05.crl b/misc/nist_tests/tests/test38/Intermediate CRL 2 PP.01.05.crl
new file mode 100644
index 000000000..ae1d7d5e8
--- /dev/null
+++ b/misc/nist_tests/tests/test38/Intermediate CRL 2 PP.01.05.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test38/Intermediate Certificate 1 PP.01.05.crt b/misc/nist_tests/tests/test38/Intermediate Certificate 1 PP.01.05.crt
new file mode 100644
index 000000000..c8ee614f4
--- /dev/null
+++ b/misc/nist_tests/tests/test38/Intermediate Certificate 1 PP.01.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test38/Intermediate Certificate 2 PP.01.05.crt b/misc/nist_tests/tests/test38/Intermediate Certificate 2 PP.01.05.crt
new file mode 100644
index 000000000..8d2834294
--- /dev/null
+++ b/misc/nist_tests/tests/test38/Intermediate Certificate 2 PP.01.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test38/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test38/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test38/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test38/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test38/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test38/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test39/End Certificate PP.01.06.crt b/misc/nist_tests/tests/test39/End Certificate PP.01.06.crt
new file mode 100644
index 000000000..57263d4cb
--- /dev/null
+++ b/misc/nist_tests/tests/test39/End Certificate PP.01.06.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test39/Intermediate CRL 1 PP.01.06.crl b/misc/nist_tests/tests/test39/Intermediate CRL 1 PP.01.06.crl
new file mode 100644
index 000000000..f2a01385e
--- /dev/null
+++ b/misc/nist_tests/tests/test39/Intermediate CRL 1 PP.01.06.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test39/Intermediate CRL 2 PP.01.06.crl b/misc/nist_tests/tests/test39/Intermediate CRL 2 PP.01.06.crl
new file mode 100644
index 000000000..b6672d85a
--- /dev/null
+++ b/misc/nist_tests/tests/test39/Intermediate CRL 2 PP.01.06.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test39/Intermediate CRL 3 PP.01.06.crl b/misc/nist_tests/tests/test39/Intermediate CRL 3 PP.01.06.crl
new file mode 100644
index 000000000..453420be8
--- /dev/null
+++ b/misc/nist_tests/tests/test39/Intermediate CRL 3 PP.01.06.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test39/Intermediate Certificate 1 PP.01.06.crt b/misc/nist_tests/tests/test39/Intermediate Certificate 1 PP.01.06.crt
new file mode 100644
index 000000000..b7003f7eb
--- /dev/null
+++ b/misc/nist_tests/tests/test39/Intermediate Certificate 1 PP.01.06.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test39/Intermediate Certificate 2 PP.01.06.crt b/misc/nist_tests/tests/test39/Intermediate Certificate 2 PP.01.06.crt
new file mode 100644
index 000000000..c56ce57f0
--- /dev/null
+++ b/misc/nist_tests/tests/test39/Intermediate Certificate 2 PP.01.06.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test39/Intermediate Certificate 3 PP.01.06.crt b/misc/nist_tests/tests/test39/Intermediate Certificate 3 PP.01.06.crt
new file mode 100644
index 000000000..ce1224ada
--- /dev/null
+++ b/misc/nist_tests/tests/test39/Intermediate Certificate 3 PP.01.06.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test39/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test39/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test39/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test39/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test39/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test39/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test40/End Certificate PP.01.07.crt b/misc/nist_tests/tests/test40/End Certificate PP.01.07.crt
new file mode 100644
index 000000000..24ce9e4d8
--- /dev/null
+++ b/misc/nist_tests/tests/test40/End Certificate PP.01.07.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test40/Intermediate CRL 1 PP.01.07.crl b/misc/nist_tests/tests/test40/Intermediate CRL 1 PP.01.07.crl
new file mode 100644
index 000000000..5bd6a9f83
--- /dev/null
+++ b/misc/nist_tests/tests/test40/Intermediate CRL 1 PP.01.07.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test40/Intermediate CRL 2 PP.01.07.crl b/misc/nist_tests/tests/test40/Intermediate CRL 2 PP.01.07.crl
new file mode 100644
index 000000000..dde5a124c
--- /dev/null
+++ b/misc/nist_tests/tests/test40/Intermediate CRL 2 PP.01.07.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test40/Intermediate CRL 3 PP.01.07.crl b/misc/nist_tests/tests/test40/Intermediate CRL 3 PP.01.07.crl
new file mode 100644
index 000000000..713fa4bbf
--- /dev/null
+++ b/misc/nist_tests/tests/test40/Intermediate CRL 3 PP.01.07.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test40/Intermediate Certificate 1 PP.01.07.crt b/misc/nist_tests/tests/test40/Intermediate Certificate 1 PP.01.07.crt
new file mode 100644
index 000000000..5a8ac5006
--- /dev/null
+++ b/misc/nist_tests/tests/test40/Intermediate Certificate 1 PP.01.07.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test40/Intermediate Certificate 2 PP.01.07.crt b/misc/nist_tests/tests/test40/Intermediate Certificate 2 PP.01.07.crt
new file mode 100644
index 000000000..70e4d9092
--- /dev/null
+++ b/misc/nist_tests/tests/test40/Intermediate Certificate 2 PP.01.07.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test40/Intermediate Certificate 3 PP.01.07.crt b/misc/nist_tests/tests/test40/Intermediate Certificate 3 PP.01.07.crt
new file mode 100644
index 000000000..a0c673453
--- /dev/null
+++ b/misc/nist_tests/tests/test40/Intermediate Certificate 3 PP.01.07.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test40/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test40/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test40/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test40/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test40/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test40/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test41/End Certificate PP.01.08.crt b/misc/nist_tests/tests/test41/End Certificate PP.01.08.crt
new file mode 100644
index 000000000..b88e38eb9
--- /dev/null
+++ b/misc/nist_tests/tests/test41/End Certificate PP.01.08.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test41/Intermediate CRL 1 PP.01.08.crl b/misc/nist_tests/tests/test41/Intermediate CRL 1 PP.01.08.crl
new file mode 100644
index 000000000..2d4c41521
--- /dev/null
+++ b/misc/nist_tests/tests/test41/Intermediate CRL 1 PP.01.08.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test41/Intermediate CRL 2 PP.01.08.crl b/misc/nist_tests/tests/test41/Intermediate CRL 2 PP.01.08.crl
new file mode 100644
index 000000000..e389a7fd9
--- /dev/null
+++ b/misc/nist_tests/tests/test41/Intermediate CRL 2 PP.01.08.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test41/Intermediate CRL 3 PP.01.08.crl b/misc/nist_tests/tests/test41/Intermediate CRL 3 PP.01.08.crl
new file mode 100644
index 000000000..d26dc1b75
--- /dev/null
+++ b/misc/nist_tests/tests/test41/Intermediate CRL 3 PP.01.08.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test41/Intermediate Certificate 1 PP.01.08.crt b/misc/nist_tests/tests/test41/Intermediate Certificate 1 PP.01.08.crt
new file mode 100644
index 000000000..4b96b2afb
--- /dev/null
+++ b/misc/nist_tests/tests/test41/Intermediate Certificate 1 PP.01.08.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test41/Intermediate Certificate 2 PP.01.08.crt b/misc/nist_tests/tests/test41/Intermediate Certificate 2 PP.01.08.crt
new file mode 100644
index 000000000..4b1edc710
--- /dev/null
+++ b/misc/nist_tests/tests/test41/Intermediate Certificate 2 PP.01.08.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test41/Intermediate Certificate 3 PP.01.08.crt b/misc/nist_tests/tests/test41/Intermediate Certificate 3 PP.01.08.crt
new file mode 100644
index 000000000..6012a3a5b
--- /dev/null
+++ b/misc/nist_tests/tests/test41/Intermediate Certificate 3 PP.01.08.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test41/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test41/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test41/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test41/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test41/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test41/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test42/End Certificate PP.01.09.crt b/misc/nist_tests/tests/test42/End Certificate PP.01.09.crt
new file mode 100644
index 000000000..9815c5d5c
--- /dev/null
+++ b/misc/nist_tests/tests/test42/End Certificate PP.01.09.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test42/Intermediate CRL 1 PP.01.09.crl b/misc/nist_tests/tests/test42/Intermediate CRL 1 PP.01.09.crl
new file mode 100644
index 000000000..d4f21dbe3
--- /dev/null
+++ b/misc/nist_tests/tests/test42/Intermediate CRL 1 PP.01.09.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test42/Intermediate CRL 2 PP.01.09.crl b/misc/nist_tests/tests/test42/Intermediate CRL 2 PP.01.09.crl
new file mode 100644
index 000000000..32906057a
--- /dev/null
+++ b/misc/nist_tests/tests/test42/Intermediate CRL 2 PP.01.09.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test42/Intermediate CRL 3 PP.01.09.crl b/misc/nist_tests/tests/test42/Intermediate CRL 3 PP.01.09.crl
new file mode 100644
index 000000000..ee2b2b18c
--- /dev/null
+++ b/misc/nist_tests/tests/test42/Intermediate CRL 3 PP.01.09.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test42/Intermediate CRL 4 PP.01.09.crl b/misc/nist_tests/tests/test42/Intermediate CRL 4 PP.01.09.crl
new file mode 100644
index 000000000..7602160fa
--- /dev/null
+++ b/misc/nist_tests/tests/test42/Intermediate CRL 4 PP.01.09.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test42/Intermediate Certificate 1 PP.01.09.crt b/misc/nist_tests/tests/test42/Intermediate Certificate 1 PP.01.09.crt
new file mode 100644
index 000000000..f344a9f27
--- /dev/null
+++ b/misc/nist_tests/tests/test42/Intermediate Certificate 1 PP.01.09.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test42/Intermediate Certificate 2 PP.01.09.crt b/misc/nist_tests/tests/test42/Intermediate Certificate 2 PP.01.09.crt
new file mode 100644
index 000000000..a2fd05ccb
--- /dev/null
+++ b/misc/nist_tests/tests/test42/Intermediate Certificate 2 PP.01.09.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test42/Intermediate Certificate 3 PP.01.09.crt b/misc/nist_tests/tests/test42/Intermediate Certificate 3 PP.01.09.crt
new file mode 100644
index 000000000..8104a65f8
--- /dev/null
+++ b/misc/nist_tests/tests/test42/Intermediate Certificate 3 PP.01.09.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test42/Intermediate Certificate 4 PP.01.09.crt b/misc/nist_tests/tests/test42/Intermediate Certificate 4 PP.01.09.crt
new file mode 100644
index 000000000..5b6ffbd4e
--- /dev/null
+++ b/misc/nist_tests/tests/test42/Intermediate Certificate 4 PP.01.09.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test42/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test42/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test42/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test42/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test42/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test42/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test43/End Certificate PP.06.01.crt b/misc/nist_tests/tests/test43/End Certificate PP.06.01.crt
new file mode 100644
index 000000000..9465ea5bf
--- /dev/null
+++ b/misc/nist_tests/tests/test43/End Certificate PP.06.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test43/Intermediate CRL 1 PP.06.01.crl b/misc/nist_tests/tests/test43/Intermediate CRL 1 PP.06.01.crl
new file mode 100644
index 000000000..4ce26fdb9
--- /dev/null
+++ b/misc/nist_tests/tests/test43/Intermediate CRL 1 PP.06.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test43/Intermediate CRL 2 PP.06.01.crl b/misc/nist_tests/tests/test43/Intermediate CRL 2 PP.06.01.crl
new file mode 100644
index 000000000..9820bc6f6
--- /dev/null
+++ b/misc/nist_tests/tests/test43/Intermediate CRL 2 PP.06.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test43/Intermediate CRL 3 PP.06.01.crl b/misc/nist_tests/tests/test43/Intermediate CRL 3 PP.06.01.crl
new file mode 100644
index 000000000..b8dfd8dfd
--- /dev/null
+++ b/misc/nist_tests/tests/test43/Intermediate CRL 3 PP.06.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test43/Intermediate CRL 4 PP.06.01.crl b/misc/nist_tests/tests/test43/Intermediate CRL 4 PP.06.01.crl
new file mode 100644
index 000000000..4b4136209
--- /dev/null
+++ b/misc/nist_tests/tests/test43/Intermediate CRL 4 PP.06.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test43/Intermediate Certificate 1 PP.06.01.crt b/misc/nist_tests/tests/test43/Intermediate Certificate 1 PP.06.01.crt
new file mode 100644
index 000000000..e18a4e168
--- /dev/null
+++ b/misc/nist_tests/tests/test43/Intermediate Certificate 1 PP.06.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test43/Intermediate Certificate 2 PP.06.01.crt b/misc/nist_tests/tests/test43/Intermediate Certificate 2 PP.06.01.crt
new file mode 100644
index 000000000..1521fce98
--- /dev/null
+++ b/misc/nist_tests/tests/test43/Intermediate Certificate 2 PP.06.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test43/Intermediate Certificate 3 PP.06.01.crt b/misc/nist_tests/tests/test43/Intermediate Certificate 3 PP.06.01.crt
new file mode 100644
index 000000000..30b9706d8
--- /dev/null
+++ b/misc/nist_tests/tests/test43/Intermediate Certificate 3 PP.06.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test43/Intermediate Certificate 4 PP.06.01.crt b/misc/nist_tests/tests/test43/Intermediate Certificate 4 PP.06.01.crt
new file mode 100644
index 000000000..949562273
--- /dev/null
+++ b/misc/nist_tests/tests/test43/Intermediate Certificate 4 PP.06.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test43/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test43/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test43/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test43/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test43/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test43/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test44/End Certificate PP.06.02.crt b/misc/nist_tests/tests/test44/End Certificate PP.06.02.crt
new file mode 100644
index 000000000..5fc9bec78
--- /dev/null
+++ b/misc/nist_tests/tests/test44/End Certificate PP.06.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test44/Intermediate CRL 1 PP.06.02.crl b/misc/nist_tests/tests/test44/Intermediate CRL 1 PP.06.02.crl
new file mode 100644
index 000000000..2d4478cfc
--- /dev/null
+++ b/misc/nist_tests/tests/test44/Intermediate CRL 1 PP.06.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test44/Intermediate CRL 2 PP.06.02.crl b/misc/nist_tests/tests/test44/Intermediate CRL 2 PP.06.02.crl
new file mode 100644
index 000000000..780ef7c0f
--- /dev/null
+++ b/misc/nist_tests/tests/test44/Intermediate CRL 2 PP.06.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test44/Intermediate CRL 3 PP.06.02.crl b/misc/nist_tests/tests/test44/Intermediate CRL 3 PP.06.02.crl
new file mode 100644
index 000000000..5e5267ed9
--- /dev/null
+++ b/misc/nist_tests/tests/test44/Intermediate CRL 3 PP.06.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test44/Intermediate CRL 4 PP.06.02.crl b/misc/nist_tests/tests/test44/Intermediate CRL 4 PP.06.02.crl
new file mode 100644
index 000000000..5d775f551
--- /dev/null
+++ b/misc/nist_tests/tests/test44/Intermediate CRL 4 PP.06.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test44/Intermediate Certificate 1 PP.06.02.crt b/misc/nist_tests/tests/test44/Intermediate Certificate 1 PP.06.02.crt
new file mode 100644
index 000000000..fbfd2a4d0
--- /dev/null
+++ b/misc/nist_tests/tests/test44/Intermediate Certificate 1 PP.06.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test44/Intermediate Certificate 2 PP.06.02.crt b/misc/nist_tests/tests/test44/Intermediate Certificate 2 PP.06.02.crt
new file mode 100644
index 000000000..26f319399
--- /dev/null
+++ b/misc/nist_tests/tests/test44/Intermediate Certificate 2 PP.06.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test44/Intermediate Certificate 3 PP.06.02.crt b/misc/nist_tests/tests/test44/Intermediate Certificate 3 PP.06.02.crt
new file mode 100644
index 000000000..7f62ef6ef
--- /dev/null
+++ b/misc/nist_tests/tests/test44/Intermediate Certificate 3 PP.06.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test44/Intermediate Certificate 4 PP.06.02.crt b/misc/nist_tests/tests/test44/Intermediate Certificate 4 PP.06.02.crt
new file mode 100644
index 000000000..76d6111ec
--- /dev/null
+++ b/misc/nist_tests/tests/test44/Intermediate Certificate 4 PP.06.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test44/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test44/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test44/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test44/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test44/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test44/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test45/End Certificate PP.06.03.crt b/misc/nist_tests/tests/test45/End Certificate PP.06.03.crt
new file mode 100644
index 000000000..a2ddb0430
--- /dev/null
+++ b/misc/nist_tests/tests/test45/End Certificate PP.06.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test45/Intermediate CRL 1 PP.06.03.crl b/misc/nist_tests/tests/test45/Intermediate CRL 1 PP.06.03.crl
new file mode 100644
index 000000000..079062c14
--- /dev/null
+++ b/misc/nist_tests/tests/test45/Intermediate CRL 1 PP.06.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test45/Intermediate CRL 2 PP.06.03.crl b/misc/nist_tests/tests/test45/Intermediate CRL 2 PP.06.03.crl
new file mode 100644
index 000000000..7c12bd0c3
--- /dev/null
+++ b/misc/nist_tests/tests/test45/Intermediate CRL 2 PP.06.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test45/Intermediate CRL 3 PP.06.03.crl b/misc/nist_tests/tests/test45/Intermediate CRL 3 PP.06.03.crl
new file mode 100644
index 000000000..f81b5042f
--- /dev/null
+++ b/misc/nist_tests/tests/test45/Intermediate CRL 3 PP.06.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test45/Intermediate CRL 4 PP.06.03.crl b/misc/nist_tests/tests/test45/Intermediate CRL 4 PP.06.03.crl
new file mode 100644
index 000000000..9e67a4a91
--- /dev/null
+++ b/misc/nist_tests/tests/test45/Intermediate CRL 4 PP.06.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test45/Intermediate Certificate 1 PP.06.03.crt b/misc/nist_tests/tests/test45/Intermediate Certificate 1 PP.06.03.crt
new file mode 100644
index 000000000..90ee8e3fe
--- /dev/null
+++ b/misc/nist_tests/tests/test45/Intermediate Certificate 1 PP.06.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test45/Intermediate Certificate 2 PP.06.03.crt b/misc/nist_tests/tests/test45/Intermediate Certificate 2 PP.06.03.crt
new file mode 100644
index 000000000..7fc0467ca
--- /dev/null
+++ b/misc/nist_tests/tests/test45/Intermediate Certificate 2 PP.06.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test45/Intermediate Certificate 3 PP.06.03.crt b/misc/nist_tests/tests/test45/Intermediate Certificate 3 PP.06.03.crt
new file mode 100644
index 000000000..fb9500f12
--- /dev/null
+++ b/misc/nist_tests/tests/test45/Intermediate Certificate 3 PP.06.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test45/Intermediate Certificate 4 PP.06.03.crt b/misc/nist_tests/tests/test45/Intermediate Certificate 4 PP.06.03.crt
new file mode 100644
index 000000000..60b6c9133
--- /dev/null
+++ b/misc/nist_tests/tests/test45/Intermediate Certificate 4 PP.06.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test45/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test45/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test45/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test45/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test45/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test45/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test46/End Certificate PP.06.04.crt b/misc/nist_tests/tests/test46/End Certificate PP.06.04.crt
new file mode 100644
index 000000000..39ebf20a3
--- /dev/null
+++ b/misc/nist_tests/tests/test46/End Certificate PP.06.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test46/Intermediate CRL 1 PP.06.04.crl b/misc/nist_tests/tests/test46/Intermediate CRL 1 PP.06.04.crl
new file mode 100644
index 000000000..f9a2236bc
--- /dev/null
+++ b/misc/nist_tests/tests/test46/Intermediate CRL 1 PP.06.04.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test46/Intermediate CRL 2 PP.06.04.crl b/misc/nist_tests/tests/test46/Intermediate CRL 2 PP.06.04.crl
new file mode 100644
index 000000000..02e82c48a
--- /dev/null
+++ b/misc/nist_tests/tests/test46/Intermediate CRL 2 PP.06.04.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test46/Intermediate CRL 3 PP.06.04.crl b/misc/nist_tests/tests/test46/Intermediate CRL 3 PP.06.04.crl
new file mode 100644
index 000000000..ddd59a80c
--- /dev/null
+++ b/misc/nist_tests/tests/test46/Intermediate CRL 3 PP.06.04.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test46/Intermediate CRL 4 PP.06.04.crl b/misc/nist_tests/tests/test46/Intermediate CRL 4 PP.06.04.crl
new file mode 100644
index 000000000..3dedfb11e
--- /dev/null
+++ b/misc/nist_tests/tests/test46/Intermediate CRL 4 PP.06.04.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test46/Intermediate Certificate 1 PP.06.04.crt b/misc/nist_tests/tests/test46/Intermediate Certificate 1 PP.06.04.crt
new file mode 100644
index 000000000..985a5d575
--- /dev/null
+++ b/misc/nist_tests/tests/test46/Intermediate Certificate 1 PP.06.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test46/Intermediate Certificate 2 PP.06.04.crt b/misc/nist_tests/tests/test46/Intermediate Certificate 2 PP.06.04.crt
new file mode 100644
index 000000000..ade64339c
--- /dev/null
+++ b/misc/nist_tests/tests/test46/Intermediate Certificate 2 PP.06.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test46/Intermediate Certificate 3 PP.06.04.crt b/misc/nist_tests/tests/test46/Intermediate Certificate 3 PP.06.04.crt
new file mode 100644
index 000000000..6e33faaaa
--- /dev/null
+++ b/misc/nist_tests/tests/test46/Intermediate Certificate 3 PP.06.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test46/Intermediate Certificate 4 PP.06.04.crt b/misc/nist_tests/tests/test46/Intermediate Certificate 4 PP.06.04.crt
new file mode 100644
index 000000000..1b3fc5726
--- /dev/null
+++ b/misc/nist_tests/tests/test46/Intermediate Certificate 4 PP.06.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test46/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test46/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test46/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test46/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test46/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test46/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test47/End Certificate PP.06.05.crt b/misc/nist_tests/tests/test47/End Certificate PP.06.05.crt
new file mode 100644
index 000000000..7337bc5b5
--- /dev/null
+++ b/misc/nist_tests/tests/test47/End Certificate PP.06.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test47/Intermediate CRL 1 PP.06.05.crl b/misc/nist_tests/tests/test47/Intermediate CRL 1 PP.06.05.crl
new file mode 100644
index 000000000..938e3f412
--- /dev/null
+++ b/misc/nist_tests/tests/test47/Intermediate CRL 1 PP.06.05.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test47/Intermediate CRL 2 PP.06.05.crl b/misc/nist_tests/tests/test47/Intermediate CRL 2 PP.06.05.crl
new file mode 100644
index 000000000..f715c112d
--- /dev/null
+++ b/misc/nist_tests/tests/test47/Intermediate CRL 2 PP.06.05.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test47/Intermediate CRL 3 PP.06.05.crl b/misc/nist_tests/tests/test47/Intermediate CRL 3 PP.06.05.crl
new file mode 100644
index 000000000..786aa5032
--- /dev/null
+++ b/misc/nist_tests/tests/test47/Intermediate CRL 3 PP.06.05.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test47/Intermediate CRL 4 PP.06.05.crl b/misc/nist_tests/tests/test47/Intermediate CRL 4 PP.06.05.crl
new file mode 100644
index 000000000..925b78324
--- /dev/null
+++ b/misc/nist_tests/tests/test47/Intermediate CRL 4 PP.06.05.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test47/Intermediate Certificate 1 PP.06.05.crt b/misc/nist_tests/tests/test47/Intermediate Certificate 1 PP.06.05.crt
new file mode 100644
index 000000000..bf3e22239
--- /dev/null
+++ b/misc/nist_tests/tests/test47/Intermediate Certificate 1 PP.06.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test47/Intermediate Certificate 2 PP.06.05.crt b/misc/nist_tests/tests/test47/Intermediate Certificate 2 PP.06.05.crt
new file mode 100644
index 000000000..1b7854e33
--- /dev/null
+++ b/misc/nist_tests/tests/test47/Intermediate Certificate 2 PP.06.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test47/Intermediate Certificate 3 PP.06.05.crt b/misc/nist_tests/tests/test47/Intermediate Certificate 3 PP.06.05.crt
new file mode 100644
index 000000000..62eb3b220
--- /dev/null
+++ b/misc/nist_tests/tests/test47/Intermediate Certificate 3 PP.06.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test47/Intermediate Certificate 4 PP.06.05.crt b/misc/nist_tests/tests/test47/Intermediate Certificate 4 PP.06.05.crt
new file mode 100644
index 000000000..1c9a14344
--- /dev/null
+++ b/misc/nist_tests/tests/test47/Intermediate Certificate 4 PP.06.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test47/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test47/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test47/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test47/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test47/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test47/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test48/End Certificate PP.08.01.crt b/misc/nist_tests/tests/test48/End Certificate PP.08.01.crt
new file mode 100644
index 000000000..933f27912
--- /dev/null
+++ b/misc/nist_tests/tests/test48/End Certificate PP.08.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test48/Intermediate CRL PP.08.01.crl b/misc/nist_tests/tests/test48/Intermediate CRL PP.08.01.crl
new file mode 100644
index 000000000..89ad99cd1
--- /dev/null
+++ b/misc/nist_tests/tests/test48/Intermediate CRL PP.08.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test48/Intermediate Certificate PP.08.01.crt b/misc/nist_tests/tests/test48/Intermediate Certificate PP.08.01.crt
new file mode 100644
index 000000000..b2eefc4ae
--- /dev/null
+++ b/misc/nist_tests/tests/test48/Intermediate Certificate PP.08.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test48/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test48/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test48/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test48/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test48/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test48/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test49/End Certificate PP.08.02.crt b/misc/nist_tests/tests/test49/End Certificate PP.08.02.crt
new file mode 100644
index 000000000..d0e4a26e6
--- /dev/null
+++ b/misc/nist_tests/tests/test49/End Certificate PP.08.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test49/Intermediate CRL PP.08.02.crl b/misc/nist_tests/tests/test49/Intermediate CRL PP.08.02.crl
new file mode 100644
index 000000000..1defb1ef5
--- /dev/null
+++ b/misc/nist_tests/tests/test49/Intermediate CRL PP.08.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test49/Intermediate Certificate PP.08.02.crt b/misc/nist_tests/tests/test49/Intermediate Certificate PP.08.02.crt
new file mode 100644
index 000000000..037f68d8b
--- /dev/null
+++ b/misc/nist_tests/tests/test49/Intermediate Certificate PP.08.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test49/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test49/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test49/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test49/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test49/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test49/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test50/End Certificate PP.08.03.crt b/misc/nist_tests/tests/test50/End Certificate PP.08.03.crt
new file mode 100644
index 000000000..ed9b0a3ce
--- /dev/null
+++ b/misc/nist_tests/tests/test50/End Certificate PP.08.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test50/Intermediate CRL PP.08.03.crl b/misc/nist_tests/tests/test50/Intermediate CRL PP.08.03.crl
new file mode 100644
index 000000000..0c7cdfee5
--- /dev/null
+++ b/misc/nist_tests/tests/test50/Intermediate CRL PP.08.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test50/Intermediate Certificate PP.08.03.crt b/misc/nist_tests/tests/test50/Intermediate Certificate PP.08.03.crt
new file mode 100644
index 000000000..74c41f021
--- /dev/null
+++ b/misc/nist_tests/tests/test50/Intermediate Certificate PP.08.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test50/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test50/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test50/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test50/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test50/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test50/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test51/End Certificate PP.08.04.crt b/misc/nist_tests/tests/test51/End Certificate PP.08.04.crt
new file mode 100644
index 000000000..12ebc74c7
--- /dev/null
+++ b/misc/nist_tests/tests/test51/End Certificate PP.08.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test51/Intermediate CRL PP.08.04.crl b/misc/nist_tests/tests/test51/Intermediate CRL PP.08.04.crl
new file mode 100644
index 000000000..c887c9a2c
--- /dev/null
+++ b/misc/nist_tests/tests/test51/Intermediate CRL PP.08.04.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test51/Intermediate Certificate PP.08.04.crt b/misc/nist_tests/tests/test51/Intermediate Certificate PP.08.04.crt
new file mode 100644
index 000000000..def7e90d1
--- /dev/null
+++ b/misc/nist_tests/tests/test51/Intermediate Certificate PP.08.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test51/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test51/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test51/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test51/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test51/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test51/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test52/End Certificate PP.08.05.crt b/misc/nist_tests/tests/test52/End Certificate PP.08.05.crt
new file mode 100644
index 000000000..0bd19185f
--- /dev/null
+++ b/misc/nist_tests/tests/test52/End Certificate PP.08.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test52/Intermediate CRL PP.08.05.crl b/misc/nist_tests/tests/test52/Intermediate CRL PP.08.05.crl
new file mode 100644
index 000000000..ec220874c
--- /dev/null
+++ b/misc/nist_tests/tests/test52/Intermediate CRL PP.08.05.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test52/Intermediate Certificate PP.08.05.crt b/misc/nist_tests/tests/test52/Intermediate Certificate PP.08.05.crt
new file mode 100644
index 000000000..3429d7cf7
--- /dev/null
+++ b/misc/nist_tests/tests/test52/Intermediate Certificate PP.08.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test52/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test52/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test52/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test52/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test52/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test52/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test53/End Certificate PP.08.06.crt b/misc/nist_tests/tests/test53/End Certificate PP.08.06.crt
new file mode 100644
index 000000000..9b99dc562
--- /dev/null
+++ b/misc/nist_tests/tests/test53/End Certificate PP.08.06.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test53/Intermediate CRL PP.08.06.crl b/misc/nist_tests/tests/test53/Intermediate CRL PP.08.06.crl
new file mode 100644
index 000000000..79fed242a
--- /dev/null
+++ b/misc/nist_tests/tests/test53/Intermediate CRL PP.08.06.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test53/Intermediate Certificate PP.08.06.crt b/misc/nist_tests/tests/test53/Intermediate Certificate PP.08.06.crt
new file mode 100644
index 000000000..72eac943f
--- /dev/null
+++ b/misc/nist_tests/tests/test53/Intermediate Certificate PP.08.06.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test53/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test53/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test53/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test53/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test53/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test53/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test54/End Certificate PL.01.01.crt b/misc/nist_tests/tests/test54/End Certificate PL.01.01.crt
new file mode 100644
index 000000000..185f019cf
--- /dev/null
+++ b/misc/nist_tests/tests/test54/End Certificate PL.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test54/Intermediate CRL 1 PL.01.01.crl b/misc/nist_tests/tests/test54/Intermediate CRL 1 PL.01.01.crl
new file mode 100644
index 000000000..5b1c4439c
--- /dev/null
+++ b/misc/nist_tests/tests/test54/Intermediate CRL 1 PL.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test54/Intermediate CRL 2 PL.01.01.crl b/misc/nist_tests/tests/test54/Intermediate CRL 2 PL.01.01.crl
new file mode 100644
index 000000000..c531566a9
--- /dev/null
+++ b/misc/nist_tests/tests/test54/Intermediate CRL 2 PL.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test54/Intermediate Certificate 1 PL.01.01.crt b/misc/nist_tests/tests/test54/Intermediate Certificate 1 PL.01.01.crt
new file mode 100644
index 000000000..140ef0669
--- /dev/null
+++ b/misc/nist_tests/tests/test54/Intermediate Certificate 1 PL.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test54/Intermediate Certificate 2 PL.01.01.crt b/misc/nist_tests/tests/test54/Intermediate Certificate 2 PL.01.01.crt
new file mode 100644
index 000000000..506761d71
--- /dev/null
+++ b/misc/nist_tests/tests/test54/Intermediate Certificate 2 PL.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test54/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test54/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test54/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test54/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test54/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test54/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test55/End Certificate PL.01.02.crt b/misc/nist_tests/tests/test55/End Certificate PL.01.02.crt
new file mode 100644
index 000000000..923d4c5a8
--- /dev/null
+++ b/misc/nist_tests/tests/test55/End Certificate PL.01.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test55/Intermediate CRL 1 PL.01.02.crl b/misc/nist_tests/tests/test55/Intermediate CRL 1 PL.01.02.crl
new file mode 100644
index 000000000..371821e5e
--- /dev/null
+++ b/misc/nist_tests/tests/test55/Intermediate CRL 1 PL.01.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test55/Intermediate CRL 2 PL.01.02.crl b/misc/nist_tests/tests/test55/Intermediate CRL 2 PL.01.02.crl
new file mode 100644
index 000000000..9a242916e
--- /dev/null
+++ b/misc/nist_tests/tests/test55/Intermediate CRL 2 PL.01.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test55/Intermediate Certificate 1 PL.01.02.crt b/misc/nist_tests/tests/test55/Intermediate Certificate 1 PL.01.02.crt
new file mode 100644
index 000000000..7597faf7f
--- /dev/null
+++ b/misc/nist_tests/tests/test55/Intermediate Certificate 1 PL.01.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test55/Intermediate Certificate 2 PL.01.02.crt b/misc/nist_tests/tests/test55/Intermediate Certificate 2 PL.01.02.crt
new file mode 100644
index 000000000..982235a21
--- /dev/null
+++ b/misc/nist_tests/tests/test55/Intermediate Certificate 2 PL.01.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test55/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test55/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test55/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test55/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test55/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test55/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test56/End Certificate PL.01.03.crt b/misc/nist_tests/tests/test56/End Certificate PL.01.03.crt
new file mode 100644
index 000000000..d1dc82186
--- /dev/null
+++ b/misc/nist_tests/tests/test56/End Certificate PL.01.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test56/Intermediate CRL PL.01.03.crl b/misc/nist_tests/tests/test56/Intermediate CRL PL.01.03.crl
new file mode 100644
index 000000000..840b209e0
--- /dev/null
+++ b/misc/nist_tests/tests/test56/Intermediate CRL PL.01.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test56/Intermediate Certificate PL.01.03.crt b/misc/nist_tests/tests/test56/Intermediate Certificate PL.01.03.crt
new file mode 100644
index 000000000..9b622cabd
--- /dev/null
+++ b/misc/nist_tests/tests/test56/Intermediate Certificate PL.01.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test56/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test56/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test56/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test56/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test56/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test56/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test57/End Certificate PL.01.04.crt b/misc/nist_tests/tests/test57/End Certificate PL.01.04.crt
new file mode 100644
index 000000000..2f939384a
--- /dev/null
+++ b/misc/nist_tests/tests/test57/End Certificate PL.01.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test57/Intermediate CRL PL.01.04.crl b/misc/nist_tests/tests/test57/Intermediate CRL PL.01.04.crl
new file mode 100644
index 000000000..a0be908ae
--- /dev/null
+++ b/misc/nist_tests/tests/test57/Intermediate CRL PL.01.04.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test57/Intermediate Certificate PL.01.04.crt b/misc/nist_tests/tests/test57/Intermediate Certificate PL.01.04.crt
new file mode 100644
index 000000000..79f6d6b8a
--- /dev/null
+++ b/misc/nist_tests/tests/test57/Intermediate Certificate PL.01.04.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test57/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test57/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test57/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test57/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test57/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test57/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test58/End Certificate PL.01.05.crt b/misc/nist_tests/tests/test58/End Certificate PL.01.05.crt
new file mode 100644
index 000000000..674009c83
--- /dev/null
+++ b/misc/nist_tests/tests/test58/End Certificate PL.01.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test58/Intermediate CRL 1 PL.01.05.crl b/misc/nist_tests/tests/test58/Intermediate CRL 1 PL.01.05.crl
new file mode 100644
index 000000000..aa9dc9d7f
--- /dev/null
+++ b/misc/nist_tests/tests/test58/Intermediate CRL 1 PL.01.05.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test58/Intermediate CRL 2 PL.01.05.crl b/misc/nist_tests/tests/test58/Intermediate CRL 2 PL.01.05.crl
new file mode 100644
index 000000000..7dec9c1eb
--- /dev/null
+++ b/misc/nist_tests/tests/test58/Intermediate CRL 2 PL.01.05.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test58/Intermediate CRL 3 PL.01.05.crl b/misc/nist_tests/tests/test58/Intermediate CRL 3 PL.01.05.crl
new file mode 100644
index 000000000..bec634480
--- /dev/null
+++ b/misc/nist_tests/tests/test58/Intermediate CRL 3 PL.01.05.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test58/Intermediate Certificate 1 PL.01.05.crt b/misc/nist_tests/tests/test58/Intermediate Certificate 1 PL.01.05.crt
new file mode 100644
index 000000000..42e983122
--- /dev/null
+++ b/misc/nist_tests/tests/test58/Intermediate Certificate 1 PL.01.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test58/Intermediate Certificate 2 PL.01.05.crt b/misc/nist_tests/tests/test58/Intermediate Certificate 2 PL.01.05.crt
new file mode 100644
index 000000000..08eb808c4
--- /dev/null
+++ b/misc/nist_tests/tests/test58/Intermediate Certificate 2 PL.01.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test58/Intermediate Certificate 3 PL.01.05.crt b/misc/nist_tests/tests/test58/Intermediate Certificate 3 PL.01.05.crt
new file mode 100644
index 000000000..6c5e6efae
--- /dev/null
+++ b/misc/nist_tests/tests/test58/Intermediate Certificate 3 PL.01.05.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test58/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test58/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test58/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test58/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test58/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test58/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test59/End Certificate PL.01.06.crt b/misc/nist_tests/tests/test59/End Certificate PL.01.06.crt
new file mode 100644
index 000000000..da5ee9e69
--- /dev/null
+++ b/misc/nist_tests/tests/test59/End Certificate PL.01.06.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test59/Intermediate CRL 1 PL.01.06.crl b/misc/nist_tests/tests/test59/Intermediate CRL 1 PL.01.06.crl
new file mode 100644
index 000000000..eb7f0e883
--- /dev/null
+++ b/misc/nist_tests/tests/test59/Intermediate CRL 1 PL.01.06.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test59/Intermediate CRL 2 PL.01.06.crl b/misc/nist_tests/tests/test59/Intermediate CRL 2 PL.01.06.crl
new file mode 100644
index 000000000..2b2fe9ced
--- /dev/null
+++ b/misc/nist_tests/tests/test59/Intermediate CRL 2 PL.01.06.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test59/Intermediate CRL 3 PL.01.06.crl b/misc/nist_tests/tests/test59/Intermediate CRL 3 PL.01.06.crl
new file mode 100644
index 000000000..cb7885c17
--- /dev/null
+++ b/misc/nist_tests/tests/test59/Intermediate CRL 3 PL.01.06.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test59/Intermediate Certificate 1 PL.01.06.crt b/misc/nist_tests/tests/test59/Intermediate Certificate 1 PL.01.06.crt
new file mode 100644
index 000000000..be0ee21f2
--- /dev/null
+++ b/misc/nist_tests/tests/test59/Intermediate Certificate 1 PL.01.06.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test59/Intermediate Certificate 2 PL.01.06.crt b/misc/nist_tests/tests/test59/Intermediate Certificate 2 PL.01.06.crt
new file mode 100644
index 000000000..a84a7ba5e
--- /dev/null
+++ b/misc/nist_tests/tests/test59/Intermediate Certificate 2 PL.01.06.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test59/Intermediate Certificate 3 PL.01.06.crt b/misc/nist_tests/tests/test59/Intermediate Certificate 3 PL.01.06.crt
new file mode 100644
index 000000000..0b13f9f9b
--- /dev/null
+++ b/misc/nist_tests/tests/test59/Intermediate Certificate 3 PL.01.06.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test59/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test59/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test59/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test59/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test59/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test59/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test60/End Certificate PL.01.07.crt b/misc/nist_tests/tests/test60/End Certificate PL.01.07.crt
new file mode 100644
index 000000000..8741105ea
--- /dev/null
+++ b/misc/nist_tests/tests/test60/End Certificate PL.01.07.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test60/Intermediate CRL 1 PL.01.07.crl b/misc/nist_tests/tests/test60/Intermediate CRL 1 PL.01.07.crl
new file mode 100644
index 000000000..e778e911d
--- /dev/null
+++ b/misc/nist_tests/tests/test60/Intermediate CRL 1 PL.01.07.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test60/Intermediate CRL 2 PL.01.07.crl b/misc/nist_tests/tests/test60/Intermediate CRL 2 PL.01.07.crl
new file mode 100644
index 000000000..4f4ac6bc0
--- /dev/null
+++ b/misc/nist_tests/tests/test60/Intermediate CRL 2 PL.01.07.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test60/Intermediate CRL 3 PL.01.07.crl b/misc/nist_tests/tests/test60/Intermediate CRL 3 PL.01.07.crl
new file mode 100644
index 000000000..0b568e7cc
--- /dev/null
+++ b/misc/nist_tests/tests/test60/Intermediate CRL 3 PL.01.07.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test60/Intermediate CRL 4 PL.01.07.crl b/misc/nist_tests/tests/test60/Intermediate CRL 4 PL.01.07.crl
new file mode 100644
index 000000000..4cf694a98
--- /dev/null
+++ b/misc/nist_tests/tests/test60/Intermediate CRL 4 PL.01.07.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test60/Intermediate Certificate 1 PL.01.07.crt b/misc/nist_tests/tests/test60/Intermediate Certificate 1 PL.01.07.crt
new file mode 100644
index 000000000..01d844201
--- /dev/null
+++ b/misc/nist_tests/tests/test60/Intermediate Certificate 1 PL.01.07.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test60/Intermediate Certificate 2 PL.01.07.crt b/misc/nist_tests/tests/test60/Intermediate Certificate 2 PL.01.07.crt
new file mode 100644
index 000000000..0054dc622
--- /dev/null
+++ b/misc/nist_tests/tests/test60/Intermediate Certificate 2 PL.01.07.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test60/Intermediate Certificate 3 PL.01.07.crt b/misc/nist_tests/tests/test60/Intermediate Certificate 3 PL.01.07.crt
new file mode 100644
index 000000000..6fff65cc7
--- /dev/null
+++ b/misc/nist_tests/tests/test60/Intermediate Certificate 3 PL.01.07.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test60/Intermediate Certificate 4 PL.01.07.crt b/misc/nist_tests/tests/test60/Intermediate Certificate 4 PL.01.07.crt
new file mode 100644
index 000000000..c5eebca96
--- /dev/null
+++ b/misc/nist_tests/tests/test60/Intermediate Certificate 4 PL.01.07.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test60/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test60/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test60/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test60/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test60/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test60/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test61/End Certificate PL.01.08.crt b/misc/nist_tests/tests/test61/End Certificate PL.01.08.crt
new file mode 100644
index 000000000..7be023caf
--- /dev/null
+++ b/misc/nist_tests/tests/test61/End Certificate PL.01.08.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test61/Intermediate CRL 1 PL.01.08.crl b/misc/nist_tests/tests/test61/Intermediate CRL 1 PL.01.08.crl
new file mode 100644
index 000000000..05c2809aa
--- /dev/null
+++ b/misc/nist_tests/tests/test61/Intermediate CRL 1 PL.01.08.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test61/Intermediate CRL 2 PL.01.08.crl b/misc/nist_tests/tests/test61/Intermediate CRL 2 PL.01.08.crl
new file mode 100644
index 000000000..d74b9168c
--- /dev/null
+++ b/misc/nist_tests/tests/test61/Intermediate CRL 2 PL.01.08.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test61/Intermediate CRL 3 PL.01.08.crl b/misc/nist_tests/tests/test61/Intermediate CRL 3 PL.01.08.crl
new file mode 100644
index 000000000..7e6e83fb2
--- /dev/null
+++ b/misc/nist_tests/tests/test61/Intermediate CRL 3 PL.01.08.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test61/Intermediate CRL 4 PL.01.08.crl b/misc/nist_tests/tests/test61/Intermediate CRL 4 PL.01.08.crl
new file mode 100644
index 000000000..7161f4192
--- /dev/null
+++ b/misc/nist_tests/tests/test61/Intermediate CRL 4 PL.01.08.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test61/Intermediate Certificate 1 PL.01.08.crt b/misc/nist_tests/tests/test61/Intermediate Certificate 1 PL.01.08.crt
new file mode 100644
index 000000000..ba03f6c24
--- /dev/null
+++ b/misc/nist_tests/tests/test61/Intermediate Certificate 1 PL.01.08.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test61/Intermediate Certificate 2 PL.01.08.crt b/misc/nist_tests/tests/test61/Intermediate Certificate 2 PL.01.08.crt
new file mode 100644
index 000000000..bd4e40ea3
--- /dev/null
+++ b/misc/nist_tests/tests/test61/Intermediate Certificate 2 PL.01.08.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test61/Intermediate Certificate 3 PL.01.08.crt b/misc/nist_tests/tests/test61/Intermediate Certificate 3 PL.01.08.crt
new file mode 100644
index 000000000..4f9342b20
--- /dev/null
+++ b/misc/nist_tests/tests/test61/Intermediate Certificate 3 PL.01.08.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test61/Intermediate Certificate 4 PL.01.08.crt b/misc/nist_tests/tests/test61/Intermediate Certificate 4 PL.01.08.crt
new file mode 100644
index 000000000..5962eedfa
--- /dev/null
+++ b/misc/nist_tests/tests/test61/Intermediate Certificate 4 PL.01.08.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test61/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test61/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test61/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test61/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test61/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test61/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test62/End Certificate PL.01.09.crt b/misc/nist_tests/tests/test62/End Certificate PL.01.09.crt
new file mode 100644
index 000000000..bff8ea4cb
--- /dev/null
+++ b/misc/nist_tests/tests/test62/End Certificate PL.01.09.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test62/Intermediate CRL 1 PL.01.09.crl b/misc/nist_tests/tests/test62/Intermediate CRL 1 PL.01.09.crl
new file mode 100644
index 000000000..aa26a419a
--- /dev/null
+++ b/misc/nist_tests/tests/test62/Intermediate CRL 1 PL.01.09.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test62/Intermediate CRL 2 PL.01.09.crl b/misc/nist_tests/tests/test62/Intermediate CRL 2 PL.01.09.crl
new file mode 100644
index 000000000..61e712f0d
--- /dev/null
+++ b/misc/nist_tests/tests/test62/Intermediate CRL 2 PL.01.09.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test62/Intermediate CRL 3 PL.01.09.crl b/misc/nist_tests/tests/test62/Intermediate CRL 3 PL.01.09.crl
new file mode 100644
index 000000000..09707fd7b
--- /dev/null
+++ b/misc/nist_tests/tests/test62/Intermediate CRL 3 PL.01.09.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test62/Intermediate CRL 4 PL.01.09.crl b/misc/nist_tests/tests/test62/Intermediate CRL 4 PL.01.09.crl
new file mode 100644
index 000000000..997a057f2
--- /dev/null
+++ b/misc/nist_tests/tests/test62/Intermediate CRL 4 PL.01.09.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test62/Intermediate Certificate 1 PL.01.09.crt b/misc/nist_tests/tests/test62/Intermediate Certificate 1 PL.01.09.crt
new file mode 100644
index 000000000..aee257d7e
--- /dev/null
+++ b/misc/nist_tests/tests/test62/Intermediate Certificate 1 PL.01.09.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test62/Intermediate Certificate 2 PL.01.09.crt b/misc/nist_tests/tests/test62/Intermediate Certificate 2 PL.01.09.crt
new file mode 100644
index 000000000..a62d9a026
--- /dev/null
+++ b/misc/nist_tests/tests/test62/Intermediate Certificate 2 PL.01.09.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test62/Intermediate Certificate 3 PL.01.09.crt b/misc/nist_tests/tests/test62/Intermediate Certificate 3 PL.01.09.crt
new file mode 100644
index 000000000..aa91f3427
--- /dev/null
+++ b/misc/nist_tests/tests/test62/Intermediate Certificate 3 PL.01.09.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test62/Intermediate Certificate 4 PL.01.09.crt b/misc/nist_tests/tests/test62/Intermediate Certificate 4 PL.01.09.crt
new file mode 100644
index 000000000..744603003
--- /dev/null
+++ b/misc/nist_tests/tests/test62/Intermediate Certificate 4 PL.01.09.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test62/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test62/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test62/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test62/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test62/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test62/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test63/End Certificate PL.01.10.crt b/misc/nist_tests/tests/test63/End Certificate PL.01.10.crt
new file mode 100644
index 000000000..16c1c687d
--- /dev/null
+++ b/misc/nist_tests/tests/test63/End Certificate PL.01.10.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test63/Intermediate CRL 1 PL.01.10.crl b/misc/nist_tests/tests/test63/Intermediate CRL 1 PL.01.10.crl
new file mode 100644
index 000000000..40c4afc45
--- /dev/null
+++ b/misc/nist_tests/tests/test63/Intermediate CRL 1 PL.01.10.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test63/Intermediate CRL 2 PL.01.10.crl b/misc/nist_tests/tests/test63/Intermediate CRL 2 PL.01.10.crl
new file mode 100644
index 000000000..7bffd4661
--- /dev/null
+++ b/misc/nist_tests/tests/test63/Intermediate CRL 2 PL.01.10.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test63/Intermediate CRL 3 PL.01.10.crl b/misc/nist_tests/tests/test63/Intermediate CRL 3 PL.01.10.crl
new file mode 100644
index 000000000..20f503c6b
--- /dev/null
+++ b/misc/nist_tests/tests/test63/Intermediate CRL 3 PL.01.10.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test63/Intermediate CRL 4 PL.01.10.crl b/misc/nist_tests/tests/test63/Intermediate CRL 4 PL.01.10.crl
new file mode 100644
index 000000000..71e622907
--- /dev/null
+++ b/misc/nist_tests/tests/test63/Intermediate CRL 4 PL.01.10.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test63/Intermediate Certificate 1 PL.01.10.crt b/misc/nist_tests/tests/test63/Intermediate Certificate 1 PL.01.10.crt
new file mode 100644
index 000000000..6b3f6eb4b
--- /dev/null
+++ b/misc/nist_tests/tests/test63/Intermediate Certificate 1 PL.01.10.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test63/Intermediate Certificate 2 PL.01.10.crt b/misc/nist_tests/tests/test63/Intermediate Certificate 2 PL.01.10.crt
new file mode 100644
index 000000000..f2e88f9fe
--- /dev/null
+++ b/misc/nist_tests/tests/test63/Intermediate Certificate 2 PL.01.10.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test63/Intermediate Certificate 3 PL.01.10.crt b/misc/nist_tests/tests/test63/Intermediate Certificate 3 PL.01.10.crt
new file mode 100644
index 000000000..2d636dd43
--- /dev/null
+++ b/misc/nist_tests/tests/test63/Intermediate Certificate 3 PL.01.10.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test63/Intermediate Certificate 4 PL.01.10.crt b/misc/nist_tests/tests/test63/Intermediate Certificate 4 PL.01.10.crt
new file mode 100644
index 000000000..a0ed3a167
--- /dev/null
+++ b/misc/nist_tests/tests/test63/Intermediate Certificate 4 PL.01.10.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test63/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test63/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test63/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test63/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test63/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test63/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test64/End Certificate RL.02.01.crt b/misc/nist_tests/tests/test64/End Certificate RL.02.01.crt
new file mode 100644
index 000000000..771423eca
--- /dev/null
+++ b/misc/nist_tests/tests/test64/End Certificate RL.02.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test64/Intermediate CRL RL.02.01.crl b/misc/nist_tests/tests/test64/Intermediate CRL RL.02.01.crl
new file mode 100644
index 000000000..0e3e2bd95
--- /dev/null
+++ b/misc/nist_tests/tests/test64/Intermediate CRL RL.02.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test64/Intermediate Certificate RL.02.01.crt b/misc/nist_tests/tests/test64/Intermediate Certificate RL.02.01.crt
new file mode 100644
index 000000000..1ae82584e
--- /dev/null
+++ b/misc/nist_tests/tests/test64/Intermediate Certificate RL.02.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test64/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test64/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test64/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test64/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test64/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test64/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test65/End Certificate RL.03.01.crt b/misc/nist_tests/tests/test65/End Certificate RL.03.01.crt
new file mode 100644
index 000000000..29d51a7f9
--- /dev/null
+++ b/misc/nist_tests/tests/test65/End Certificate RL.03.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test65/Intermediate CRL RL.03.01.crl b/misc/nist_tests/tests/test65/Intermediate CRL RL.03.01.crl
new file mode 100644
index 000000000..bd2d906ff
--- /dev/null
+++ b/misc/nist_tests/tests/test65/Intermediate CRL RL.03.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test65/Intermediate Certificate 1 RL.03.01.crt b/misc/nist_tests/tests/test65/Intermediate Certificate 1 RL.03.01.crt
new file mode 100644
index 000000000..214c839fe
--- /dev/null
+++ b/misc/nist_tests/tests/test65/Intermediate Certificate 1 RL.03.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test65/Intermediate Certificate 2 RL.03.01.crt b/misc/nist_tests/tests/test65/Intermediate Certificate 2 RL.03.01.crt
new file mode 100644
index 000000000..57c2e5914
--- /dev/null
+++ b/misc/nist_tests/tests/test65/Intermediate Certificate 2 RL.03.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test65/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test65/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test65/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test65/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test65/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test65/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test66/End Certificate RL.03.02.crt b/misc/nist_tests/tests/test66/End Certificate RL.03.02.crt
new file mode 100644
index 000000000..ccdb0e086
--- /dev/null
+++ b/misc/nist_tests/tests/test66/End Certificate RL.03.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test66/Intermediate CRL RL.03.02.crl b/misc/nist_tests/tests/test66/Intermediate CRL RL.03.02.crl
new file mode 100644
index 000000000..f80b444e2
--- /dev/null
+++ b/misc/nist_tests/tests/test66/Intermediate CRL RL.03.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test66/Intermediate Certificate RL.03.02.crt b/misc/nist_tests/tests/test66/Intermediate Certificate RL.03.02.crt
new file mode 100644
index 000000000..23f8b17c2
--- /dev/null
+++ b/misc/nist_tests/tests/test66/Intermediate Certificate RL.03.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test66/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test66/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test66/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test66/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test66/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test66/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test67/End Certificate RL.03.03.crt b/misc/nist_tests/tests/test67/End Certificate RL.03.03.crt
new file mode 100644
index 000000000..85d5508db
--- /dev/null
+++ b/misc/nist_tests/tests/test67/End Certificate RL.03.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test67/Intermediate CRL 1 RL.03.03.crl b/misc/nist_tests/tests/test67/Intermediate CRL 1 RL.03.03.crl
new file mode 100644
index 000000000..3fe834938
--- /dev/null
+++ b/misc/nist_tests/tests/test67/Intermediate CRL 1 RL.03.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test67/Intermediate CRL 2 RL.03.03.crl b/misc/nist_tests/tests/test67/Intermediate CRL 2 RL.03.03.crl
new file mode 100644
index 000000000..15593fa84
--- /dev/null
+++ b/misc/nist_tests/tests/test67/Intermediate CRL 2 RL.03.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test67/Intermediate Certificate RL.03.03.crt b/misc/nist_tests/tests/test67/Intermediate Certificate RL.03.03.crt
new file mode 100644
index 000000000..92a4b3a95
--- /dev/null
+++ b/misc/nist_tests/tests/test67/Intermediate Certificate RL.03.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test67/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test67/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test67/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test67/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test67/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test67/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test68/End Certificate RL.05.01.crt b/misc/nist_tests/tests/test68/End Certificate RL.05.01.crt
new file mode 100644
index 000000000..bddd72da6
--- /dev/null
+++ b/misc/nist_tests/tests/test68/End Certificate RL.05.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test68/Intermediate CRL 1 RL.05.01.crl b/misc/nist_tests/tests/test68/Intermediate CRL 1 RL.05.01.crl
new file mode 100644
index 000000000..fdbf8ea0c
--- /dev/null
+++ b/misc/nist_tests/tests/test68/Intermediate CRL 1 RL.05.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test68/Intermediate CRL 2 RL.05.01.crl b/misc/nist_tests/tests/test68/Intermediate CRL 2 RL.05.01.crl
new file mode 100644
index 000000000..33b764094
--- /dev/null
+++ b/misc/nist_tests/tests/test68/Intermediate CRL 2 RL.05.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test68/Intermediate Certificate 1 RL.05.01.crt b/misc/nist_tests/tests/test68/Intermediate Certificate 1 RL.05.01.crt
new file mode 100644
index 000000000..4bc8127b3
--- /dev/null
+++ b/misc/nist_tests/tests/test68/Intermediate Certificate 1 RL.05.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test68/Intermediate Certificate 2 RL.05.01.crt b/misc/nist_tests/tests/test68/Intermediate Certificate 2 RL.05.01.crt
new file mode 100644
index 000000000..1ca8d5c32
--- /dev/null
+++ b/misc/nist_tests/tests/test68/Intermediate Certificate 2 RL.05.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test68/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test68/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test68/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test68/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test68/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test68/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test69/End Certificate RL.05.02.crt b/misc/nist_tests/tests/test69/End Certificate RL.05.02.crt
new file mode 100644
index 000000000..00fc716dc
--- /dev/null
+++ b/misc/nist_tests/tests/test69/End Certificate RL.05.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test69/Intermediate CRL RL.05.02.crl b/misc/nist_tests/tests/test69/Intermediate CRL RL.05.02.crl
new file mode 100644
index 000000000..fc09d351a
--- /dev/null
+++ b/misc/nist_tests/tests/test69/Intermediate CRL RL.05.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test69/Intermediate Certificate RL.05.02.crt b/misc/nist_tests/tests/test69/Intermediate Certificate RL.05.02.crt
new file mode 100644
index 000000000..6c19ee09e
--- /dev/null
+++ b/misc/nist_tests/tests/test69/Intermediate Certificate RL.05.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test69/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test69/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test69/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test69/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test69/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test69/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test70/End Certificate RL.06.01.crt b/misc/nist_tests/tests/test70/End Certificate RL.06.01.crt
new file mode 100644
index 000000000..c576960be
--- /dev/null
+++ b/misc/nist_tests/tests/test70/End Certificate RL.06.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test70/Intermediate CRL 1 RL.06.01.crl b/misc/nist_tests/tests/test70/Intermediate CRL 1 RL.06.01.crl
new file mode 100644
index 000000000..77dafb909
--- /dev/null
+++ b/misc/nist_tests/tests/test70/Intermediate CRL 1 RL.06.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test70/Intermediate CRL 2 RL.06.01.crl b/misc/nist_tests/tests/test70/Intermediate CRL 2 RL.06.01.crl
new file mode 100644
index 000000000..4e22f3966
--- /dev/null
+++ b/misc/nist_tests/tests/test70/Intermediate CRL 2 RL.06.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test70/Intermediate Certificate 1 RL.06.01.crt b/misc/nist_tests/tests/test70/Intermediate Certificate 1 RL.06.01.crt
new file mode 100644
index 000000000..5509c5438
--- /dev/null
+++ b/misc/nist_tests/tests/test70/Intermediate Certificate 1 RL.06.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test70/Intermediate Certificate 2 RL.06.01.crt b/misc/nist_tests/tests/test70/Intermediate Certificate 2 RL.06.01.crt
new file mode 100644
index 000000000..9af80b8e4
--- /dev/null
+++ b/misc/nist_tests/tests/test70/Intermediate Certificate 2 RL.06.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test70/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test70/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test70/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test70/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test70/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test70/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test71/End Certificate RL.06.02.crt b/misc/nist_tests/tests/test71/End Certificate RL.06.02.crt
new file mode 100644
index 000000000..0cc1718ee
--- /dev/null
+++ b/misc/nist_tests/tests/test71/End Certificate RL.06.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test71/Intermediate CRL RL.06.02.crl b/misc/nist_tests/tests/test71/Intermediate CRL RL.06.02.crl
new file mode 100644
index 000000000..c34a95df1
--- /dev/null
+++ b/misc/nist_tests/tests/test71/Intermediate CRL RL.06.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test71/Intermediate Certificate RL.06.02.crt b/misc/nist_tests/tests/test71/Intermediate Certificate RL.06.02.crt
new file mode 100644
index 000000000..07076019c
--- /dev/null
+++ b/misc/nist_tests/tests/test71/Intermediate Certificate RL.06.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test71/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test71/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test71/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test71/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test71/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test71/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test72/End Certificate RL.07.01.crt b/misc/nist_tests/tests/test72/End Certificate RL.07.01.crt
new file mode 100644
index 000000000..6c61375d8
--- /dev/null
+++ b/misc/nist_tests/tests/test72/End Certificate RL.07.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test72/Intermediate CRL RL.07.01.crl b/misc/nist_tests/tests/test72/Intermediate CRL RL.07.01.crl
new file mode 100644
index 000000000..643141b37
--- /dev/null
+++ b/misc/nist_tests/tests/test72/Intermediate CRL RL.07.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test72/Intermediate Certificate RL.07.01.crt b/misc/nist_tests/tests/test72/Intermediate Certificate RL.07.01.crt
new file mode 100644
index 000000000..36b1f2052
--- /dev/null
+++ b/misc/nist_tests/tests/test72/Intermediate Certificate RL.07.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test72/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test72/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test72/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test72/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test72/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test72/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test73/End Certificate RL.07.02.crt b/misc/nist_tests/tests/test73/End Certificate RL.07.02.crt
new file mode 100644
index 000000000..9bae5325f
--- /dev/null
+++ b/misc/nist_tests/tests/test73/End Certificate RL.07.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test73/Intermediate CRL RL.07.02.crl b/misc/nist_tests/tests/test73/Intermediate CRL RL.07.02.crl
new file mode 100644
index 000000000..6b76dc0b8
--- /dev/null
+++ b/misc/nist_tests/tests/test73/Intermediate CRL RL.07.02.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test73/Intermediate Certificate RL.07.02.crt b/misc/nist_tests/tests/test73/Intermediate Certificate RL.07.02.crt
new file mode 100644
index 000000000..ff6df2598
--- /dev/null
+++ b/misc/nist_tests/tests/test73/Intermediate Certificate RL.07.02.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test73/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test73/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test73/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test73/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test73/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test73/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test74/End Certificate RL.07.03.crt b/misc/nist_tests/tests/test74/End Certificate RL.07.03.crt
new file mode 100644
index 000000000..93e05bd1e
--- /dev/null
+++ b/misc/nist_tests/tests/test74/End Certificate RL.07.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test74/Intermediate CRL RL.07.03.crl b/misc/nist_tests/tests/test74/Intermediate CRL RL.07.03.crl
new file mode 100644
index 000000000..8733b183c
--- /dev/null
+++ b/misc/nist_tests/tests/test74/Intermediate CRL RL.07.03.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test74/Intermediate Certificate RL.07.03.crt b/misc/nist_tests/tests/test74/Intermediate Certificate RL.07.03.crt
new file mode 100644
index 000000000..c9258148d
--- /dev/null
+++ b/misc/nist_tests/tests/test74/Intermediate Certificate RL.07.03.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test74/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test74/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test74/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test74/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test74/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test74/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test75/End Certificate RL.08.01.crt b/misc/nist_tests/tests/test75/End Certificate RL.08.01.crt
new file mode 100644
index 000000000..7d8179be0
--- /dev/null
+++ b/misc/nist_tests/tests/test75/End Certificate RL.08.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test75/Intermediate CRL RL.08.01.crl b/misc/nist_tests/tests/test75/Intermediate CRL RL.08.01.crl
new file mode 100644
index 000000000..19f472c7f
--- /dev/null
+++ b/misc/nist_tests/tests/test75/Intermediate CRL RL.08.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test75/Intermediate Certificate RL.08.01.crt b/misc/nist_tests/tests/test75/Intermediate Certificate RL.08.01.crt
new file mode 100644
index 000000000..4a4c27e8c
--- /dev/null
+++ b/misc/nist_tests/tests/test75/Intermediate Certificate RL.08.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test75/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test75/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test75/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test75/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test75/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test75/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test76/End Certificate RL.09.01.crt b/misc/nist_tests/tests/test76/End Certificate RL.09.01.crt
new file mode 100644
index 000000000..bde477d89
--- /dev/null
+++ b/misc/nist_tests/tests/test76/End Certificate RL.09.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test76/Intermediate CRL RL.09.01.crl b/misc/nist_tests/tests/test76/Intermediate CRL RL.09.01.crl
new file mode 100644
index 000000000..dbbbd43be
--- /dev/null
+++ b/misc/nist_tests/tests/test76/Intermediate CRL RL.09.01.crl
Binary files differ
diff --git a/misc/nist_tests/tests/test76/Intermediate Certificate RL.09.01.crt b/misc/nist_tests/tests/test76/Intermediate Certificate RL.09.01.crt
new file mode 100644
index 000000000..ab1c64390
--- /dev/null
+++ b/misc/nist_tests/tests/test76/Intermediate Certificate RL.09.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test76/Trust Anchor CP.01.01.crt b/misc/nist_tests/tests/test76/Trust Anchor CP.01.01.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/misc/nist_tests/tests/test76/Trust Anchor CP.01.01.crt
Binary files differ
diff --git a/misc/nist_tests/tests/test76/Trust Anchor CRL CP.01.01.crl b/misc/nist_tests/tests/test76/Trust Anchor CRL CP.01.01.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/misc/nist_tests/tests/test76/Trust Anchor CRL CP.01.01.crl
Binary files differ
diff --git a/misc/nist_tests/x509test.cpp b/misc/nist_tests/x509test.cpp
new file mode 100644
index 000000000..8228443e2
--- /dev/null
+++ b/misc/nist_tests/x509test.cpp
@@ -0,0 +1,411 @@
+/*
+ Code to run the X.509v3 processing tests described in "Conformance Testing of
+ Relying Party Client Certificate Path Proccessing Logic", which is available
+ on NIST's web site.
+*/
+
+#include <botan/x509stor.h>
+#include <botan/init.h>
+using namespace Botan;
+
+#include <algorithm>
+#include <iostream>
+#include <iomanip>
+#include <string>
+#include <vector>
+#include <map>
+#include <cstdlib>
+
+#include <dirent.h>
+
+#define POLICY_TEST1 1000
+#define POLICY_TEST2 2000
+#define POLICY_TEST3 3000
+
+std::vector<std::string> dir_listing(const std::string&);
+
+void run_one_test(u32bit, X509_Code,
+ std::string, std::string,
+ std::vector<std::string>,
+ std::vector<std::string>);
+
+std::map<u32bit, X509_Code> expected_results;
+
+u32bit unexp_failure, unexp_success, wrong_error, skipped;
+
+void populate_expected_results();
+
+int main()
+ {
+ const std::string root_test_dir = "tests/";
+ unexp_failure = unexp_success = wrong_error = skipped = 0;
+
+ try {
+
+ LibraryInitializer init;
+
+ populate_expected_results();
+
+ std::vector<std::string> test_dirs = dir_listing(root_test_dir);
+ std::sort(test_dirs.begin(), test_dirs.end());
+
+ for(size_t j = 0; j != test_dirs.size(); j++)
+ {
+ const std::string test_dir = root_test_dir + test_dirs[j] + "/";
+ std::vector<std::string> all_files = dir_listing(test_dir);
+
+ std::vector<std::string> certs, crls;
+ std::string root_cert, to_verify;
+
+ for(size_t k = 0; k != all_files.size(); k++)
+ {
+ const std::string current = all_files[k];
+ if(current.find("Intermediate Certificate") != std::string::npos)
+ certs.push_back(test_dir + current);
+ else if(current.find("Trust Anchor CP") != std::string::npos)
+ root_cert = test_dir + current;
+ else if(current.find("End Certificate") != std::string::npos &&
+ current.find(".crtx") == std::string::npos)
+ to_verify = test_dir + current;
+ else if(current.find("CRL") != std::string::npos)
+ crls.push_back(test_dir + current);
+ }
+
+ if(expected_results.find(j+1) == expected_results.end())
+ {
+#if 0
+ std::cout << "Testing disabled for test #" << j+1
+ << " <skipped>" << std::endl;
+#endif
+ skipped++;
+ continue;
+ }
+
+ run_one_test(j+1, expected_results[j+1],
+ root_cert, to_verify, certs, crls);
+ }
+
+ }
+ catch(std::exception& e)
+ {
+ std::cout << e.what() << std::endl;
+ return 1;
+ }
+
+ std::cout << "Total unexpected failures: " << unexp_failure << std::endl;
+ std::cout << "Total unexpected successes: " << unexp_success << std::endl;
+ std::cout << "Total incorrect failures: " << wrong_error << std::endl;
+ std::cout << "Tests skipped: " << skipped << std::endl;
+
+ return 0;
+ }
+
+void run_one_test(u32bit test_no, X509_Code expected,
+ std::string root_cert, std::string to_verify,
+ std::vector<std::string> certs,
+ std::vector<std::string> crls)
+ {
+ std::cout << "Processing test #" << test_no << "... ";
+ std::cout.flush();
+
+ X509_Code result = VERIFIED;
+
+ X509_Store store;
+
+ store.add_cert(X509_Certificate(root_cert), true);
+
+ X509_Certificate end_user(to_verify);
+
+ for(size_t j = 0; j != certs.size(); j++)
+ store.add_cert(X509_Certificate(certs[j]));
+
+ for(size_t j = 0; j != crls.size(); j++)
+ {
+ DataSource_Stream in(crls[j]);
+
+ X509_CRL crl(in);
+ /*
+ std::vector<CRL_Entry> crl_entries = crl.get_revoked();
+ for(u32bit k = 0; k != crl_entries.size(); k++)
+ {
+ std::cout << "Revoked: " << std::flush;
+ for(u32bit l = 0; l != crl_entries[k].serial.size(); l++)
+ printf("%02X", crl_entries[k].serial[l]);
+ std::cout << std::endl;
+ }
+ */
+ result = store.add_crl(crl);
+ if(result != VERIFIED)
+ break;
+ }
+
+ /* if everything has gone well up until now */
+
+ if(result == VERIFIED)
+ {
+ result = store.validate_cert(end_user);
+
+ X509_Code result2 = store.validate_cert(end_user);
+
+ if(result != result2)
+ std::cout << "Two runs, two answers: " << result << " "
+ << result2 << std::endl;
+ }
+
+ if(result == expected)
+ {
+ std::cout << "passed" << std::endl;
+ return;
+ }
+
+ if(expected == VERIFIED)
+ {
+ std::cout << "unexpected failure: " << result << std::endl;
+ unexp_failure++;
+ }
+ else if(result == VERIFIED)
+ {
+ std::cout << "unexpected success: " << expected << std::endl;
+ unexp_success++;
+ }
+ else
+ {
+ std::cout << "wrong error: " << result << "/" << expected << std::endl;
+ wrong_error++;
+ }
+ }
+
+std::vector<std::string> dir_listing(const std::string& dir_name)
+ {
+ DIR* dir = opendir(dir_name.c_str());
+ if(!dir)
+ {
+ std::cout << "Error, couldn't open dir " << dir_name << std::endl;
+ std::exit(1);
+ }
+
+ std::vector<std::string> listing;
+
+ while(true)
+ {
+ struct dirent* dir_ent = readdir(dir);
+
+ if(dir_ent == 0)
+ break;
+ const std::string entry = dir_ent->d_name;
+ if(entry == "." || entry == "..")
+ continue;
+
+ listing.push_back(entry);
+ }
+ closedir(dir);
+
+ return listing;
+ }
+
+/*
+ The expected results are essentially the error codes that best coorespond
+ to the problem described in the testing documentation.
+
+ There are a few cases where the tests say there should or should not be an
+ error, and I disagree. A few of the tests have test results different from
+ what they "should" be: these changes are marked as such, and have comments
+ explaining the problem at hand.
+*/
+void populate_expected_results()
+ {
+ /* OK, not a super great way of doing this... */
+ expected_results[1] = VERIFIED;
+ expected_results[2] = SIGNATURE_ERROR;
+ expected_results[3] = SIGNATURE_ERROR;
+ expected_results[4] = VERIFIED;
+ expected_results[5] = CERT_NOT_YET_VALID;
+ expected_results[6] = CERT_NOT_YET_VALID;
+ expected_results[7] = VERIFIED;
+ expected_results[8] = CERT_NOT_YET_VALID;
+ expected_results[9] = CERT_HAS_EXPIRED;
+ expected_results[10] = CERT_HAS_EXPIRED;
+ expected_results[11] = CERT_HAS_EXPIRED;
+ expected_results[12] = VERIFIED;
+ expected_results[13] = CERT_ISSUER_NOT_FOUND;
+
+ // FIXME: we get the answer right for the wrong reason
+ // ummm... I don't know if that is still true. I wish I had thought to
+ // write down exactly what this 'wrong reason' was in the first place.
+ expected_results[14] = CERT_ISSUER_NOT_FOUND;
+ expected_results[15] = VERIFIED;
+ expected_results[16] = VERIFIED;
+ expected_results[17] = VERIFIED;
+ expected_results[18] = VERIFIED;
+
+ /************* CHANGE OF TEST RESULT FOR TEST #19 ************************
+ One of the certificates has no attached CRL. By strict X.509 rules, if
+ there is no good CRL in hand, then the certificate shouldn't be used for
+ CA stuff. But while this is usually a good idea, it interferes with simple
+ uses of certificates which shouldn't (IMO) force the use of CRLs. There is
+ no assigned error code for this scenario because I don't consider it to be
+ an error (probably would be something like NO_REVOCATION_DATA_AVAILABLE)
+ **************************************************************************/
+ expected_results[19] = VERIFIED;
+ expected_results[20] = CERT_IS_REVOKED;
+ expected_results[21] = CERT_IS_REVOKED;
+
+ expected_results[22] = CA_CERT_NOT_FOR_CERT_ISSUER;
+ expected_results[23] = CA_CERT_NOT_FOR_CERT_ISSUER;
+ expected_results[24] = VERIFIED;
+ expected_results[25] = CA_CERT_NOT_FOR_CERT_ISSUER;
+ expected_results[26] = VERIFIED;
+ expected_results[27] = VERIFIED;
+ expected_results[28] = CA_CERT_NOT_FOR_CERT_ISSUER;
+ expected_results[29] = CA_CERT_NOT_FOR_CERT_ISSUER;
+ expected_results[30] = VERIFIED;
+
+ expected_results[31] = CA_CERT_NOT_FOR_CRL_ISSUER;
+ expected_results[32] = CA_CERT_NOT_FOR_CRL_ISSUER;
+ expected_results[33] = VERIFIED;
+
+ /*
+ Policy tests: a little trickier because there are other inputs which
+ affect the result.
+
+ In the case of the tests currently in the suite, the default method (with
+ acceptable policy being "any-policy" and with no explict policy required),
+ will almost always result in a verified status. This is not particularly
+ helpful. So, we do several different tests for each test set:
+
+ 1) With the user policy as any-policy and no explicit policy
+ 2) With the user policy as any-policy and an explicit policy required
+ 3) With the user policy as test-policy-1 (2.16.840.1.101.3.1.48.1) and
+ an explict policy required
+ 4) With the user policy as either test-policy-1 or test-policy-2 and an
+ explicit policy required
+
+ This provides reasonably good coverage of the possible outcomes.
+ */
+
+ /*
+ expected_results[34] = VERIFIED;
+ expected_results[34+POLICY_TEST1] = ;
+ expected_results[34+POLICY_TEST2] = ;
+ expected_results[34+POLICY_TEST3] = ;
+ expected_results[35] = VERIFIED;
+ expected_results[35+POLICY_TEST1] = ;
+ expected_results[35+POLICY_TEST2] = ;
+ expected_results[35+POLICY_TEST3] = ;
+ expected_results[36] = VERIFIED;
+ expected_results[36+POLICY_TEST1] = ;
+ expected_results[36+POLICY_TEST2] = ;
+ expected_results[36+POLICY_TEST3] = ;
+ expected_results[37] = VERIFIED;
+ expected_results[37+POLICY_TEST1] = ;
+ expected_results[37+POLICY_TEST2] = ;
+ expected_results[37+POLICY_TEST3] = ;
+ expected_results[38] = VERIFIED;
+ expected_results[38+POLICY_TEST1] = ;
+ expected_results[38+POLICY_TEST2] = ;
+ expected_results[38+POLICY_TEST3] = ;
+ expected_results[39] = VERIFIED;
+ expected_results[39+POLICY_TEST1] = ;
+ expected_results[39+POLICY_TEST2] = ;
+ expected_results[39+POLICY_TEST3] = ;
+ expected_results[40] = VERIFIED;
+ expected_results[40+POLICY_TEST1] = ;
+ expected_results[40+POLICY_TEST2] = ;
+ expected_results[40+POLICY_TEST3] = ;
+ expected_results[41] = VERIFIED;
+ expected_results[41+POLICY_TEST1] = ;
+ expected_results[41+POLICY_TEST2] = ;
+ expected_results[41+POLICY_TEST3] = ;
+ expected_results[42] = VERIFIED;
+ expected_results[42+POLICY_TEST1] = ;
+ expected_results[42+POLICY_TEST2] = ;
+ expected_results[42+POLICY_TEST3] = ;
+ expected_results[43] = VERIFIED;
+ expected_results[43+POLICY_TEST1] = ;
+ expected_results[43+POLICY_TEST2] = ;
+ expected_results[43+POLICY_TEST3] = ;
+ expected_results[44] = VERIFIED;
+ expected_results[44+POLICY_TEST1] = ;
+ expected_results[44+POLICY_TEST2] = ;
+ expected_results[44+POLICY_TEST3] = ;
+ expected_results[45] = EXPLICT_POLICY_REQUIRED;
+ expected_results[45+POLICY_TEST1] = ;
+ expected_results[45+POLICY_TEST2] = ;
+ expected_results[45+POLICY_TEST3] = ;
+ expected_results[46] = ACCEPT;
+ expected_results[46+POLICY_TEST1] = ;
+ expected_results[46+POLICY_TEST2] = ;
+ expected_results[46+POLICY_TEST3] = ;
+ expected_results[47] = EXPLICT_POLICY_REQUIRED;
+ expected_results[47+POLICY_TEST1] = ;
+ expected_results[47+POLICY_TEST2] = ;
+ expected_results[47+POLICY_TEST3] = ;
+ expected_results[48] = VERIFIED;
+ expected_results[48+POLICY_TEST1] = ;
+ expected_results[48+POLICY_TEST2] = ;
+ expected_results[48+POLICY_TEST3] = ;
+ expected_results[49] = VERIFIED;
+ expected_results[49+POLICY_TEST1] = ;
+ expected_results[49+POLICY_TEST2] = ;
+ expected_results[49+POLICY_TEST3] = ;
+ expected_results[50] = VERIFIED;
+ expected_results[50+POLICY_TEST1] = ;
+ expected_results[50+POLICY_TEST2] = ;
+ expected_results[50+POLICY_TEST3] = ;
+ expected_results[51] = VERIFIED;
+ expected_results[51+POLICY_TEST1] = ;
+ expected_results[51+POLICY_TEST2] = ;
+ expected_results[51+POLICY_TEST3] = ;
+ expected_results[52] = VERIFIED;
+ expected_results[52+POLICY_TEST1] = ;
+ expected_results[52+POLICY_TEST2] = ;
+ expected_results[52+POLICY_TEST3] = ;
+ expected_results[53] = VERIFIED;
+ expected_results[53+POLICY_TEST1] = ;
+ expected_results[53+POLICY_TEST2] = ;
+ expected_results[53+POLICY_TEST3] = ;
+ */
+
+ expected_results[54] = CERT_CHAIN_TOO_LONG;
+ expected_results[55] = CERT_CHAIN_TOO_LONG;
+ expected_results[56] = VERIFIED;
+ expected_results[57] = VERIFIED;
+ expected_results[58] = CERT_CHAIN_TOO_LONG;
+ expected_results[59] = CERT_CHAIN_TOO_LONG;
+ expected_results[60] = CERT_CHAIN_TOO_LONG;
+ expected_results[61] = CERT_CHAIN_TOO_LONG;
+ expected_results[62] = VERIFIED;
+ expected_results[63] = VERIFIED;
+
+ expected_results[64] = SIGNATURE_ERROR;
+
+ /************ CHANGE OF TEST RESULT FOR TEST #65 *************************
+ I cannot figure out what exactly the problem here is supposed to be;
+ looking at it by hand, everything seems fine. If someone can explain I
+ would be happy to listen.
+ ************************************************************************/
+ expected_results[65] = VERIFIED;
+ expected_results[66] = CRL_ISSUER_NOT_FOUND;
+
+ /************ CHANGE OF TEST RESULT FOR TEST #67 *************************
+ The test docs say this should be verified. However, the problem being that
+ there is an extra CRL with an unknown issuer. Returning VERIFIED in this
+ case is obviously bad, since the user may well want to know that the CRL
+ in question has no known issuer. So we return CRL_ISSUER_NOT_FOUND instead
+ of VERIFIED. The actual certificate path of course still verifies, but
+ it's kind of an all-or-nothing testing procedure.
+ ************************************************************************/
+ expected_results[67] = CRL_ISSUER_NOT_FOUND;
+
+ expected_results[68] = CERT_IS_REVOKED;
+ expected_results[69] = CERT_IS_REVOKED;
+ expected_results[70] = CERT_IS_REVOKED;
+ expected_results[71] = CERT_IS_REVOKED;
+ expected_results[72] = CRL_HAS_EXPIRED;
+ expected_results[73] = CRL_HAS_EXPIRED;
+ expected_results[74] = VERIFIED;
+
+ /* These tests use weird CRL extensions which aren't supported yet */
+ //expected_results[75] = ;
+ //expected_results[76] = ;
+ }