diff --git a/src/lib.rs b/src/lib.rs index 6f7fbb80..d6e60d78 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -87,8 +87,6 @@ pub use { verify_cert::VerifiedPath, }; -pub use pki_types as types; - #[cfg(feature = "alloc")] pub use crl::{OwnedCertRevocationList, OwnedRevokedCert}; @@ -122,7 +120,7 @@ pub mod aws_lc_rs { /// An array of all the verification algorithms exported by this crate. /// /// This will be empty if the crate is built without the `ring` and `aws-lc-rs` features. -pub static ALL_VERIFICATION_ALGS: &[&dyn types::SignatureVerificationAlgorithm] = &[ +pub static ALL_VERIFICATION_ALGS: &[&dyn pki_types::SignatureVerificationAlgorithm] = &[ #[cfg(feature = "ring")] ring::ECDSA_P256_SHA256, #[cfg(feature = "ring")] diff --git a/tests/better_tls.rs b/tests/better_tls.rs index e1cfce65..6f224226 100644 --- a/tests/better_tls.rs +++ b/tests/better_tls.rs @@ -6,10 +6,11 @@ use std::fs::File; use base64::{engine::general_purpose, Engine as _}; use bzip2::read::BzDecoder; -use pki_types::{ServerName, UnixTime}; +use pki_types::{ + CertificateDer, ServerName, SignatureVerificationAlgorithm, TrustAnchor, UnixTime, +}; use serde::Deserialize; -use webpki::types::{CertificateDer, SignatureVerificationAlgorithm, TrustAnchor}; use webpki::{anchor_from_trusted_cert, KeyUsage}; // All of the BetterTLS testcases use P256 keys.