From cad31daea39634e5349ba3a8f6a555edf2ad20c0 Mon Sep 17 00:00:00 2001 From: Kexiang Wang Date: Mon, 12 Aug 2024 23:42:42 -0400 Subject: [PATCH] fix(mssql-cdc): remove vendored-openssl of tiberus (#18013) --- Cargo.lock | 28 +++------------------------- src/connector/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51381e82037a..c958e81d77ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7851,15 +7851,6 @@ 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.103" @@ -7868,7 +7859,6 @@ checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] @@ -7945,20 +7935,6 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "opentls" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f561874f8d6ecfb674fc08863414040c93cc90c0b6963fe679895fab8b65560" -dependencies = [ - "futures-util", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "url", -] - [[package]] name = "ordered-float" version = "2.10.0" @@ -13740,13 +13716,15 @@ dependencies = [ "futures-util", "num-traits", "once_cell", - "opentls", "pin-project-lite", "pretty-hex", "rust_decimal", + "rustls-native-certs 0.6.3", + "rustls-pemfile 1.0.4", "thiserror", "time", "tokio", + "tokio-rustls 0.24.1", "tokio-util", "tracing", "uuid", diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml index e504457a75a2..b46fc15bb605 100644 --- a/src/connector/Cargo.toml +++ b/src/connector/Cargo.toml @@ -154,7 +154,7 @@ thiserror-ext = { workspace = true } tiberius = { git = "https://github.com/risingwavelabs/tiberius.git", rev = "f834f2deeb9e2fb08afaf73865f330cf31a3876a", default-features = false, features = [ "chrono", "sql-browser-tokio", - "vendored-openssl", + "rustls", "rust_decimal", "bigdecimal", "tds73",