Move test keys into tests

rustls · Apr 7, 2024 · 8683cc7 · 8683cc7
1 parent 4956ba8
commit 8683cc7
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 11 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -774,35 +774,47 @@ mod non_std_tests {
         }
 
         let test_cases: &[(&[u8], fn(&PrivateKeyDer<'_>) -> bool); 11] = &[
-            (&include_bytes!("test_keys/eddsakey.der")[..], is_pkcs8),
-            (&include_bytes!("test_keys/nistp256key.der")[..], is_sec1),
+            (&include_bytes!("../tests/keys/eddsakey.der")[..], is_pkcs8),
             (
-                &include_bytes!("test_keys/nistp256key.pkcs8.der")[..],
+                &include_bytes!("../tests/keys/nistp256key.der")[..],
+                is_sec1,
+            ),
+            (
+                &include_bytes!("../tests/keys/nistp256key.pkcs8.der")[..],
                 is_pkcs8,
             ),
-            (&include_bytes!("test_keys/nistp384key.der")[..], is_sec1),
             (
-                &include_bytes!("test_keys/nistp384key.pkcs8.der")[..],
+                &include_bytes!("../tests/keys/nistp384key.der")[..],
+                is_sec1,
+            ),
+            (
+                &include_bytes!("../tests/keys/nistp384key.pkcs8.der")[..],
                 is_pkcs8,
             ),
-            (&include_bytes!("test_keys/nistp521key.der")[..], is_sec1),
             (
-                &include_bytes!("test_keys/nistp521key.pkcs8.der")[..],
+                &include_bytes!("../tests/keys/nistp521key.der")[..],
+                is_sec1,
+            ),
+            (
+                &include_bytes!("../tests/keys/nistp521key.pkcs8.der")[..],
                 is_pkcs8,
             ),
             (
-                &include_bytes!("test_keys/rsa2048key.pkcs1.der")[..],
+                &include_bytes!("../tests/keys/rsa2048key.pkcs1.der")[..],
                 is_pkcs1,
             ),
             (
-                &include_bytes!("test_keys/rsa2048key.pkcs8.der")[..],
+                &include_bytes!("../tests/keys/rsa2048key.pkcs8.der")[..],
+                is_pkcs8,
+            ),
+            (
+                &include_bytes!("../tests/keys/rsa4096key.pkcs8.der")[..],
                 is_pkcs8,
             ),
             (
-                &include_bytes!("test_keys/rsa4096key.pkcs8.der")[..],
+                &include_bytes!("../tests/keys/edd25519_v2.der")[..],
                 is_pkcs8,
             ),
-            (&include_bytes!("test_keys/edd25519_v2.der")[..], is_pkcs8),
         ];
 
         for (key_bytes, expected_check_fn) in test_cases.iter() {

diff --git a/src/test_keys/edd25519_v2.der → tests/keys/edd25519_v2.der b/src/test_keys/edd25519_v2.der → tests/keys/edd25519_v2.der
diff --git a/src/test_keys/eddsakey.der → tests/keys/eddsakey.der b/src/test_keys/eddsakey.der → tests/keys/eddsakey.der
diff --git a/src/test_keys/nistp256key.der → tests/keys/nistp256key.der b/src/test_keys/nistp256key.der → tests/keys/nistp256key.der
diff --git a/src/test_keys/nistp256key.pkcs8.der → tests/keys/nistp256key.pkcs8.der b/src/test_keys/nistp256key.pkcs8.der → tests/keys/nistp256key.pkcs8.der
diff --git a/src/test_keys/nistp384key.der → tests/keys/nistp384key.der b/src/test_keys/nistp384key.der → tests/keys/nistp384key.der
diff --git a/src/test_keys/nistp384key.pkcs8.der → tests/keys/nistp384key.pkcs8.der b/src/test_keys/nistp384key.pkcs8.der → tests/keys/nistp384key.pkcs8.der
diff --git a/src/test_keys/nistp521key.der → tests/keys/nistp521key.der b/src/test_keys/nistp521key.der → tests/keys/nistp521key.der
diff --git a/src/test_keys/nistp521key.pkcs8.der → tests/keys/nistp521key.pkcs8.der b/src/test_keys/nistp521key.pkcs8.der → tests/keys/nistp521key.pkcs8.der
diff --git a/src/test_keys/rsa2048key.pkcs1.der → tests/keys/rsa2048key.pkcs1.der b/src/test_keys/rsa2048key.pkcs1.der → tests/keys/rsa2048key.pkcs1.der
diff --git a/src/test_keys/rsa2048key.pkcs8.der → tests/keys/rsa2048key.pkcs8.der b/src/test_keys/rsa2048key.pkcs8.der → tests/keys/rsa2048key.pkcs8.der
diff --git a/src/test_keys/rsa4096key.pkcs8.der → tests/keys/rsa4096key.pkcs8.der b/src/test_keys/rsa4096key.pkcs8.der → tests/keys/rsa4096key.pkcs8.der