mirror of
https://github.com/greenart7c3/Amber.git
synced 2026-10-30 06:47:33 +00:00
greenart7c3
ff756e3415
Built-in Tor now runs Arti 2.7.0 (Tor in Rust) in-process through a small JNI wrapper (tools/arti, adapted from Amethyst's tools/arti-build) instead of the kmp-tor C tor daemon. TorManager keeps its public API, status flow, notification and restart behaviour on both platforms. - Prebuilt libraries are committed: Android (src/tor/jniLibs, all four ABIs, shared by the free and benchmark flavors) and desktop (appResources for Linux x64/arm64, Windows x64, macOS x64/arm64, shipped as Compose app resources). tools/arti/build.sh rebuilds them reproducibly. - Patch saturating-time 0.5.0 (used by tor-netdoc): its find_limit loops forever on Windows, where SystemTime has 100ns resolution, hanging the bootstrap at 15%. - Log callbacks attach native threads scoped, so they don't keep the desktop JVM alive on quit. - Reproducibility: pin the NDK AGP strips native libraries with, install it in the verification Dockerfile, and ship libamber_arti.so unstripped so the APK copy is byte-identical to the committed file.
44 lines
1.4 KiB
TOML
44 lines
1.4 KiB
TOML
[package]
|
|
name = "amber-arti"
|
|
version = "2.7.0"
|
|
edition = "2021"
|
|
publish = false
|
|
|
|
# JNI wrapper around Arti (Tor in Rust) for the built-in Tor of the Android app
|
|
# and the desktop app. Adapted from Amethyst's tools/arti-build.
|
|
[lib]
|
|
name = "amber_arti"
|
|
crate-type = ["cdylib"]
|
|
|
|
[workspace]
|
|
|
|
[dependencies]
|
|
arti-client = { version = "=0.47.0", default-features = false, features = [
|
|
"tokio",
|
|
"rustls",
|
|
"compression",
|
|
"onion-service-client",
|
|
"static-sqlite",
|
|
] }
|
|
tor-rtcompat = { version = "=0.47.0", default-features = false, features = ["tokio", "rustls"] }
|
|
# Direct dep on rustls so we can install the `ring` crypto provider ourselves:
|
|
# since arti-v2.3.0 tor-rtcompat no longer installs one implicitly, and `ring`
|
|
# avoids the cross-compilation pain of aws-lc-rs (Arti's default).
|
|
rustls = { version = "0.23", default-features = false, features = ["ring", "std"] }
|
|
jni = "0.22"
|
|
tokio = { version = "1", features = ["rt-multi-thread", "net", "io-util", "time", "macros"] }
|
|
anyhow = "1"
|
|
|
|
[profile.release]
|
|
opt-level = "z"
|
|
lto = true
|
|
codegen-units = 1
|
|
strip = true
|
|
panic = "abort"
|
|
|
|
# saturating-time 0.5.0 (the latest, used by tor-netdoc) loops forever on
|
|
# Windows, where SystemTime has 100ns resolution: see the "Amber patch" comment
|
|
# in patches/saturating-time/src/internal.rs. Drop this once upstream fixes it.
|
|
[patch.crates-io]
|
|
saturating-time = { path = "patches/saturating-time" }
|