Skip to content

Replace unmaintained rustls-pemfile with rustls-pki-types PemObject #280

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

Open
kofany wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Replace unmaintained rustls-pemfile with rustls-pki-types PemObject #280

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
2 changes: 0 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ proxy = ["tokio-socks"]
tls-native = ["native-tls", "tokio-native-tls"]
tls-rust = [
"rustls-native-certs",
"rustls-pemfile",
"tokio-rustls",
"webpki-roots",
]
Expand Down Expand Up @@ -78,7 +77,6 @@ tokio-socks = { version = "0.5.1", optional = true }
native-tls = { version = "0.2.11", optional = true }
tokio-native-tls = { version = "0.3.1", optional = true }
rustls-native-certs = { version = "0.8", optional = true }
rustls-pemfile = { version = "2", optional = true }
tokio-rustls = { version = "0.26.0", optional = true }
webpki-roots = { version = "0.26.0", optional = true }

Expand Down
38 changes: 20 additions & 18 deletions src/client/conn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ use tokio_native_tls::{self, TlsStream};
#[cfg(feature = "tls-rust")]
use std::{
convert::TryFrom,
fs::File,
io::{BufReader, Error, ErrorKind},
io::{Error, ErrorKind},
sync::Arc,
};
#[cfg(feature = "tls-rust")]
Expand All @@ -39,7 +38,8 @@ use tokio_rustls::{
rustls::client::danger::{ServerCertVerified, ServerCertVerifier},
rustls::crypto::{verify_tls12_signature, verify_tls13_signature, CryptoProvider},
rustls::pki_types::{
CertificateDer as Certificate, PrivateKeyDer as PrivateKey, ServerName, UnixTime,
pem::PemObject, CertificateDer as Certificate, PrivateKeyDer as PrivateKey, ServerName,
UnixTime,
},
rustls::{self, ClientConfig, RootCertStore},
TlsConnector,
Expand Down Expand Up @@ -287,20 +287,21 @@ impl Connection {
}

let client_auth = if let Some(client_cert_path) = config.client_cert_path() {
if let Ok(file) = File::open(client_cert_path) {
let client_cert_data =
rustls_pemfile::certs(&mut BufReader::new(file)).collect::<Result<_, _>>()?;
if let Ok(cert_iter) = Certificate::pem_file_iter(client_cert_path) {
let client_cert_data = cert_iter
.collect::<Result<Vec<_>, _>>()
.map_err(|e| Error::new(ErrorKind::InvalidData, e.to_string()))?;

let client_cert_pass = config.client_cert_pass();
let client_cert_pass = rustls_pemfile::private_key(
&mut client_cert_pass.as_bytes(),
)?
.ok_or_else(|| error::Error::InvalidConfig {
path: config.path(),
cause: error::ConfigError::UnknownConfigFormat {
format: "Failed to parse private key".to_string(),
},
})?;
let client_cert_pass =
PrivateKey::from_pem_slice(client_cert_pass.as_bytes()).map_err(|_| {
error::Error::InvalidConfig {
path: config.path(),
cause: error::ConfigError::UnknownConfigFormat {
format: "Failed to parse private key".to_string(),
},
}
})?;

log::info!(
"Using {} for client certificate authentication.",
Expand Down Expand Up @@ -352,9 +353,10 @@ impl Connection {
}

if let Some(cert_path) = config.cert_path() {
if let Ok(file) = File::open(cert_path) {
let certificates = rustls_pemfile::certs(&mut BufReader::new(file))
.collect::<Result<Vec<_>, _>>()?;
if let Ok(cert_iter) = Certificate::pem_file_iter(cert_path) {
let certificates = cert_iter
.collect::<Result<Vec<_>, _>>()
.map_err(|e| Error::new(ErrorKind::InvalidData, e.to_string()))?;
let (added, ignored) = root_store.add_parsable_certificates(certificates);

if ignored > 0 {
Expand Down