Commit ca220b8f authored by Nugine's avatar Nugine
Browse files

build(deps): downgrade hashes

parent bcfce19b

Cargo.lock

+21 −100
Original line number Diff line number Diff line
@@ -229,14 +229,14 @@ dependencies = [ 
 "bytes",

 "fastrand",

 "hex",

 "hmac 0.12.1",

 "hmac",

 "http 0.2.12",

 "http-body 0.4.6",

 "lru",

 "once_cell",

 "percent-encoding",

 "regex-lite",

 "sha2 0.10.8",

 "sha2",

 "tracing",

 "url",

]
@@ -279,14 +279,14 @@ dependencies = [ 
 "crypto-bigint 0.5.5",

 "form_urlencoded",

 "hex",

 "hmac 0.12.1",

 "hmac",

 "http 0.2.12",

 "http 1.2.0",

 "once_cell",

 "p256",

 "percent-encoding",

 "ring",

 "sha2 0.10.8",

 "sha2",

 "subtle",

 "time",

 "tracing",
@@ -321,8 +321,8 @@ dependencies = [ 
 "http-body 0.4.6",

 "md-5",

 "pin-project-lite",

 "sha1 0.10.6",

 "sha2 0.10.8",

 "sha1",

 "sha2",

 "tracing",

]
@@ -592,15 +592,6 @@ dependencies = [ 
 "generic-array",

]



[[package]]

name = "block-buffer"

version = "0.11.0-rc.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3fd016a0ddc7cb13661bf5576073ce07330a693f8608a1320b4e20561cc12cdc"

dependencies = [

 "hybrid-array",

]



[[package]]

name = "bumpalo"

version = "3.17.0"
@@ -720,12 +711,6 @@ version = "0.9.6" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"



[[package]]

name = "const-oid"

version = "0.10.0-rc.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "68ff6be19477a1bd5441f382916a89bc2a0b2c35db6d41e0f6e8538bf6d6463f"



[[package]]

name = "const-str"

version = "0.6.2"
@@ -845,24 +830,13 @@ dependencies = [ 
 "typenum",

]



[[package]]

name = "crypto-common"

version = "0.2.0-rc.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b0b8ce8218c97789f16356e7896b3714f26c2ee1079b79c0b7ae7064bb9089fa"

dependencies = [

 "getrandom 0.2.15",

 "hybrid-array",

 "rand_core",

]



[[package]]

name = "der"

version = "0.6.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"

dependencies = [

 "const-oid 0.9.6",

 "const-oid",

 "zeroize",

]
@@ -881,20 +855,8 @@ version = "0.10.7" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"

dependencies = [

 "block-buffer 0.10.4",

 "crypto-common 0.1.6",

 "subtle",

]



[[package]]

name = "digest"

version = "0.11.0-pre.9"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "cf2e3d6615d99707295a9673e889bf363a04b2a466bd320c65a72536f7577379"

dependencies = [

 "block-buffer 0.11.0-rc.3",

 "const-oid 0.10.0-rc.3",

 "crypto-common 0.2.0-rc.1",

 "block-buffer",

 "crypto-common",

 "subtle",

]
@@ -942,7 +904,7 @@ dependencies = [ 
 "base16ct",

 "crypto-bigint 0.4.9",

 "der",

 "digest 0.10.7",

 "digest",

 "ff",

 "generic-array",

 "group",
@@ -1227,16 +1189,7 @@ version = "0.12.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"

dependencies = [

 "digest 0.10.7",

]



[[package]]

name = "hmac"

version = "0.13.0-pre.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e4b1fb14e4df79f9406b434b60acef9f45c26c50062cccf1346c6103b8c47d58"

dependencies = [

 "digest 0.11.0-pre.9",

 "digest",

]



[[package]]
@@ -1307,15 +1260,6 @@ version = "1.0.3" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"



[[package]]

name = "hybrid-array"

version = "0.2.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f2d35805454dc9f8662a98d6d61886ffe26bd465f5960e0e55345c70d5c0d2a9"

dependencies = [

 "typenum",

]



[[package]]

name = "hyper"

version = "0.14.32"
@@ -1652,7 +1596,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"

dependencies = [

 "cfg-if",

 "digest 0.10.7",

 "digest",

]



[[package]]
@@ -1831,7 +1775,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" 
dependencies = [

 "ecdsa",

 "elliptic-curve",

 "sha2 0.10.8",

 "sha2",

]



[[package]]
@@ -2018,7 +1962,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"

dependencies = [

 "crypto-bigint 0.4.9",

 "hmac 0.12.1",

 "hmac",

 "zeroize",

]
@@ -2115,7 +2059,6 @@ dependencies = [ 
 "atoi",

 "axum",

 "base64-simd",

 "block-buffer 0.11.0-rc.3",

 "bytes",

 "bytestring",

 "chrono",
@@ -2123,10 +2066,10 @@ dependencies = [ 
 "crc32c",

 "crc32fast",

 "crc64fast-nvme",

 "digest 0.11.0-pre.9",

 "digest",

 "futures",

 "hex-simd",

 "hmac 0.13.0-pre.4",

 "hmac",

 "http-body 1.0.1",

 "http-body-util",

 "httparse",
@@ -2143,8 +2086,8 @@ dependencies = [ 
 "serde",

 "serde_json",

 "serde_urlencoded",

 "sha1 0.11.0-pre.4",

 "sha2 0.11.0-pre.4",

 "sha1",

 "sha2",

 "smallvec",

 "std-next",

 "sync_wrapper",
@@ -2434,18 +2377,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" 
dependencies = [

 "cfg-if",

 "cpufeatures",

 "digest 0.10.7",

]



[[package]]

name = "sha1"

version = "0.11.0-pre.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9540978cef7a8498211c1b1c14e5ce920fe5bd524ea84f4a3d72d4602515ae93"

dependencies = [

 "cfg-if",

 "cpufeatures",

 "digest 0.11.0-pre.9",

 "digest",

]



[[package]]
@@ -2456,18 +2388,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" 
dependencies = [

 "cfg-if",

 "cpufeatures",

 "digest 0.10.7",

]



[[package]]

name = "sha2"

version = "0.11.0-pre.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "540c0893cce56cdbcfebcec191ec8e0f470dd1889b6e7a0b503e310a94a168f5"

dependencies = [

 "cfg-if",

 "cpufeatures",

 "digest 0.11.0-pre.9",

 "digest",

]



[[package]]
@@ -2500,7 +2421,7 @@ version = "1.6.4" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"

dependencies = [

 "digest 0.10.7",

 "digest",

 "rand_core",

]

crates/s3s/Cargo.toml

+5 −7
Original line number Diff line number Diff line
@@ -17,12 +17,11 @@ all-features = true 
rustdoc-args = ["--cfg", "docsrs"]



[features]

minio = []

openssl = ["dep:openssl"]

tower = ["dep:tower"]



[target.'cfg(not(windows))'.dependencies]

openssl = { version = "0.10.66", optional = true }

openssl = { version = "0.10.71", optional = true }



[dependencies]

arrayvec = "0.7.6"
@@ -34,11 +33,10 @@ bytestring = "1.3.1" 
chrono = { version = "0.4.40", default-features = false }

crc32c = "0.6.8"

crc32fast = "1.4.2"

digest = "0.11.0-pre.9"

block-buffer = "=0.11.0-rc.3"

digest = "0.10.7"

futures = { version = "0.3.31", default-features = false, features = ["std"] }

hex-simd = "0.8.0"

hmac = "0.13.0-pre.4"

hmac = "0.12.1"

http-body = "1.0.1"

http-body-util = "0.1.2"

httparse = "1.9.5"
@@ -53,8 +51,8 @@ pin-project-lite = "0.2.14" 
quick-xml = { version = "0.37.0", features = ["serialize"] }

serde = { version = "1.0.210", features = ["derive"] }

serde_urlencoded = "0.7.1"

sha1 = "0.11.0-pre.4"

sha2 = "0.11.0-pre.4"

sha1 = "0.10.6"

sha2 = "0.10.8"

smallvec = "1.13.2"

thiserror = "2.0.3"

time = { version = "0.3.36", features = ["formatting", "parsing", "macros"] }

crates/s3s/src/utils/crypto.rs

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ pub fn is_sha256_checksum(s: &str) -> bool { 


/// `hmac_sha1(key, data)`

pub fn hmac_sha1(key: impl AsRef<[u8]>, data: impl AsRef<[u8]>) -> [u8; 20] {

    use hmac::{Hmac, KeyInit, Mac};

    use hmac::{Hmac, Mac};

    use sha1::Sha1;



    let mut m = <Hmac<Sha1>>::new_from_slice(key.as_ref()).unwrap();
@@ -22,7 +22,7 @@ pub fn hmac_sha1(key: impl AsRef<[u8]>, data: impl AsRef<[u8]>) -> [u8; 20] { 


/// `hmac_sha256(key, data)`

pub fn hmac_sha256(key: impl AsRef<[u8]>, data: impl AsRef<[u8]>) -> [u8; 32] {

    use hmac::{Hmac, KeyInit, Mac};

    use hmac::{Hmac, Mac};

    use sha2::Sha256;



    let mut m = <Hmac<Sha256>>::new_from_slice(key.as_ref()).unwrap();