commit 5ddc5b14d9260b481e628390551c0ac52ef9df6e
author David Benjamin <davidben@google.com> Wed Jun 17 14:07:25 2020 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Thu Jun 18 22:39:51 2020 +0000
tree b3a32bb8beef1f3f2b62e033894e55b29a7310eb
parent 1b8194715eeb6b43f9534a310cedd3d44d62911c

Move crypto/x509 test data into its own directory.

I'm about to add a lot more of these.

Change-Id: I2556e301dbed3ceb450e7070ffed46dc4d6de2b4
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/41744
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>

crypto/x509/test/make_many_constraints.go

diff --git a/crypto/x509/make_many_constraints.go b/crypto/x509/test/make_many_constraints.go
similarity index 100%
rename from crypto/x509/make_many_constraints.go
rename to crypto/x509/test/make_many_constraints.go

crypto/x509/test/many_constraints.pem

diff --git a/crypto/x509/many_constraints.pem b/crypto/x509/test/many_constraints.pem
similarity index 100%
rename from crypto/x509/many_constraints.pem
rename to crypto/x509/test/many_constraints.pem

crypto/x509/test/many_names1.pem

diff --git a/crypto/x509/many_names1.pem b/crypto/x509/test/many_names1.pem
similarity index 100%
rename from crypto/x509/many_names1.pem
rename to crypto/x509/test/many_names1.pem

crypto/x509/test/many_names2.pem

diff --git a/crypto/x509/many_names2.pem b/crypto/x509/test/many_names2.pem
similarity index 100%
rename from crypto/x509/many_names2.pem
rename to crypto/x509/test/many_names2.pem

crypto/x509/test/many_names3.pem

diff --git a/crypto/x509/many_names3.pem b/crypto/x509/test/many_names3.pem
similarity index 100%
rename from crypto/x509/many_names3.pem
rename to crypto/x509/test/many_names3.pem

crypto/x509/test/some_names1.pem

diff --git a/crypto/x509/some_names1.pem b/crypto/x509/test/some_names1.pem
similarity index 100%
rename from crypto/x509/some_names1.pem
rename to crypto/x509/test/some_names1.pem

crypto/x509/test/some_names2.pem

diff --git a/crypto/x509/some_names2.pem b/crypto/x509/test/some_names2.pem
similarity index 100%
rename from crypto/x509/some_names2.pem
rename to crypto/x509/test/some_names2.pem

crypto/x509/test/some_names3.pem

diff --git a/crypto/x509/some_names3.pem b/crypto/x509/test/some_names3.pem
similarity index 100%
rename from crypto/x509/some_names3.pem
rename to crypto/x509/test/some_names3.pem

crypto/x509/x509_test.cc

diff --git a/crypto/x509/x509_test.cc b/crypto/x509/x509_test.cc
index 521d757..e0e2ec6 100644
--- a/crypto/x509/x509_test.cc
+++ b/crypto/x509/x509_test.cc
@@ -1317,26 +1317,26 @@
 }
 
 TEST(X509Test, ManyNamesAndConstraints) {
-  bssl::UniquePtr<X509> many_constraints(
-      CertFromPEM(GetTestData("crypto/x509/many_constraints.pem").c_str()));
+  bssl::UniquePtr<X509> many_constraints(CertFromPEM(
+      GetTestData("crypto/x509/test/many_constraints.pem").c_str()));
   ASSERT_TRUE(many_constraints);
   bssl::UniquePtr<X509> many_names1(
-      CertFromPEM(GetTestData("crypto/x509/many_names1.pem").c_str()));
+      CertFromPEM(GetTestData("crypto/x509/test/many_names1.pem").c_str()));
   ASSERT_TRUE(many_names1);
   bssl::UniquePtr<X509> many_names2(
-      CertFromPEM(GetTestData("crypto/x509/many_names2.pem").c_str()));
+      CertFromPEM(GetTestData("crypto/x509/test/many_names2.pem").c_str()));
   ASSERT_TRUE(many_names2);
   bssl::UniquePtr<X509> many_names3(
-      CertFromPEM(GetTestData("crypto/x509/many_names3.pem").c_str()));
+      CertFromPEM(GetTestData("crypto/x509/test/many_names3.pem").c_str()));
   ASSERT_TRUE(many_names3);
   bssl::UniquePtr<X509> some_names1(
-      CertFromPEM(GetTestData("crypto/x509/some_names1.pem").c_str()));
+      CertFromPEM(GetTestData("crypto/x509/test/some_names1.pem").c_str()));
   ASSERT_TRUE(some_names1);
   bssl::UniquePtr<X509> some_names2(
-      CertFromPEM(GetTestData("crypto/x509/some_names2.pem").c_str()));
+      CertFromPEM(GetTestData("crypto/x509/test/some_names2.pem").c_str()));
   ASSERT_TRUE(some_names2);
   bssl::UniquePtr<X509> some_names3(
-      CertFromPEM(GetTestData("crypto/x509/some_names3.pem").c_str()));
+      CertFromPEM(GetTestData("crypto/x509/test/some_names3.pem").c_str()));
   ASSERT_TRUE(some_names3);
 
   EXPECT_EQ(X509_V_ERR_UNSPECIFIED,

sources.cmake

diff --git a/sources.cmake b/sources.cmake
index a21825c..5454dde 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -57,13 +57,13 @@
   crypto/hmac_extra/hmac_tests.txt
   crypto/poly1305/poly1305_tests.txt
   crypto/siphash/siphash_tests.txt
-  crypto/x509/many_constraints.pem
-  crypto/x509/many_names1.pem
-  crypto/x509/many_names2.pem
-  crypto/x509/many_names3.pem
-  crypto/x509/some_names1.pem
-  crypto/x509/some_names2.pem
-  crypto/x509/some_names3.pem
+  crypto/x509/test/many_constraints.pem
+  crypto/x509/test/many_names1.pem
+  crypto/x509/test/many_names2.pem
+  crypto/x509/test/many_names3.pem
+  crypto/x509/test/some_names1.pem
+  crypto/x509/test/some_names2.pem
+  crypto/x509/test/some_names3.pem
   third_party/wycheproof_testvectors/aes_cbc_pkcs5_test.txt
   third_party/wycheproof_testvectors/aes_cmac_test.txt
   third_party/wycheproof_testvectors/aes_gcm_siv_test.txt