ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-04-07 11:26:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update dependencies.

Browse Source
This commit is contained in:
Orne Brocaar 2024-09-09 13:36:29 +01:00
parent 5f8ddca7b7
commit 9d04a74a94
5 changed files with 327 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

601
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

10
chirpstack/Cargo.toml
View File

@ -83,7 +83,7 @@
tonic = "0.12"
tonic-web = "0.12"
tonic-reflection = "0.12"
tokio = { version = "1.38", features = ["macros", "rt-multi-thread"] }
tokio = { version = "1.40", features = ["macros", "rt-multi-thread"] }
tokio-stream = "0.1"
prost-types = "0.13"
prost = "0.13"
@ -92,7 +92,7 @@
# gRPC and HTTP multiplexing
axum = "0.7"
axum-server = { version = "0.7.1", features = ["tls-rustls-no-provider"] }
tower = { version = "0.4" }
tower = { version = "0.5", features = ["util"] }
futures = "0.3"
futures-util = "0.3"
http = "1.1"
@ -108,14 +108,14 @@
# Authentication
pbkdf2 = { version = "0.12", features = ["simple"] }
rand_core = { version = "0.6", features = ["std"] }
jsonwebtoken = "9.2"
jsonwebtoken = "9.3"
rustls = { version = "0.23", default-features = false, features = [
"logging",
"std",
"tls12",
"ring",
] }
rustls-native-certs = "0.7"
rustls-native-certs = "0.8"
rustls-pemfile = "2.1"
pem = "3.0"
x509-parser = "0.16"
@ -160,7 +160,7 @@
# Development and testing
[dev-dependencies]
httpmock = "0.7.0"
bytes = "1.6"
bytes = "1.7"
dotenv = "0.15"
[features]

2
chirpstack/src/api/mod.rs
View File

@ -133,7 +133,7 @@ pub async fn setup() -> Result<()> {
.add_service(
TonicReflectionBuilder::configure()
.register_encoded_file_descriptor_set(chirpstack_api::api::DESCRIPTOR)
.build()
.build_v1()
.unwrap(),
)
.add_service(InternalServiceServer::with_interceptor(

2
chirpstack/src/helpers/tls.rs
View File

@ -8,7 +8,7 @@ use tokio::fs;
// Return root certificates, optionally with the provided ca_file appended.
pub fn get_root_certs(ca_file: Option<String>) -> Result<rustls::RootCertStore> {
let mut roots = rustls::RootCertStore::empty();
for cert in rustls_native_certs::load_native_certs()? {
for cert in rustls_native_certs::load_native_certs().certs {
roots.add(cert)?;
}

2
chirpstack/src/helpers/tls22.rs
View File

@ -11,7 +11,7 @@ use tokio::fs;
// Return root certificates, optionally with the provided ca_file appended.
pub fn get_root_certs(ca_file: Option<String>) -> Result<rustls::RootCertStore> {
let mut roots = rustls::RootCertStore::empty();
for cert in rustls_native_certs::load_native_certs()? {
for cert in rustls_native_certs::load_native_certs().certs {
roots.add(cert)?;
}