Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 42 additions & 69 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,8 @@ tracing = "0.1.37"
tracing-subscriber = "0.3.17"
tun-rs = { version = "2.5.1", features = ["async"] }
twelf = { version = "0.15.0", default-features = false, features = ["env", "clap", "yaml", "custom_fn"]}
windows-sys = "0.61.0"
windows-sys = "0.61.0"

[patch.crates-io]
wolfssl = { git = "https://github.com/expressvpn/wolfssl-rs.git", branch = "upgrade/wolfssl-5.9.0" }
wolfssl-sys = { git = "https://github.com/expressvpn/wolfssl-rs.git", branch = "upgrade/wolfssl-5.9.0" }
5 changes: 4 additions & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ exceptions = [
{ name = "lightway-core", allow = ["AGPL-3.0-only"], version = "*" },
{ name = "lightway-server", allow = ["AGPL-3.0-only"], version = "*" },
{ name = "lightway-app-utils", allow = ["AGPL-3.0-only"], version = "*" },
{ name = "aws-lc-sys", allow = ["OpenSSL"], version = "*" },
]

[licenses.private]
Expand All @@ -47,6 +46,10 @@ external-default-features = "allow"
unknown-registry = "deny"
unknown-git = "deny"
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
allow-git = [
# Temporary: wolfssl-rs v5.9.0 upgrade branch (remove once published to crates.io)
"https://github.com/expressvpn/wolfssl-rs",
]

# See https://github.com/briansmith/ring/blob/main/LICENSE Ring
# contains elements liscensed under all of ISC, MIT and OpenSSL
Expand Down
2 changes: 1 addition & 1 deletion lightway-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ rand.workspace = true
rand_core = "0.9.3"
thiserror.workspace = true
tracing.workspace = true
wolfssl = "4.0.0"
wolfssl = "5.0.0"

[dev-dependencies]
async-trait.workspace = true
Expand Down
3 changes: 3 additions & 0 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ rustPlatform.buildRustPackage {

cargoLock = {
lockFile = ../Cargo.lock;
outputHashes = {
"wolfssl-5.0.0" = "sha256-u9hclks1wbrYsBqT9wpW4rKRuItpw76Ez8u+O509g/4=";
};
};

buildFeatures = features;
Expand Down
Loading