Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lle-bout/upgrade-authc-rev' into 'master'

Browse Source 
Upgrade authc dependency revision

See merge request veloren/veloren!4089
This commit is contained in:
Marcel 2023-08-23 10:01:52 +00:00
commit 5195f6aaca
3 changed files with 18 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
Cargo.lock generated
View File

@ -359,7 +359,7 @@ dependencies = [
[[package]]
name = "auth-common"
version = "0.1.0"
source = "git+https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a#fb3dcbc4962b367253f8f2f92760ef44d2679c9a"
source = "git+https://gitlab.com/veloren/auth.git?rev=42dddd666f28e1a94cdf4b542fcd61f67658e261#42dddd666f28e1a94cdf4b542fcd61f67658e261"
dependencies = [
"rand 0.8.5",
"serde",
@ -369,7 +369,7 @@ dependencies = [
[[package]]
name = "authc"
version = "1.0.0"
source = "git+https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a#fb3dcbc4962b367253f8f2f92760ef44d2679c9a"
source = "git+https://gitlab.com/veloren/auth.git?rev=42dddd666f28e1a94cdf4b542fcd61f67658e261#42dddd666f28e1a94cdf4b542fcd61f67658e261"
dependencies = [
"auth-common",
"fxhash",
@ -1475,15 +1475,6 @@ dependencies = [
"memchr",
]
[[package]]
name = "ct-logs"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
dependencies = [
"sct 0.6.1",
]
[[package]]
name = "cty"
version = "0.2.2"
@ -2952,19 +2943,18 @@ dependencies = [
[[package]]
name = "hyper-rustls"
version = "0.22.1"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
dependencies = [
"ct-logs",
"futures-util",
"http",
"hyper",
"log",
"rustls 0.19.1",
"rustls-native-certs 0.5.0",
"rustls",
"rustls-native-certs",
"tokio",
"tokio-rustls",
"webpki",
]
[[package]]
@ -4865,7 +4855,7 @@ dependencies = [
"quinn-proto",
"quinn-udp",
"rustc-hash",
"rustls 0.21.6",
"rustls",
"thiserror",
"tokio",
"tracing",
@ -4881,8 +4871,8 @@ dependencies = [
"rand 0.8.5",
"ring",
"rustc-hash",
"rustls 0.21.6",
"rustls-native-certs 0.6.2",
"rustls",
"rustls-native-certs",
"slab",
"thiserror",
"tinyvec",
@ -5439,19 +5429,6 @@ dependencies = [
"windows-sys 0.48.0",
]
[[package]]
name = "rustls"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
dependencies = [
"base64 0.13.1",
"log",
"ring",
"sct 0.6.1",
"webpki",
]
[[package]]
name = "rustls"
version = "0.21.6"
@ -5461,19 +5438,7 @@ dependencies = [
"log",
"ring",
"rustls-webpki",
"sct 0.7.0",
]
[[package]]
name = "rustls-native-certs"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
dependencies = [
"openssl-probe",
"rustls 0.19.1",
"schannel",
"security-framework",
"sct",
]
[[package]]
@ -5625,16 +5590,6 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
[[package]]
name = "sct"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "sct"
version = "0.7.0"
@ -6562,13 +6517,12 @@ dependencies = [
[[package]]
name = "tokio-rustls"
version = "0.22.0"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
dependencies = [
"rustls 0.19.1",
"rustls",
"tokio",
"webpki",
]
[[package]]
@ -7230,7 +7184,7 @@ dependencies = [
"quinn",
"rand 0.8.5",
"rcgen",
"rustls 0.21.6",
"rustls",
"serde",
"shellexpand",
"socket2 0.5.2",
@ -7340,7 +7294,7 @@ dependencies = [
"refinery",
"ron 0.8.0",
"rusqlite",
"rustls 0.21.6",
"rustls",
"rustls-pemfile",
"schnellru",
"serde",
@ -8123,16 +8077,6 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "webpki"
version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "wfd"
version = "0.1.7"

2
client/Cargo.toml
View File

@ -31,7 +31,7 @@ rayon = { workspace = true }
specs = { workspace = true, features = ["serde", "storage-event-control", "derive"] }
vek = { workspace = true }
hashbrown = { workspace = true }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253f8f2f92760ef44d2679c9a" }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "42dddd666f28e1a94cdf4b542fcd61f67658e261" } # xMAC94x/current_master_till_refactored branch
#TODO: put bot in a different crate
#bot only

2
server/Cargo.toml
View File

@ -60,7 +60,7 @@ rayon = { workspace = true }
crossbeam-channel = { workspace = true }
prometheus = { workspace = true }
portpicker = { git = "https://github.com/xMAC94x/portpicker-rs", rev = "df6b37872f3586ac3b21d08b56c8ec7cd92fb172" }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253f8f2f92760ef44d2679c9a" }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "42dddd666f28e1a94cdf4b542fcd61f67658e261" } # xMAC94x/current_master_till_refactored branch
slab = "0.4"
rand_distr = "0.4.0"
enumset = "1.0.8"