diff --git a/rust/Cargo.lock b/rust/Cargo.lock index fcaeec94..fbd5e007 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -799,21 +799,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1222,6 +1207,20 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.12", + "hyper 0.14.29", + "rustls 0.21.12", + "tokio", + "tokio-rustls 0.24.1", +] + [[package]] name = "hyper-rustls" version = "0.27.2" @@ -1233,10 +1232,11 @@ dependencies = [ "hyper 1.3.1", "hyper-util", "log", - "rustls", + "rustls 0.23.10", + "rustls-native-certs 0.7.0", "rustls-pki-types", "tokio", - "tokio-rustls", + "tokio-rustls 0.26.0", "tower-service", "webpki-roots", ] @@ -1253,35 +1253,6 @@ dependencies = [ "tokio-io-timeout", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper 0.14.29", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.3.1", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - [[package]] name = "hyper-util" version = "0.1.5" @@ -1692,23 +1663,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "nom" version = "7.1.3" @@ -1910,60 +1864,12 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.68", -] - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" -version = "300.3.1+3.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - [[package]] name = "os_info" version = "3.8.2" @@ -1994,7 +1900,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pact-plugin-driver" version = "0.6.2" -source = "git+https://github.com/pact-foundation/pact-plugins.git#7325bb9c7e971cdedbc7d55e3be804799346082e" +source = "git+https://github.com/pact-foundation/pact-plugins.git#7fe7d9207c8c91fc472200ce1fb77198b4963036" dependencies = [ "anyhow", "async-trait", @@ -2103,9 +2009,9 @@ dependencies = [ "regex-syntax 0.6.29", "reqwest 0.12.5", "rstest 0.21.0", - "rustls", + "rustls 0.23.10", "rustls-pemfile 2.1.2", - "rustls-webpki", + "rustls-webpki 0.102.4", "serde", "serde_json", "sxd-document", @@ -2113,7 +2019,7 @@ dependencies = [ "test-log", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.26.0", "tracing", "tracing-core", "tracing-log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2173,14 +2079,14 @@ dependencies = [ [[package]] name = "pact_mock_server" version = "2.0.0-beta.4" -source = "git+https://github.com/pact-foundation/pact-core-mock-server.git?branch=v2.0.x#6c56dcb5939e4c620f9b6761ad5109afaec398ca" +source = "git+https://github.com/pact-foundation/pact-core-mock-server.git?branch=v2.0.x#f1b986ddda1e61f9f05970086f0ba7283d1bb3e2" dependencies = [ "anyhow", "bytes", "futures", "http-body-util", "hyper 1.3.1", - "hyper-rustls", + "hyper-rustls 0.27.2", "hyper-util", "itertools 0.13.0", "lazy_static", @@ -2189,14 +2095,14 @@ dependencies = [ "pact_matching", "pact_models", "rcgen", - "rustls", + "rustls 0.23.10", "rustls-pemfile 2.1.2", - "rustls-webpki", + "rustls-webpki 0.102.4", "serde", "serde_json", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.26.0", "tracing", "tracing-core", "url", @@ -2626,6 +2532,53 @@ dependencies = [ "rand", ] +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls 0.23.10", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls 0.23.10", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "0.6.13" @@ -2800,15 +2753,16 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper 0.14.29", - "hyper-tls 0.5.0", + "hyper-rustls 0.24.2", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -2816,7 +2770,7 @@ dependencies = [ "sync_wrapper 0.1.2", "system-configuration", "tokio", - "tokio-native-tls", + "tokio-rustls 0.24.1", "tower-service", "url", "wasm-bindgen", @@ -2841,23 +2795,26 @@ dependencies = [ "http-body 1.0.0", "http-body-util", "hyper 1.3.1", - "hyper-tls 0.6.0", + "hyper-rustls 0.27.2", "hyper-util", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", + "quinn", + "rustls 0.23.10", + "rustls-native-certs 0.7.0", "rustls-pemfile 2.1.2", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tokio-native-tls", + "tokio-rustls 0.26.0", "tokio-util", "tower-service", "url", @@ -2948,6 +2905,12 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc_version" version = "0.4.0" @@ -2970,6 +2933,18 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + [[package]] name = "rustls" version = "0.23.10" @@ -2980,11 +2955,36 @@ dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki", + "rustls-webpki 0.102.4", "subtle", "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -3010,6 +3010,16 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustls-webpki" version = "0.102.4" @@ -3057,6 +3067,16 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "security-framework" version = "2.11.0" @@ -3589,12 +3609,12 @@ dependencies = [ ] [[package]] -name = "tokio-native-tls" -version = "0.3.1" +name = "tokio-rustls" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "native-tls", + "rustls 0.21.12", "tokio", ] @@ -3604,7 +3624,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls", + "rustls 0.23.10", "rustls-pki-types", "tokio", ] @@ -3972,12 +3992,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "vec_map" version = "0.8.2" diff --git a/rust/pact_consumer/Cargo.toml b/rust/pact_consumer/Cargo.toml index e90591b7..db14cb60 100644 --- a/rust/pact_consumer/Cargo.toml +++ b/rust/pact_consumer/Cargo.toml @@ -45,7 +45,7 @@ uuid = { version = "1.8.0", features = ["v4"] } quickcheck = "1.0.3" env_logger = "0.11.3" expectest = "0.12.0" -reqwest = { version = "0.12.3", default-features = false, features = ["native-tls-vendored", "blocking", "json"] } +reqwest = { version = "0.12.3", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } serde = { version = "^1.0", features = ["derive"] } rand = "0.8.5" tokio-test = "0.4.4" diff --git a/rust/pact_ffi/Cargo.toml b/rust/pact_ffi/Cargo.toml index 3ee34de2..28801e95 100644 --- a/rust/pact_ffi/Cargo.toml +++ b/rust/pact_ffi/Cargo.toml @@ -58,7 +58,7 @@ zeroize = "1.7.0" [dev-dependencies] expectest = "0.12.0" -reqwest = { version = "0.12.4", default-features = false, features = ["native-tls-vendored", "blocking", "json"] } +reqwest = { version = "0.12.4", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } quickcheck = "1.0.3" test-log = "0.2.14" tempfile = "3.8.1" diff --git a/rust/pact_matching/Cargo.toml b/rust/pact_matching/Cargo.toml index 128ea0fa..920183f4 100644 --- a/rust/pact_matching/Cargo.toml +++ b/rust/pact_matching/Cargo.toml @@ -44,7 +44,7 @@ onig = { version = "6.4.0", default-features = false } pact_models = { version = "~1.2.1", default-features = false } pact-plugin-driver = { version = "~0.6.1", optional = true, default-features = false } rand = "0.8.5" -reqwest = { version = "0.12.3", default-features = false, features = ["native-tls-vendored", "json"] } +reqwest = { version = "0.12.3", default-features = false, features = ["rustls-tls-native-roots", "json"] } semver = "1.0.22" serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" diff --git a/rust/pact_models/Cargo.toml b/rust/pact_models/Cargo.toml index 32ce6a83..28ce9c91 100644 --- a/rust/pact_models/Cargo.toml +++ b/rust/pact_models/Cargo.toml @@ -50,7 +50,7 @@ tracing = "0.1.40" # This needs to be the same version across all the libs (i.e. [target.'cfg(not(target_family = "wasm"))'.dependencies] fs2 = "0.4.3" onig = { version = "6.4.0", default-features = false } -reqwest = { version = "0.11.18", default-features = false, features = ["native-tls-vendored", "blocking", "json"] } +reqwest = { version = "0.11.18", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } uuid = { version = "1.3.3", features = ["v4"] } [target.'cfg(target_family = "wasm")'.dependencies] diff --git a/rust/pact_verifier/Cargo.toml b/rust/pact_verifier/Cargo.toml index cda11052..610c6bf4 100644 --- a/rust/pact_verifier/Cargo.toml +++ b/rust/pact_verifier/Cargo.toml @@ -39,7 +39,7 @@ pact_matching = { version = "~1.2.4", path = "../pact_matching", default-feature pact_models = { version = "~1.2.1", default-features = false } pact-plugin-driver = { version = "~0.6.1", optional = true, default-features = false } regex = "1.10.4" -reqwest = { version = "0.12.3", default-features = false, features = ["native-tls-vendored", "blocking", "json"] } +reqwest = { version = "0.12.3", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } serde = "1.0.197" serde_json = "1.0.115" serde_with = { version = "3.7.0", features = ["json"] } diff --git a/rust/pact_verifier_cli/Cargo.toml b/rust/pact_verifier_cli/Cargo.toml index cfb4337b..01ee4a25 100644 --- a/rust/pact_verifier_cli/Cargo.toml +++ b/rust/pact_verifier_cli/Cargo.toml @@ -32,7 +32,7 @@ maplit = "1.0.2" pact_models = { version = "~1.2.1", default-features = false } pact_verifier = { version = "~1.2.2", path = "../pact_verifier", default-features = false } regex = "1.10.2" -reqwest = { version = "0.12.4", default-features = false, features = ["native-tls-vendored", "blocking", "json"] } +reqwest = { version = "0.12.4", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } serde_json = "1.0.108" strip-ansi-escapes = { version = "0.2.0", optional = true } time = "0.3.31"