Skip to content

Remove unmaintained rustls-pemfile dependency #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wenjing merged 1 commit into from
Dec 19, 2025
Merged

Remove unmaintained rustls-pemfile dependency #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ rustls = "0.23"
tokio-rustls = "0.26"
rustls-pki-types = "1.12"
rustls-native-certs = "0.8.1"
rustls-pemfile = "2.2"
quinn = { version = "0.11", default-features = false, features = [
"log",
"runtime-tokio",
Expand Down
2 changes: 0 additions & 2 deletions tsp_sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ async = [
"dep:tokio-rustls",
"dep:rustls-pki-types",
"dep:rustls-native-certs",
"dep:rustls-pemfile",
"dep:quinn",
]
resolve = ["serialize", "dep:reqwest", "dep:didwebvh-rs"]
Expand Down Expand Up @@ -73,7 +72,6 @@ rustls = { workspace = true, optional = true }
tokio-rustls = { workspace = true, optional = true }
rustls-pki-types = { workspace = true, optional = true }
rustls-native-certs = { workspace = true, optional = true }
rustls-pemfile = { workspace = true, optional = true }
quinn = { workspace = true, optional = true }
# resolve
reqwest = { workspace = true, optional = true }
Expand Down
2 changes: 2 additions & 0 deletions tsp_sdk/src/transport/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pub enum TransportError {
TLSConfiguration,
#[error("missing TLS certificate or key file '{0}'")]
TLSMissingFile(String),
#[error("invalid TLS certificate")]
TLSCertificate,
#[error("invalid TLS key '{0}'")]
TLSKey(String),
#[error("{0}")]
Expand Down
37 changes: 15 additions & 22 deletions tsp_sdk/src/transport/tls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use bytes::{Bytes, BytesMut};
use futures::StreamExt;
use once_cell::sync::Lazy;
use rustls::{ClientConfig, RootCertStore, crypto::CryptoProvider};
use rustls_pki_types::ServerName;
use rustls_pki_types::{ServerName, pem::PemObject};
use std::sync::Arc;
use tokio::{io::AsyncWriteExt, net::TcpListener, sync::mpsc};
use tokio_rustls::{TlsAcceptor, TlsConnector};
Expand All @@ -25,11 +25,6 @@ pub(super) fn load_certificate() -> Result<
),
TransportError,
> {
use std::{
fs::File,
io::{BufReader, Result},
};

#[cfg(not(test))]
let cert_path = std::env::var("TSP_TLS_CERT").map_err(|_| TransportError::TLSConfiguration)?;
#[cfg(not(test))]
Expand All @@ -39,20 +34,16 @@ pub(super) fn load_certificate() -> Result<
#[cfg(test)]
let key_path = "../examples/test/localhost-key.pem".to_string();

let cert_file =
File::open(&cert_path).map_err(|_| TransportError::TLSMissingFile(cert_path))?;

let certs: Result<Vec<rustls_pki_types::CertificateDer<'static>>> =
rustls_pemfile::certs(&mut BufReader::new(cert_file)).collect();

let key_file =
File::open(&key_path).map_err(|_| TransportError::TLSMissingFile(key_path.clone()))?;
let certs: Vec<rustls_pki_types::CertificateDer<'static>> =
rustls_pki_types::CertificateDer::pem_file_iter(&cert_path)
.map_err(|_| TransportError::TLSMissingFile(cert_path))?
.collect::<Result<Vec<_>, _>>()
.map_err(|_| TransportError::TLSCertificate)?;

let key = rustls_pemfile::private_key(&mut BufReader::new(&key_file))
.map_err(|_| TransportError::TLSKey(key_path.clone()))?
.ok_or(TransportError::TLSKey(key_path))?;
let key = rustls_pki_types::PrivateKeyDer::from_pem_file(&key_path)
.map_err(|_| TransportError::TLSKey(key_path))?;

Ok((certs.unwrap(), key))
Ok((certs, key))
}

pub(super) fn create_tls_config() -> ClientConfig {
Expand All @@ -70,11 +61,13 @@ pub(super) fn create_tls_config() -> ClientConfig {
#[cfg(test)]
{
let cert_path = "../examples/test/root-ca.pem";
let cert_file = std::fs::File::open(cert_path).expect("could not find test CA certificate");
let certs: std::io::Result<Vec<rustls_pki_types::CertificateDer<'static>>> =
rustls_pemfile::certs(&mut std::io::BufReader::new(cert_file)).collect();
let certs: Vec<rustls_pki_types::CertificateDer<'static>> =
rustls_pki_types::CertificateDer::pem_file_iter(cert_path)
.expect("could not find test CA certificate")
.collect::<Result<Vec<_>, _>>()
.expect("could not read test CA certificate");

for cert in certs.expect("could not read test CA certificate") {
for cert in certs {
root_cert_store
.add(cert)
.expect("could not add test CA certificate")
Expand Down