Cleanup dependencies and their features.

Author: davidv1992

Cargo.toml

@@ -11,17 +11,17 @@ publish = false
 rust-version = "1.87" # MSRV
 
 [package.metadata.cargo-udeps.ignore]
-normal = [ "ntp-proto", "rustls-platform-verifier", "rustls-pemfile2", "rustls23", "serde", "tokio-rustls", "toml", "tracing", "tracing-subscriber" ]
+normal = [ "ntp-proto", "rustls-platform-verifier", "rustls-pemfile2", "rustls", "serde", "tokio-rustls", "toml", "tracing", "tracing-subscriber" ]
 
 [dependencies]
 tokio = { version = "1.32", features = ["rt-multi-thread", "io-util", "fs", "net", "macros", "time" ] }
 toml = { version = ">=0.6.0,<0.9.0", default-features = false, features = ["parse"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.0", default-features = false, features = ["std", "fmt", "ansi"] }
-rustls23 = { package = "rustls", version = "0.23.16", features = ["logging", "std", "tls12"] }
+rustls = { version = "0.23.16", features = ["logging", "std"] }
 rustls-platform-verifier = "0.5.0"
 serde = { version = "1.0.145", features = ["derive"] }
-tokio-rustls = { version = "0.26.0", features = ["logging", "tls12"] }
+tokio-rustls = { version = "0.26.0", features = ["logging"] }
 
 [[bin]]
 name = "nts-pool-ke"

src/lib.rs

@@ -1,5 +1,3 @@
-extern crate rustls23 as rustls;
-
 mod cli;
 mod config;
 
@@ -15,8 +13,11 @@ use std::{
 use ::tracing::{debug, info};
 use cli::NtsPoolKeOptions;
 use config::{Config, NtsPoolKeConfig};
-use rustls::{pki_types::CertificateDer, version::TLS13, ServerConnection};
-use rustls23::pki_types::pem::PemObject;
+use rustls::{
+    pki_types::{pem::PemObject, CertificateDer},
+    version::TLS13,
+    ServerConnection,
+};
 use rustls_platform_verifier::Verifier;
 use tokio::{
     io::AsyncWriteExt,
@@ -172,23 +173,23 @@ async fn run(options: NtsPoolKeOptions) -> Result<(), Box<dyn std::error::Error>
 async fn run_nts_pool_ke(nts_pool_ke_config: NtsPoolKeConfig) -> std::io::Result<()> {
     let certificate_authority_file =
         std::fs::File::open(&nts_pool_ke_config.certificate_authority_path).map_err(|e| {
-            io_error(&format!(
+            std::io::Error::other(format!(
                 "error reading certificate_authority_path at `{:?}`: {:?}",
                 nts_pool_ke_config.certificate_authority_path, e
             ))
         })?;
 
     let certificate_chain_file = std::fs::File::open(&nts_pool_ke_config.certificate_chain_path)
         .map_err(|e| {
-            io_error(&format!(
+            std::io::Error::other(format!(
                 "error reading certificate_chain_path at `{:?}`: {:?}",
                 nts_pool_ke_config.certificate_chain_path, e
             ))
         })?;
 
     let private_key_file =
         std::fs::File::open(&nts_pool_ke_config.private_key_path).map_err(|e| {
-            io_error(&format!(
+            std::io::Error::other(format!(
                 "error reading key_der_path at `{:?}`: {:?}",
                 nts_pool_ke_config.private_key_path, e
             ))
@@ -237,10 +238,6 @@ async fn run_nts_pool_ke(nts_pool_ke_config: NtsPoolKeConfig) -> std::io::Result
     .await
 }
 
-fn io_error(msg: &str) -> std::io::Error {
-    std::io::Error::new(std::io::ErrorKind::Other, msg)
-}
-
 async fn pool_key_exchange_server(
     address: impl ToSocketAddrs,
     certificate_authority: Arc<[rustls::pki_types::CertificateDer<'static>]>,