Skip to content

Commit

Permalink
Merge pull request #260 from boxdot/RUSTSEC-2023-0065-2
Browse files Browse the repository at this point in the history
fix: RUSTSEC-2023-0065 (part 2)
  • Loading branch information
rubdos authored Nov 14, 2023
2 parents e579cac + 79fb578 commit f61c2fb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
coverage: false
include:
- project: "libsignal-service-actix"
toolchain: "1.61"
toolchain: "1.70"
coverage: false
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion libsignal-service-actix/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version = "0.1.0"
authors = ["Ruben De Smet <[email protected]>"]
edition = "2018"
license = "AGPL-3.0"
rust-version = "1.70.0"

[dependencies]
# Contrary to hyper, actix does not have Send compatible futures, which means
Expand All @@ -12,7 +13,6 @@ libsignal-service = { path = "../libsignal-service", features = ["unsend-futures

awc = { version = "3.0.0-beta.19", features = ["rustls"] }
actix = "0.13"
actix-http = "3.0.0-beta.19"
actix-rt = "2.4"
# mpart-async 0.6 requires Rust 2021, violating MSRV = 1.52
mpart-async = "0.5"
Expand Down
13 changes: 4 additions & 9 deletions libsignal-service-hyper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ version = "0.1.0"
authors = ["Gabriel Féron <[email protected]>"]
edition = "2018"
license = "AGPL-3.0"
rust-version = "1.70.0"

[dependencies]
libsignal-service = { path = "../libsignal-service" }

async-trait = "0.1"
base64 = "0.13"
bytes = "1.0"
futures = "0.3"
log = "0.4"
Expand All @@ -20,25 +20,20 @@ thiserror = "1.0"
url = "2.1"

hyper = { version = "0.14", features = ["client", "stream"] }
hyper-rustls = "0.23"
hyper-rustls = "0.24"
hyper-timeout = "0.4"
headers = "0.3"

# for websocket support
async-tungstenite = { version = "0.21", features = ["tokio-rustls-native-certs"] }
async-tungstenite = { version = "0.23", features = ["tokio-rustls-native-certs"] }

tokio = { version = "1.0", features = ["macros"] }
tokio-rustls = "0.23"
tokio-rustls = "0.24"

rustls-pemfile = "0.3"

[dev-dependencies]
env_logger = "0.9"
image = { version = "0.23", default-features = false, features = ["png"] }
opener = "0.5"
qrcode = "0.12"
rand = "0.8"
structopt = "0.3"
tokio = { version = "1.0", features = ["rt-multi-thread"] }

[features]
Expand Down

0 comments on commit f61c2fb

Please sign in to comment.