diff --git a/src/lib.rs b/src/lib.rs index 2509e1f..c44148b 100644 --- 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 b/tests/keys/edd25519_v2.der similarity index 100% rename from src/test_keys/edd25519_v2.der rename to tests/keys/edd25519_v2.der diff --git a/src/test_keys/eddsakey.der b/tests/keys/eddsakey.der similarity index 100% rename from src/test_keys/eddsakey.der rename to tests/keys/eddsakey.der diff --git a/src/test_keys/nistp256key.der b/tests/keys/nistp256key.der similarity index 100% rename from src/test_keys/nistp256key.der rename to tests/keys/nistp256key.der diff --git a/src/test_keys/nistp256key.pkcs8.der b/tests/keys/nistp256key.pkcs8.der similarity index 100% rename from src/test_keys/nistp256key.pkcs8.der rename to tests/keys/nistp256key.pkcs8.der diff --git a/src/test_keys/nistp384key.der b/tests/keys/nistp384key.der similarity index 100% rename from src/test_keys/nistp384key.der rename to tests/keys/nistp384key.der diff --git a/src/test_keys/nistp384key.pkcs8.der b/tests/keys/nistp384key.pkcs8.der similarity index 100% rename from src/test_keys/nistp384key.pkcs8.der rename to tests/keys/nistp384key.pkcs8.der diff --git a/src/test_keys/nistp521key.der b/tests/keys/nistp521key.der similarity index 100% rename from src/test_keys/nistp521key.der rename to tests/keys/nistp521key.der diff --git a/src/test_keys/nistp521key.pkcs8.der b/tests/keys/nistp521key.pkcs8.der similarity index 100% rename from src/test_keys/nistp521key.pkcs8.der rename to tests/keys/nistp521key.pkcs8.der diff --git a/src/test_keys/rsa2048key.pkcs1.der b/tests/keys/rsa2048key.pkcs1.der similarity index 100% rename from src/test_keys/rsa2048key.pkcs1.der rename to tests/keys/rsa2048key.pkcs1.der diff --git a/src/test_keys/rsa2048key.pkcs8.der b/tests/keys/rsa2048key.pkcs8.der similarity index 100% rename from src/test_keys/rsa2048key.pkcs8.der rename to tests/keys/rsa2048key.pkcs8.der diff --git a/src/test_keys/rsa4096key.pkcs8.der b/tests/keys/rsa4096key.pkcs8.der similarity index 100% rename from src/test_keys/rsa4096key.pkcs8.der rename to tests/keys/rsa4096key.pkcs8.der