From fdd7901f7e93f94ea0a86a774e5111de36f75c69 Mon Sep 17 00:00:00 2001 From: veeso Date: Mon, 10 Oct 2022 16:21:32 +0200 Subject: [PATCH] removed libssl dependency --- .github/workflows/linux.yml | 2 +- CHANGELOG.md | 2 + Cargo.lock | 123 ++++++++++++++++++++++++++++++------ Cargo.toml | 6 +- install.sh | 2 +- 5 files changed, 109 insertions(+), 26 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 071c0f8..93b88a7 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Install dependencies - run: sudo apt update && sudo apt install -y libdbus-1-dev libssh2-1-dev libssl-dev + run: sudo apt update && sudo apt install -y libdbus-1-dev - uses: actions-rs/toolchain@v1 with: toolchain: stable diff --git a/CHANGELOG.md b/CHANGELOG.md index af96b44..b3f7f5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,12 +45,14 @@ Released on ?? - Bump `keyring` to `1.2.0` - Bump `open` to `3.0.2` - Changed `regex` to `lazy-regex 2.3.0` + - Bump `remotefs-ftp` to `0.1.2` - Bump `remotefs-ssh` to `0.1.2` - Bump `ssh2-config` to `0.1.3` - Bump `tuirealm` to `1.8.0` - Bump `tui-realm-stdlib` to `1.1.7` - Added `version-compare 0.1.0` - Bump `wildmatch` to `2.1.1` + - Removed libssl dependency ## 0.9.0 diff --git a/Cargo.lock b/Cargo.lock index effa48e..a2832f9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,11 +126,12 @@ checksum = "e69e13a99a7e6e070bb114f7ff381e58c7ccc188630121fc4c2fe4bcf24cd072" dependencies = [ "http", "log", - "native-tls", - "openssl", + "rustls", "serde", "serde_json", "url", + "webpki", + "webpki-roots", "wildmatch", ] @@ -954,16 +955,16 @@ dependencies = [ ] [[package]] -name = "hyper-tls" -version = "0.5.0" +name = "hyper-rustls" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" dependencies = [ - "bytes", + "http", "hyper", - "native-tls", + "rustls", "tokio", - "tokio-native-tls", + "tokio-rustls", ] [[package]] @@ -1938,9 +1939,9 @@ dependencies = [ [[package]] name = "remotefs-aws-s3" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9939849e0b3895b07f258458d0fa5cd4632c78ffc517e66e1f758ddf23990542" +checksum = "896bc1b45d85d017e632b79faf8f78eccf5ca6f372baf541977b9274a1446b05" dependencies = [ "chrono", "log", @@ -1953,9 +1954,9 @@ dependencies = [ [[package]] name = "remotefs-ftp" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359fd989a6ad50fa6defae771e453695412cbfdb5476f49e42d1bb1d51b5c096" +checksum = "5af56f530781b5749b45acfc1e3ed196d4db05c17e1a7a2eae5a2fccd862079a" dependencies = [ "log", "path-slash 0.1.5", @@ -2005,28 +2006,45 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-tls", + "hyper-rustls", "ipnet", "js-sys", "lazy_static", "log", "mime", - "native-tls", "percent-encoding", "pin-project-lite", + "rustls", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-native-tls", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots", "winreg", ] +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi 0.3.9", +] + [[package]] name = "rpassword" version = "6.0.1" @@ -2078,6 +2096,27 @@ dependencies = [ "url", ] +[[package]] +name = "rustls" +version = "0.20.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +dependencies = [ + "base64", +] + [[package]] name = "ryu" version = "1.0.11" @@ -2115,6 +2154,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "secret-service" version = "2.0.2" @@ -2362,6 +2411,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "ssh2" version = "0.9.3" @@ -2420,9 +2475,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "suppaftp" -version = "4.4.0" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374fa36af4a114155280ba725b6487d78ec4ed8e54c69fe80f59805ffed9cd65" +checksum = "e847b04a392385badf1f7a766dcb4f9c7ce5f180360e5820d0b78cda026a9802" dependencies = [ "chrono", "lazy-regex", @@ -2635,13 +2690,14 @@ dependencies = [ ] [[package]] -name = "tokio-native-tls" -version = "0.3.0" +name = "tokio-rustls" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "native-tls", + "rustls", "tokio", + "webpki", ] [[package]] @@ -2807,6 +2863,12 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "url" version = "2.2.2" @@ -2962,6 +3024,25 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +dependencies = [ + "webpki", +] + [[package]] name = "wepoll-ffi" version = "0.1.2" diff --git a/Cargo.toml b/Cargo.toml index fc3bb87..dcb0353 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,11 +49,11 @@ notify-rust = { version = "4.5.6", default-features = false, features = [ "d" ] open = "3.0.2" rand = "0.8.5" remotefs = "^0.2.0" -remotefs-aws-s3 = "^0.2.0" -remotefs-ftp = { version = "^0.1.0", features = [ "secure" ] } +remotefs-aws-s3 = { version = "^0.2.1", default-features = false, features = [ "find", "rustls" ] } +remotefs-ftp = { version = "^0.1.2", features = [ "vendored", "native-tls" ] } remotefs-ssh = { version = "^0.1.2", features = [ "ssh2-vendored" ] } rpassword = "6.0.1" -self_update = { version = "0.30.0", features = [ "archive-tar", "archive-zip", "compression-flate2", "compression-zip-deflate" ] } +self_update = { version = "0.30.0", default-features = false, features = [ "rustls", "archive-tar", "archive-zip", "compression-flate2", "compression-zip-deflate" ] } serde = { version = "^1.0.0", features = [ "derive" ] } simplelog = "0.12.0" ssh2-config = "^0.1.3" diff --git a/install.sh b/install.sh index 24e99b1..6a68bb2 100755 --- a/install.sh +++ b/install.sh @@ -296,7 +296,7 @@ install_bsd_cargo_deps() { } install_linux_cargo_deps() { - local debian_deps="gcc pkg-config libssl-dev libssh2-1-dev libdbus-1-dev" + local debian_deps="gcc pkg-config libdbus-1-dev" local rpm_deps="gcc openssl pkgconfig libdbus-devel openssl-devel" local arch_deps="gcc openssl pkg-config dbus" local deps_cmd=""