Rename the files in the NIST X.509 certificate path validation suite to

be shorter, with no embedded spaces.

Also update the C++ test program to look for the new filenames.

1 files changed, 5 insertions, 5 deletions

diff --git a/misc/nist_tests/x509test.cpp b/misc/nist_tests/x509test.cpp
index 8228443e2..7f4fe94ee 100644
--- a/misc/nist_tests/x509test.cpp
+++ b/misc/nist_tests/x509test.cpp
@@ -60,14 +60,14 @@ int main()
       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)
+         if(current.find("int") != std::string::npos &&
+            current.find(".crt") != std::string::npos)
             certs.push_back(test_dir + current);
-         else if(current.find("Trust Anchor CP") != std::string::npos)
+         else if(current.find("root.crt") != std::string::npos)
             root_cert = test_dir + current;
-         else if(current.find("End Certificate") != std::string::npos &&
-                 current.find(".crtx") == std::string::npos)
+         else if(current.find("end.crt") != std::string::npos)
             to_verify = test_dir + current;
-         else if(current.find("CRL") != std::string::npos)
+         else if(current.find(".crl") != std::string::npos)
             crls.push_back(test_dir + current);
          }