update dependencies to latest

Author: dignifiedquire

Cargo.lock

@@ -18,7 +18,7 @@ workspace = true
 curve25519-dalek = { version = "4.1.3", features = ["serde", "rand_core", "zeroize"], optional = true }
 data-encoding = { version = "2.3.3", optional = true }
 ed25519-dalek = { version = "2.1.1", features = ["serde", "rand_core", "zeroize"], optional = true }
-derive_more = { version = "1.0.0", features = ["display"], optional = true }
+derive_more = { version = "2.0.1", features = ["display"], optional = true }
 url = { version = "2.5.3", features = ["serde"], optional = true }
 postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"], optional = true }
 rand_core = { version = "0.6.4", optional = true }

iroh-base/Cargo.toml

@@ -16,7 +16,7 @@ axum-server = { version = "0.7", features = ["tls-rustls-no-provider"] }
 base64-url = "3.0"
 bytes = "1.7"
 clap = { version = "4.5.1", features = ["derive"] }
-derive_more = { version = "1.0.0", features = [
+derive_more = { version = "2.0.1", features = [
     "debug",
     "display",
     "into",
@@ -50,7 +50,7 @@ tokio-rustls = { version = "0.26", default-features = false, features = [
 tokio-rustls-acme = { version = "0.7.1", features = ["axum"] }
 tokio-stream = "0.1.14"
 tokio-util = "0.7"
-toml = "0.8.10"
+toml = "0.9.2"
 tower-http = { version = "0.6.1", features = ["cors", "trace"] }
 tower_governor = "0.7"
 tracing = "0.1"

iroh-dns-server/Cargo.toml

@@ -20,7 +20,7 @@ workspace = true
 
 [dependencies]
 bytes = "1.7"
-derive_more = { version = "1.0.0", features = [
+derive_more = { version = "2.0.1", features = [
     "debug",
     "display",
     "from",
@@ -50,7 +50,7 @@ reqwest = { version = "0.12", default-features = false, features = [
 ] }
 rustls = { version = "0.23", default-features = false, features = ["ring"] }
 serde = { version = "1", features = ["derive", "rc"] }
-strum = { version = "0.26", features = ["derive"] }
+strum = { version = "0.27", features = ["derive"] }
 tokio = { version = "1", features = [
     "io-util",
     "macros",
@@ -81,7 +81,7 @@ dashmap = { version = "6.1.0", optional = true }
 ahash = { version = "0.8.11", optional = true } # minimal version fix
 governor = { version = "0.8.0", optional = true }
 hickory-proto = { version = "0.25.1", default-features = false, optional = true }
-rcgen = { version = "0.13", optional = true }
+rcgen = { version = "0.14", optional = true }
 regex = { version = "1.7.1", optional = true }
 reloadable-state = { version = "0.1", optional = true }
 rustls-cert-reloadable-resolver = { version = "0.7.1", optional = true }
@@ -91,7 +91,7 @@ time = { version = "0.3.37", optional = true }
 tokio-rustls-acme = { version = "0.7.1", optional = true }
 tokio-websockets = { version = "0.12", features = ["rustls-bring-your-own-connector", "ring", "getrandom", "rand", "server"], optional = true } # server-side websocket implementation
 simdutf8 = { version = "0.1.5", optional = true } # minimal version fix
-toml = { version = "0.8", optional = true }
+toml = { version = "0.9", optional = true }
 tracing-subscriber = { version = "0.3", features = [
     "env-filter",
 ], optional = true }

iroh-relay/Cargo.toml

@@ -472,7 +472,7 @@ mod tests {
         // Create a QAD server with a self-signed cert, all manually.
         let cert =
             rcgen::generate_simple_self_signed(vec!["localhost".into()]).context("self signed")?;
-        let key = PrivatePkcs8KeyDer::from(cert.key_pair.serialize_der());
+        let key = PrivatePkcs8KeyDer::from(cert.signing_key.serialize_der());
         let mut server_crypto = rustls::ServerConfig::builder()
             .with_no_client_auth()
             .with_single_cert(vec![cert.cert.into()], key.into())

iroh-relay/src/quic.rs

@@ -887,7 +887,8 @@ mod tests {
 
         let cert = rcgen::generate_simple_self_signed(subject_alt_names).unwrap();
         let rustls_certificate = cert.cert.der().clone();
-        let rustls_key = rustls::pki_types::PrivatePkcs8KeyDer::from(cert.key_pair.serialize_der());
+        let rustls_key =
+            rustls::pki_types::PrivatePkcs8KeyDer::from(cert.signing_key.serialize_der());
         let config = rustls::ServerConfig::builder_with_provider(Arc::new(
             rustls::crypto::ring::default_provider(),
         ))

iroh-relay/src/server/http_server.rs

@@ -17,7 +17,7 @@ pub fn self_signed_tls_certs_and_config() -> (
     ])
     .expect("valid");
     let rustls_cert = cert.cert.der();
-    let private_key = rustls::pki_types::PrivatePkcs8KeyDer::from(cert.key_pair.serialize_der());
+    let private_key = rustls::pki_types::PrivatePkcs8KeyDer::from(cert.signing_key.serialize_der());
     let private_key = rustls::pki_types::PrivateKeyDer::from(private_key);
     let certs = vec![rustls_cert.clone()];
     let server_config = rustls::ServerConfig::builder_with_provider(std::sync::Arc::new(

iroh-relay/src/server/testing.rs

@@ -27,7 +27,7 @@ bytes = "1.7"
 crypto_box = { version = "0.9.1", features = ["serde", "chacha20"] }
 data-encoding = "2.2"
 der = { version = "0.7", features = ["alloc", "derive"] }
-derive_more = { version = "1.0.0", features = [
+derive_more = { version = "2.0.1", features = [
     "debug",
     "display",
     "from",
@@ -61,7 +61,7 @@ rustls = { version = "0.23", default-features = false, features = ["ring"] }
 serde = { version = "1.0.219", features = ["derive", "rc"] }
 smallvec = "1.11.1"
 snafu = { version = "0.8.5", features = ["rust_1_81"] }
-strum = { version = "0.26", features = ["derive"] }
+strum = { version = "0.27", features = ["derive"] }
 stun-rs = "0.1.11"
 tokio = { version = "1.44.1", features = [
     "io-util",
@@ -99,15 +99,15 @@ clap = { version = "4", features = ["derive"], optional = true }
 tracing-subscriber = { version = "0.3", features = [
     "env-filter",
 ], optional = true }
-indicatif = { version = "0.17", features = ["tokio"], optional = true }
+indicatif = { version = "0.18", features = ["tokio"], optional = true }
 parse-size = { version = "=1.0.0", optional = true, features = ['std'] } # pinned version to avoid bumping msrv to 1.81
 
 
 # non-wasm-in-browser dependencies
 [target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
 hickory-resolver = "0.25.1"
 igd-next = { version = "0.16", features = ["aio_tokio"] }
-netdev = { version = "0.31.0" }
+netdev = { version = "0.36.0" }
 portmapper = { version = "0.6.1", default-features = false }
 quinn = { package = "iroh-quinn", version = "0.14.0", default-features = false, features = ["runtime-tokio", "rustls-ring"] }
 tokio = { version = "1", features = [

iroh/Cargo.toml

@@ -15,7 +15,7 @@ n0-snafu = "0.2.0"
 n0-watcher = "0.2"
 quinn = { package = "iroh-quinn", version = "0.14" }
 rand = "0.8"
-rcgen = "0.13"
+rcgen = "0.14"
 rustls = { version = "0.23", default-features = false, features = ["ring"] }
 clap = { version = "4", features = ["derive"] }
 tokio = { version = "1", features = ["rt", "sync"] }

iroh/bench/Cargo.toml

@@ -110,7 +110,7 @@ pub fn run_quinn(opt: Opt) -> Result<()> {
     let server_span = tracing::error_span!("server");
     let runtime = rt();
     let cert = rcgen::generate_simple_self_signed(vec!["localhost".into()]).unwrap();
-    let key = PrivatePkcs8KeyDer::from(cert.key_pair.serialize_der());
+    let key = PrivatePkcs8KeyDer::from(cert.signing_key.serialize_der());
     let cert = CertificateDer::from(cert.cert);
 
     let (server_addr, endpoint) = {