From dc3a079b0aaa67c5f81fe40fea8c939842dc5220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Wed, 9 Jul 2025 11:35:35 +0300
Subject: [PATCH] quinn: Update to rcgen 0.14 and web-transport-quinn 0.7

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2356>
---
 Cargo.lock                            | 8 ++++----
 net/quinn/Cargo.toml                  | 4 ++--
 net/quinn/src/quinnwtclientsrc/imp.rs | 4 +++-
 net/quinn/src/utils.rs                | 5 +++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d736ab07f..00835d80f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6642,9 +6642,9 @@ dependencies = [
 
 [[package]]
 name = "rcgen"
-version = "0.13.2"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
+checksum = "218a7fbb357f6da42c9fd3610b1a5128d087d460e5386eaa5040705c464611dc"
 dependencies = [
  "pem",
  "ring",
@@ -8912,9 +8912,9 @@ dependencies = [
 
 [[package]]
 name = "web-transport-quinn"
-version = "0.5.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5edbbbd8de66e931f5c8a5c9b6e660db7623f1e9042f5f03964ffa1f03c0b9b1"
+checksum = "5f9226d1daf46670c9bf83422bf8ff6020c7af549cf7f8159e3dbbb2aed97f3a"
 dependencies = [
  "bytes",
  "futures",
diff --git a/net/quinn/Cargo.toml b/net/quinn/Cargo.toml
index d91828f0f..c5e6e4841 100644
--- a/net/quinn/Cargo.toml
+++ b/net/quinn/Cargo.toml
@@ -21,13 +21,13 @@ quinn-proto = { version = "0.11.9", default-features = false, features = ["rustl
 rustls = { version = "0.23", default-features = false, features = ["std"] }
 rustls-pemfile = "2"
 rustls-pki-types = "1"
-rcgen = "0.13"
+rcgen = "0.14"
 bytes = "1.5.0"
 thiserror = "2"
 async-channel = "2.3"
 itertools = "0.14"
 env_logger = "0.11"
-web-transport-quinn = { version = "0.5.1", default-features = false, features = ["ring"] }
+web-transport-quinn = { version = "0.7", default-features = false, features = ["ring"] }
 url = "2.5.2"
 once_cell = "1.20.2"
 
diff --git a/net/quinn/src/quinnwtclientsrc/imp.rs b/net/quinn/src/quinnwtclientsrc/imp.rs
index 5f372648b..1dcb19d93 100644
--- a/net/quinn/src/quinnwtclientsrc/imp.rs
+++ b/net/quinn/src/quinnwtclientsrc/imp.rs
@@ -535,6 +535,8 @@ impl QuinnWebTransportClientSrc {
             ))),
         }?;
 
+        drop(remotes);
+
         let client = client(&endpoint_config).map_err(|err| {
             WaitError::FutureError(gst::error_msg!(
                 gst::ResourceError::Failed,
@@ -542,7 +544,7 @@ impl QuinnWebTransportClientSrc {
             ))
         })?;
 
-        let session = client.connect(&url).await.map_err(|err| {
+        let session = client.connect(url).await.map_err(|err| {
             WaitError::FutureError(gst::error_msg!(
                 gst::ResourceError::Failed,
                 ["Failed to connect to server: {}", err]
diff --git a/net/quinn/src/utils.rs b/net/quinn/src/utils.rs
index d1a21338f..7bee42ee0 100644
--- a/net/quinn/src/utils.rs
+++ b/net/quinn/src/utils.rs
@@ -351,9 +351,10 @@ fn configure_server(
             read_private_key_from_file(ep_config.private_key_file.clone())?,
         )
     } else {
-        let rcgen::CertifiedKey { cert, key_pair } =
+        let rcgen::CertifiedKey { cert, signing_key } =
             rcgen::generate_simple_self_signed(vec![ep_config.server_name.clone()]).unwrap();
-        let priv_key = rustls_pki_types::PrivateKeyDer::try_from(key_pair.serialize_der()).unwrap();
+        let priv_key =
+            rustls_pki_types::PrivateKeyDer::try_from(signing_key.serialize_der()).unwrap();
         let cert_chain = vec![rustls_pki_types::CertificateDer::from(cert)];
 
         (cert_chain, priv_key)