instant-labs
/
instant-epp
mirror of https://github.com/instant-labs/instant-epp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use pki-types via re-exports

This commit is contained in:
Dirkjan Ochtman 2024-10-25 09:49:14 +02:00
parent 34618b7c79
commit 8a51b7de58
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -9,7 +9,7 @@ repository = "https://github.com/instant-labs/instant-epp"
[features]
default = ["rustls"]
rustls = ["tokio-rustls", "rustls-pki-types", "rustls-native-certs"]
rustls = ["tokio-rustls", "rustls-native-certs"]
[dependencies]
async-trait = "0.1.52"
@ -17,7 +17,6 @@ celes = "2.1"
chrono = { version = "0.4.23", features = ["serde"] }
instant-xml = { version = "0.5", features = ["chrono"] }
rustls-native-certs = { version = "0.8", optional = true }
rustls-pki-types = { version = "1", optional = true }
serde = { version = "1.0", features = ["derive"] }
tokio = { version = "1.0", features = ["io-util", "net", "time"] }
tokio-rustls = { version = "0.26", optional = true, default-features = false, features = ["logging", "ring", "tls12"] }

4
src/client.rs
View File

@ -1,7 +1,7 @@
use std::time::Duration;
#[cfg(feature = "rustls")]
use rustls_pki_types::{CertificateDer, PrivateKeyDer};
use tokio_rustls::rustls::pki_types::{CertificateDer, PrivateKeyDer};
use tracing::{debug, error};
use crate::common::NoExtension;
@ -216,10 +216,10 @@ mod rustls_connector {
use async_trait::async_trait;
use rustls_native_certs::CertificateResult;
use rustls_pki_types::{CertificateDer, PrivateKeyDer, ServerName};
use tokio::net::lookup_host;
use tokio::net::TcpStream;
use tokio_rustls::client::TlsStream;
use tokio_rustls::rustls::pki_types::{CertificateDer, PrivateKeyDer, ServerName};
use tokio_rustls::rustls::{ClientConfig, RootCertStore};
use tokio_rustls::TlsConnector;
use tracing::info;