Commit b24b92dc authored by eta's avatar eta
Browse files

onion-tunnel: link liblzma statically (and enable arti `static` feature)

parent f3c8dd09

Cargo.lock

+150 −0
Original line number Diff line number Diff line
@@ -628,6 +628,16 @@ version = "0.4.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"



[[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.3"
@@ -1201,6 +1211,12 @@ version = "0.1.9" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"



[[package]]

name = "fastrand"

version = "2.0.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"



[[package]]

name = "ff"

version = "0.13.0"
@@ -1233,6 +1249,21 @@ 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 = "fs-mistrust"

version = "0.7.4"
@@ -1847,6 +1878,24 @@ 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 = "nix"

version = "0.26.2"
@@ -2013,6 +2062,7 @@ dependencies = [ 
 "dns-message-parser",

 "futures",

 "libc",

 "lzma-sys",

 "onionmasq-device-testing",

 "onionmasq-pt-wrapper",

 "rand 0.8.5",
@@ -2123,6 +2173,60 @@ version = "0.3.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"



[[package]]

name = "openssl"

version = "0.10.57"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"

dependencies = [

 "bitflags 2.4.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",

 "quote",

 "syn 2.0.32",

]



[[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.1.5+3.1.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491"

dependencies = [

 "cc",

]



[[package]]

name = "openssl-sys"

version = "0.9.93"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"

dependencies = [

 "cc",

 "libc",

 "openssl-src",

 "pkg-config",

 "vcpkg",

]



[[package]]

name = "overload"

version = "0.1.1"
@@ -2731,6 +2835,15 @@ dependencies = [ 
 "regex",

]



[[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"
@@ -2767,6 +2880,29 @@ dependencies = [ 
 "zeroize",

]



[[package]]

name = "security-framework"

version = "2.9.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"

dependencies = [

 "bitflags 1.3.2",

 "core-foundation",

 "core-foundation-sys",

 "libc",

 "security-framework-sys",

]



[[package]]

name = "security-framework-sys"

version = "2.9.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"

dependencies = [

 "core-foundation-sys",

 "libc",

]



[[package]]

name = "semver"

version = "1.0.16"
@@ -3173,6 +3309,19 @@ dependencies = [ 
 "unicode-xid",

]



[[package]]

name = "tempfile"

version = "3.8.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"

dependencies = [

 "cfg-if",

 "fastrand",

 "redox_syscall 0.3.5",

 "rustix",

 "windows-sys 0.48.0",

]



[[package]]

name = "termcolor"

version = "1.2.0"
@@ -4040,6 +4189,7 @@ dependencies = [ 
 "async_executors",

 "educe",

 "futures",

 "native-tls",

 "pin-project",

 "rustls",

 "thiserror",

crates/onion-tunnel/Cargo.toml

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ simple_logger = "4" 
smoltcp = { version = "0.10.0", default-features = false, features = ["log", "phy-tuntap_interface", "medium-ip", "socket-udp", "socket-tcp", "proto-ipv4", "proto-ipv6", "socket", "async"] }

tokio = { version = "1", features = ["net", "rt", "time", "sync", "io-util", "macros"] }

tracing = "0.1.37"

arti-client = { git = "https://gitlab.torproject.org/eta/arti", branch = "unmanaged-pts-draft", default-features = false, features = ["tokio", "rustls", "static-sqlite", "geoip", "onion-service-client", "experimental-api", "bridge-client", "pt-client"] }

arti-client = { git = "https://gitlab.torproject.org/eta/arti", branch = "unmanaged-pts-draft", default-features = false, features = ["tokio", "rustls", "static", "geoip", "onion-service-client", "experimental-api", "bridge-client", "pt-client"] }

tor-rtcompat = { git = "https://gitlab.torproject.org/eta/arti", branch = "unmanaged-pts-draft" }

tor-linkspec = { git = "https://gitlab.torproject.org/eta/arti", branch = "unmanaged-pts-draft" }

tor-netdir = { git = "https://gitlab.torproject.org/eta/arti", branch = "unmanaged-pts-draft" }
@@ -33,3 +33,5 @@ tokio-util = { version = "0.7.9", features = ["compat"] } 
thiserror = "1.0"

rand = "0.8"

onionmasq-pt-wrapper = { path = "../onionmasq-pt-wrapper", optional = true }

# Avoid having to link liblzma.

lzma-sys = { version = "0.1", features = ["static"] }