From 6a114cd2e06faaba1eb8cf35227c3c1129e6863b Mon Sep 17 00:00:00 2001 From: weisd Date: Fri, 3 Apr 2026 13:27:56 +0800 Subject: [PATCH] fix: bump s3s for presigned checksum handling (#2379) --- Cargo.lock | 113 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 57 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 33842deb3..e51a91424 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1222,7 +1222,7 @@ version = "0.11.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52965399b470437fc7f4d4b51134668dbc96573fea6f1b83318a420e4605745" dependencies = [ - "digest 0.11.1", + "digest 0.11.2", ] [[package]] @@ -3108,9 +3108,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285743a676ccb6b3e116bc14cc69319b957867930ae9c4822f8e0f54509d7243" +checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c" dependencies = [ "block-buffer 0.12.0", "const-oid 0.10.2", @@ -3204,7 +3204,7 @@ dependencies = [ "serde", "serde_json", "serial_test", - "sha2 0.11.0-rc.5", + "sha2 0.11.0", "suppaftp", "time", "tokio", @@ -3412,7 +3412,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4205,11 +4205,11 @@ dependencies = [ [[package]] name = "hmac" -version = "0.13.0-rc.5" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef451d73f36d8a3f93ad32c332ea01146c9650e1ec821a9b0e46c01277d544f8" +checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" dependencies = [ - "digest 0.11.1", + "digest 0.11.2", ] [[package]] @@ -4322,9 +4322,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" +checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" dependencies = [ "atomic-waker", "bytes", @@ -4337,7 +4337,6 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "pin-utils", "smallvec", "tokio", "want", @@ -4667,7 +4666,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4744,7 +4743,7 @@ dependencies = [ "portable-atomic", "portable-atomic-util", "serde_core", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5233,12 +5232,12 @@ dependencies = [ [[package]] name = "md-5" -version = "0.11.0-rc.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e715bb6f273068fc89403d6c4f5eeb83708c62b74c8d43e3e8772ca73a6288" +checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" dependencies = [ "cfg-if", - "digest 0.11.1", + "digest 0.11.2", ] [[package]] @@ -6257,8 +6256,8 @@ version = "0.13.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8dfa4e14084d963d35bfb4cdb38712cde78dcf83054c0e8b9b8e899150f374e" dependencies = [ - "digest 0.11.1", - "hmac 0.13.0-rc.5", + "digest 0.11.2", + "hmac 0.13.0", ] [[package]] @@ -7474,7 +7473,7 @@ dependencies = [ "const-oid 0.10.2", "crypto-bigint 0.7.1", "crypto-primes", - "digest 0.11.1", + "digest 0.11.2", "pkcs1 0.8.0-rc.4", "pkcs8 0.11.0-rc.11", "rand_core 0.10.0", @@ -7648,7 +7647,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "serial_test", - "sha2 0.11.0-rc.5", + "sha2 0.11.0", "shadow-rs", "socket2", "starshard", @@ -7718,10 +7717,10 @@ dependencies = [ "bytes", "crc-fast", "http 1.4.0", - "md-5 0.11.0-rc.5", + "md-5 0.11.0", "pretty_assertions", - "sha1 0.11.0-rc.5", - "sha2 0.11.0-rc.5", + "sha1 0.11.0", + "sha2 0.11.0", ] [[package]] @@ -7785,7 +7784,7 @@ dependencies = [ "pbkdf2 0.13.0-rc.9", "rand 0.10.0", "serde_json", - "sha2 0.11.0-rc.5", + "sha2 0.11.0", "test-case", "thiserror 2.0.18", "time", @@ -7819,7 +7818,7 @@ dependencies = [ "google-cloud-auth", "google-cloud-storage", "hex-simd", - "hmac 0.13.0-rc.5", + "hmac 0.13.0", "http 1.4.0", "http-body 1.0.1", "http-body-util", @@ -7827,7 +7826,7 @@ dependencies = [ "hyper-rustls", "hyper-util", "lazy_static", - "md-5 0.11.0-rc.5", + "md-5 0.11.0", "memmap2 0.9.10", "metrics", "num_cpus", @@ -7864,8 +7863,8 @@ dependencies = [ "serde_json", "serde_urlencoded", "serial_test", - "sha1 0.11.0-rc.5", - "sha2 0.11.0-rc.5", + "sha1 0.11.0", + "sha2 0.11.0", "shadow-rs", "smallvec", "temp-env", @@ -8028,7 +8027,7 @@ dependencies = [ "rustfs-utils", "serde", "serde_json", - "sha2 0.11.0-rc.5", + "sha2 0.11.0", "temp-env", "tempfile", "thiserror 2.0.18", @@ -8215,7 +8214,7 @@ dependencies = [ "futures", "futures-util", "hex", - "hmac 0.13.0-rc.5", + "hmac 0.13.0", "http 1.4.0", "http-body-util", "hyper", @@ -8236,8 +8235,8 @@ dependencies = [ "s3s", "serde", "serde_json", - "sha1 0.11.0-rc.5", - "sha2 0.11.0-rc.5", + "sha1 0.11.0", + "sha2 0.11.0", "thiserror 2.0.18", "time", "tokio", @@ -8277,7 +8276,7 @@ dependencies = [ "hex-simd", "http 1.4.0", "http-body-util", - "md-5 0.11.0-rc.5", + "md-5 0.11.0", "pin-project-lite", "rand 0.10.0", "reqwest 0.13.2", @@ -8287,8 +8286,8 @@ dependencies = [ "s3s", "serde", "serde_json", - "sha1 0.11.0-rc.5", - "sha2 0.11.0-rc.5", + "sha1 0.11.0", + "sha2 0.11.0", "thiserror 2.0.18", "tokio", "tokio-test", @@ -8452,13 +8451,13 @@ dependencies = [ "hashbrown 0.16.1", "hex-simd", "highway", - "hmac 0.13.0-rc.5", + "hmac 0.13.0", "http 1.4.0", "hyper", "libc", "local-ip-address", "lz4", - "md-5 0.11.0-rc.5", + "md-5 0.11.0", "netif", "rand 0.10.0", "regex", @@ -8468,8 +8467,8 @@ dependencies = [ "rustls-pki-types", "s3s", "serde", - "sha1 0.11.0-rc.5", - "sha2 0.11.0-rc.5", + "sha1 0.11.0", + "sha2 0.11.0", "siphasher", "snap", "sysinfo", @@ -8568,7 +8567,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8636,7 +8635,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8683,7 +8682,7 @@ checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "s3s" version = "0.14.0-dev" -source = "git+https://github.com/rustfs/s3s?rev=f1815ced732e180f71935feee6ae5ef44fe39b22#f1815ced732e180f71935feee6ae5ef44fe39b22" +source = "git+https://github.com/rustfs/s3s?rev=738f85792c92781bd8af862a074d7379d9fbfabc#738f85792c92781bd8af862a074d7379d9fbfabc" dependencies = [ "arc-swap", "arrayvec", @@ -8697,14 +8696,14 @@ dependencies = [ "crc-fast", "futures", "hex-simd", - "hmac 0.13.0-rc.5", + "hmac 0.13.0", "http 1.4.0", "http-body 1.0.1", "http-body-util", "httparse", "hyper", "itoa", - "md-5 0.11.0-rc.5", + "md-5 0.11.0", "memchr", "mime", "nom 8.0.0", @@ -8714,8 +8713,8 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sha1 0.11.0-rc.5", - "sha2 0.11.0-rc.5", + "sha1 0.11.0", + "sha2 0.11.0", "smallvec", "std-next", "subtle", @@ -9051,13 +9050,13 @@ dependencies = [ [[package]] name = "sha1" -version = "0.11.0-rc.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b167252f3c126be0d8926639c4c4706950f01445900c4b3db0fd7e89fcb750a" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" dependencies = [ "cfg-if", - "cpufeatures 0.2.17", - "digest 0.11.1", + "cpufeatures 0.3.0", + "digest 0.11.2", ] [[package]] @@ -9073,13 +9072,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.11.0-rc.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5f3b1e2dc8aad28310d8410bd4d7e180eca65fca176c52ab00d364475d0024" +checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", - "cpufeatures 0.2.17", - "digest 0.11.1", + "cpufeatures 0.3.0", + "digest 0.11.2", ] [[package]] @@ -9156,7 +9155,7 @@ version = "3.0.0-rc.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f1880df446116126965eeec169136b2e0251dba37c6223bcc819569550edea3" dependencies = [ - "digest 0.11.1", + "digest 0.11.2", "rand_core 0.10.0", ] @@ -9641,7 +9640,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -10600,7 +10599,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index eb8491d5d..143f3e762 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -250,7 +250,7 @@ rumqttc = { version = "0.25.1" } rustix = { version = "1.1.4", features = ["fs"] } rust-embed = { version = "8.11.0" } rustc-hash = { version = "2.1.2" } -s3s = { git = "https://github.com/rustfs/s3s", rev = "f1815ced732e180f71935feee6ae5ef44fe39b22", features = ["minio"] } +s3s = { git = "https://github.com/rustfs/s3s", rev = "738f85792c92781bd8af862a074d7379d9fbfabc", features = ["minio"] } serial_test = "3.4.0" shadow-rs = { version = "1.7.1", default-features = false } siphasher = "1.0.2"