remove the dependency on openssl

Cargo.lock

@@ -1019,16 +1019,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.4"
@@ -1279,13 +1269,12 @@ dependencies = [
 
 [[package]]
 name = "dnapi-rs"
-version = "0.1.13"
+version = "0.1.14"
 dependencies = [
  "base64 0.21.2",
  "base64-serde",
  "chrono",
  "log",
- "openssl-sys",
  "rand",
  "reqwest",
  "serde",
@@ -1389,18 +1378,6 @@ version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
 
-[[package]]
-name = "filetime"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.2.16",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "flate2"
 version = "1.0.26"
@@ -1417,21 +1394,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.0"
@@ -1789,16 +1751,17 @@ dependencies = [
 ]
 
 [[package]]
-name = "hyper-tls"
+name = "hyper-rustls"
-version = "0.5.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
 dependencies = [
- "bytes",
+ "futures-util",
+ "http",
  "hyper",
- "native-tls",
+ "rustls 0.21.5",
  "tokio",
- "tokio-native-tls",
+ "tokio-rustls 0.24.1",
 ]
 
 [[package]]
@@ -2092,24 +2055,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
 [[package]]
 name = "nebula-ffi"
 version = "0.1.3"
@@ -2210,60 +2155,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
-[[package]]
-name = "openssl"
-version = "0.10.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
-dependencies = [
- "bitflags 1.3.2",
- "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",
- "quote",
- "syn 2.0.25",
-]
-
-[[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 = "111.26.0+1.1.1u"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.90"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
-dependencies = [
- "cc",
- "libc",
- "openssl-src",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -2690,25 +2581,27 @@ dependencies = [
  "http",
  "http-body",
  "hyper",
- "hyper-tls",
+ "hyper-rustls",
  "ipnet",
  "js-sys",
  "log",
  "mime",
- "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "rustls 0.21.5",
+ "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "tokio",
- "tokio-native-tls",
+ "tokio-rustls 0.24.1",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
+ "webpki-roots",
  "winreg",
 ]
 
@@ -2833,6 +2726,18 @@ dependencies = [
  "webpki",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.21.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki",
+ "sct",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.3"
@@ -2842,6 +2747,16 @@ dependencies = [
  "base64 0.21.2",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.101.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.13"
@@ -2854,15 +2769,6 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
 
-[[package]]
-name = "schannel"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
-dependencies = [
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -3048,29 +2954,6 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
-[[package]]
-name = "security-framework"
-version = "2.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.17"
@@ -3362,7 +3245,7 @@ dependencies = [
  "percent-encoding",
  "rand",
  "rust_decimal",
- "rustls",
+ "rustls 0.20.8",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -3408,7 +3291,7 @@ checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024"
 dependencies = [
  "once_cell",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.23.4",
 ]
 
 [[package]]
@@ -3467,31 +3350,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
-[[package]]
-name = "tar"
-version = "0.4.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
-dependencies = [
- "autocfg",
- "cfg-if",
- "fastrand",
- "redox_syscall 0.3.5",
- "rustix 0.37.23",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "textwrap"
 version = "0.16.0"
@@ -3500,12 +3358,11 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "tfcli"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "clap 4.3.12",
  "dirs 5.0.1",
  "ipnet",
- "openssl-sys",
  "qr2term",
  "reqwest",
  "serde",
@@ -3516,7 +3373,7 @@ dependencies = [
 
 [[package]]
 name = "tfclient"
-version = "0.2.1"
+version = "0.2.3"
 dependencies = [
  "base64 0.21.2",
  "base64-serde",
@@ -3525,20 +3382,16 @@ dependencies = [
  "ctrlc",
  "dirs 5.0.1",
  "dnapi-rs",
- "flate2",
  "hex",
  "ipnet",
  "log",
  "nebula-ffi",
- "openssl-sys",
  "reqwest",
  "serde",
  "serde_json",
  "serde_yaml",
  "sha2",
  "simple_logger",
- "tar",
- "tempfile",
  "toml 0.7.6",
  "trifid-pki 0.1.11",
  "url",
@@ -3660,27 +3513,27 @@ dependencies = [
  "syn 2.0.25",
 ]
 
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
 dependencies = [
- "rustls",
+ "rustls 0.20.8",
  "tokio",
  "webpki",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls 0.21.5",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
 version = "0.1.14"
@@ -4005,12 +3858,6 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3"
 
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -4353,15 +4200,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "xattr"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "zeroize"
 version = "1.6.0"

dnapi-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dnapi-rs"
-version = "0.1.13"
+version = "0.1.14"
 edition = "2021"
 description = "A rust client for the Defined Networking API"
 license = "AGPL-3.0-or-later"
@@ -12,15 +12,14 @@ repository = "https://git.e3t.cc/~core/trifid"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = { version = "1.0.159", features = ["derive"] }
+serde = { version = "1", features = ["derive"] }
-serde_with = "3.0.0"
+serde_with = "3"
-base64-serde = "0.7.0"
+base64-serde = "0.7"
-log = "0.4.17"
+log = "0.4"
-reqwest = { version = "0.11.16", features = ["blocking", "json"] }
+reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"], default-features = false }
-url = "2.3.1"
+url = "2.3"
-base64 = "0.21.0"
+base64 = "0.21"
-serde_json = "1.0.95"
+serde_json = "1"
 trifid-pki = { version = "0.1", path = "../trifid-pki", features = ["serde_derive"] }
-rand = "0.8.5"
+rand = "0.8"
-chrono = "0.4.24"
+chrono = "0.4"
-openssl-sys = { version = "0.9.83", features = ["vendored"] }

tfcli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tfcli"
-version = "0.1.3"
+version = "0.1.4"
 edition = "2021"
 description = "Command-line client for managing trifid-api"
 license = "GPL-3.0-or-later"
@@ -12,12 +12,11 @@ repository = "https://git.e3t.cc/~core/trifid"
 
 [dependencies]
 clap = { version = "4", features = ["derive", "env"] }
-url = "2.3.1"
+url = "2.3"
-reqwest = { version = "0.11.17", features = ["json"] }
+reqwest = { version = "0.11", features = ["json", "rustls-tls"], default-features = false }
 serde = { version = "1", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
-dirs = "5.0.1"
+dirs = "5"
-qr2term = "0.3.1"
+qr2term = "0.3"
-ipnet = "2.7.2"
+ipnet = "2.7"
-serde_json = "1.0.96"
+serde_json = "1"
-openssl-sys = { version = "0.9.83", features = ["vendored"] }

tfclient/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tfclient"
-version = "0.2.1"
+version = "0.2.3"
 edition = "2021"
 description = "An open-source reimplementation of a Defined Networking-compatible client"
 license = "GPL-3.0-or-later"
@@ -11,37 +11,27 @@ repository = "https://git.e3t.cc/~core/trifid"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "4.1.10", features = ["derive"] }
+clap = { version = "4.1", features = ["derive"] }
 trifid-pki = { version = "0.1", path = "../trifid-pki", features = ["serde_derive"] }
-dirs = "5.0.0"
+dirs = "5"
-log = "0.4.17"
+log = "0.4"
-simple_logger = "4.1.0"
+simple_logger = "4.1"
-sha2 = "0.10.6"
+sha2 = "0.10"
-hex = "0.4.3"
+hex = "0.4"
-url = "2.3.1"
+url = "2.3"
-toml = "0.7.3"
+toml = "0.7"
-serde = { version = "1.0.158", features = ["derive"] }
+serde = { version = "1", features = ["derive"] }
-serde_json = "1.0.94"
+serde_json = "1"
-ctrlc = "3.2.5"
+ctrlc = "3.2"
-reqwest = { version = "0.11.16", features = ["blocking"] }
+reqwest = { version = "0.11", features = ["blocking", "rustls-tls"], default-features = false }
-base64 = "0.21.0"
+base64 = "0.21"
-chrono = "0.4.24"
+chrono = "0.4"
-ipnet = "2.7.1"
+ipnet = "2.7"
-base64-serde = "0.7.0"
+base64-serde = "0.7"
 dnapi-rs = { version = "0.1", path = "../dnapi-rs" }
-serde_yaml = "0.9.19"
+serde_yaml = "0.9"
-openssl-sys = { version = "0.9.83", features = ["vendored"] }
 nebula-ffi = { version = "0.1", path = "../nebula-ffi", optional = true }
 
-[build-dependencies]
-serde = { version = "1.0.157", features = ["derive"] }
-reqwest = { version = "0.11.14", features = ["blocking", "json"] }
-flate2 = "1.0.25"
-tar = "0.4.38"
-hex = "0.4.3"
-tempfile = "3.4.0"
-sha2 = "0.10.6"
-
 [package.metadata.deb]
 maintainer = "c0repwn3r <core@e3t.cc>"
 copyright = "e3team <admin@e3t.cc>"