From e128fecfd8d9b0b09be5ab3716379050e8aff56e Mon Sep 17 00:00:00 2001 From: Skipper Date: Fri, 26 Jun 2026 12:10:29 +0200 Subject: [PATCH] deps(server): version bump --- server/Cargo.lock | 313 ++++++++++-------- server/Cargo.toml | 18 +- server/crates/arbiter-client/Cargo.toml | 2 +- server/crates/arbiter-crypto/src/authn/v1.rs | 40 ++- server/crates/arbiter-proto/Cargo.toml | 4 +- server/crates/arbiter-server/Cargo.toml | 6 +- .../arbiter-server/tests/client/auth.rs | 16 +- .../arbiter-server/tests/operator/auth.rs | 14 +- 8 files changed, 224 insertions(+), 189 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index e36c264..8479c01 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -44,9 +44,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8010fc7e9e8643ef4e758cdccf3eef26734594aedf88a9d5ed35e51837d42ef" +checksum = "d1172e33a862030da77768c11cf17a1f801590de94cf518392b65207f15810c8" dependencies = [ "alloy-consensus", "alloy-contract", @@ -78,9 +78,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d64da86c616b5092ea64eea648f311bbd58630a0b384c42d699175d6f9122b" +checksum = "b44937ce84d2cbf1ee4010667bd9214bb7db134a91dd9ffa6b1b8b1d6b030449" dependencies = [ "alloy-eips", "alloy-primitives", @@ -96,7 +96,7 @@ dependencies = [ "k256", "once_cell", "rand 0.8.6", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_json", "serde_with", @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd98696ca3617d3a9ba1a6f2011880cbfd5618228dab6400c9f8bca457859a8" +checksum = "7bb0bdd61ddff726026676450e7e6a52c68aa39d98f2d60d05ad7caaea5b8100" dependencies = [ "alloy-consensus", "alloy-eips", @@ -119,9 +119,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3df0aadc569a8b277808a7d0ad0e421180654ea36a3c59e9ed2bb968c9a1cd" +checksum = "b1475c7edc6780b1759ccdb7960e28d29856ecbed47cfcf9e25be6a5f48b0cfb" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -142,9 +142,9 @@ dependencies = [ [[package]] name = "alloy-core" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e8604b0c092fabc80d075ede181c9b9e596249c70b99253082d7e689836529" +checksum = "62ddde5968de6044d67af107ad835bc0069a7ca245870b94c5958a7d8712b184" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2db5c583aaef0255aa63a4fe827f826090142528bba48d1bf4119b62780cad" +checksum = "a475bb02d9cef2dbb99065c1664ab3fe1f9352e21d6d5ed3f02cdbfc06ed1abc" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -166,7 +166,7 @@ dependencies = [ "itoa", "serde", "serde_json", - "winnow 0.7.15", + "winnow 1.0.2", ] [[package]] @@ -209,22 +209,23 @@ dependencies = [ [[package]] name = "alloy-eip7928" -version = "0.3.5" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec6ae911a2fc304a7cb80a79fb7bed6d1474aed4e7c203df1f8ff538f64fc78d" +checksum = "b3b12337f74cbfa451cb04dac173974814a6ff463079e1793aa09600ba8813ab" dependencies = [ "alloy-primitives", "alloy-rlp", "borsh", "once_cell", "serde", + "thiserror", ] [[package]] name = "alloy-eips" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c0456f5f7a4497e9342d20f528e30f5288ddfa0d6a012bd5044afee46cd8a0" +checksum = "154b0f566ebbfc256b63c8d643c6a299f40a6fcd50a9d756c1d191487dd06483" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -245,9 +246,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a71ff8b55d2b8aa05259f474cae7dea0e4991724dc18936b81cb23ec492a0c2a" +checksum = "a0a930a68a6f0ac19231bc2f5f0bf13fad3a26fa7df2525354890c72366c2998" dependencies = [ "alloy-eips", "alloy-primitives", @@ -260,9 +261,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dbe713da0c737d9e5e387b0ba790eb98b14dd207fe53eef50e19a5a8ec3dac" +checksum = "7c36c9d7f9021601b04bfef14a4b64849f6d73116a4e91e071d7fbfe10247901" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -272,9 +273,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e352478b756bad5d7203148e4b461861282ea2ded3da406ba24868b52cd098" +checksum = "2e92108767c8c95b5e521570e039e374e65198c4179a98d200412c083d6c26d5" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -287,9 +288,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed08ae169869e08370ed121612e0d3dadac33d1a256e9f2465926b23f0bd7d95" +checksum = "c4546c9fae2861d4159ee3b25c44ab3edb90f21b849e86cf2086cacb1d56d8ac" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -313,9 +314,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e6c7ad28afe348a9a9c5624b67ee5b3607b8de98d5816b3056ecdfa6fa2697" +checksum = "ca2c325d5934445209c8d22fc67d27e2cf9fb79054b8154d9e522d6a4ee3a4f7" dependencies = [ "alloy-consensus", "alloy-eips", @@ -326,9 +327,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3b431b4e72cd8bd0ec7a50b4be18e73dab74de0dba180eef171055e5d5926e" +checksum = "4885c1409b6936c4898e646ef58baf6ec54edaf6d8179f79df805a7b85b7cf3e" dependencies = [ "alloy-rlp", "bytes", @@ -336,7 +337,7 @@ dependencies = [ "const-hex", "derive_more", "foldhash 0.2.0", - "hashbrown 0.16.1", + "hashbrown 0.17.0", "indexmap 2.14.0", "itoa", "k256", @@ -347,15 +348,16 @@ dependencies = [ "rapidhash", "ruint", "rustc-hash", + "secp256k1 0.31.1", "serde", - "sha3 0.10.9", + "sha3", ] [[package]] name = "alloy-provider" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93a7c17472b55482d4734154c2f5ed13f72e03f6752cebb927f6a2d8b52e646c" +checksum = "ff4536d25780fcf51a338c26153c526c99649be1273600684ef10b397a207d4a" dependencies = [ "alloy-chains", "alloy-consensus", @@ -414,9 +416,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5beb5c2fe6b960c8e8b038e69fd502a90a2e930afa4770efb748b163b0767729" +checksum = "7f8d765656f02f993fa0565abeb3554ccd6a0d72ea44ce0558b983136639bd6b" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -437,9 +439,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee1257a278f6d293e05c5162c5940a1561b1aa85ded0028b464c81de37ebfa5" +checksum = "2a05ef5b11fad72068e6f011c21445bc5b596ac850644c4a14c30d845ce56de8" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -449,9 +451,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a234bfbdf7a76c3d13808f729af5321852de3dedcaa6fc6d5f54787aaf54c6a" +checksum = "b06bfe79149dd53de5b196aa3c96db0500b7cf0ed72dbd1a31bac7660bc7cc65" dependencies = [ "alloy-consensus-any", "alloy-network-primitives", @@ -464,9 +466,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a282daf869eeb7383d3d5c2deb35b0b3fb45ecb329513af4090fc61245ee18" +checksum = "b41d1a11f58b456c199e04591befc64cb236fa2574a7275a07b98b173727bd39" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -485,9 +487,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0eada2558e921b39dfcead33c487364df9b31374f5733c1c9d2c891c4529933" +checksum = "bcf028ac8bcb161ad7c104243e710cece8e1a794f65ee6c35c4c4d693c8e80ee" dependencies = [ "alloy-primitives", "serde", @@ -496,9 +498,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41eb29f7a8adcd8941fbb8e134022a133e6f8dfd345f2e3b7109599f8a7dca08" +checksum = "1a5f392f2f56b2417ea6b74e1e116c6f35df5ab5fce4dc422e277d72ee18ff7b" dependencies = [ "alloy-primitives", "async-trait", @@ -511,9 +513,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef839e7ce9b59aa60fa9a175e97986c6145c888d643b0f1fb0a3e7b8e56a2e2" +checksum = "78de3d4ed62e2c90e16be166d0ddfe41944bb5979752703199073acf976083f2" dependencies = [ "alloy-consensus", "alloy-network", @@ -527,9 +529,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab81bab693da9bb79f7a95b64b394718259fdd7e41dceeced4cad57cb71c4f6a" +checksum = "840128ed2b2971d6d4668a553fe403a82683d3acc646c73e75887e7157408033" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -541,9 +543,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489f1620bb7e2483fb5819ed01ab6edc1d2f93939dce35a5695085a1afd1d699" +checksum = "63ec265e5d65d725175f6ca7711c970824c90ef9c0d1f1973711d4150ee612dd" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", @@ -553,16 +555,16 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "sha3 0.10.9", + "sha3", "syn 2.0.117", "syn-solidity", ] [[package]] name = "alloy-sol-macro-input" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56cef806ad22d4392c5fc83cf8f2089f988eb99c7067b4e0c6f1971fc1cca318" +checksum = "89bf01077f18650876cfa682eb1f949967b5cde03f1a51c955c469d2c9b4aa67" dependencies = [ "alloy-json-abi", "const-hex", @@ -578,19 +580,19 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6df77fea9d6a2a75c0ef8d2acbdfd92286cc599983d3175ccdc170d3433d249" +checksum = "857b470ecdd2ed38beaf82ad1a38c516a8ff75266750f38b9eeed001d575241b" dependencies = [ "serde", - "winnow 0.7.15", + "winnow 1.0.2", ] [[package]] name = "alloy-sol-types" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64612d29379782a5dde6f4b6570d9c756d734d760c0c94c254d361e678a6591f" +checksum = "384cf252de0db2dec52821eac037a7f57e2aa33fe5b900ce6fe39973402341f1" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -600,9 +602,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac7a80c0bac3e44559d53d002e34c461dc2f23262b42cafec019bc70551abbe" +checksum = "39f42ee1ef30d4d3d8b4ea5794937fccfc69e2bb1cd5bcf42d62afc57b049081" dependencies = [ "alloy-json-rpc", "auto_impl", @@ -623,9 +625,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed3ed3300a998f88639ed619fdbbd88bd82865e00c6a8ecb796c99eb12358f6" +checksum = "ee68bc7d713e033eeaaecb8fd13d5d8a41af97226c4388930ad459285b8e9f70" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -655,9 +657,9 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0350197dcd4ba4e9a7dd43915d908c0eb0e7352755791709a705e1c76b6" +checksum = "dc2cd27809c88c413e5542dbd5a8eff8c12f0086af920e881ae586d3a787d5e5" dependencies = [ "darling 0.23.0", "proc-macro2", @@ -676,9 +678,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" [[package]] name = "arbiter-client" @@ -1225,7 +1227,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" dependencies = [ - "bit-vec", + "bit-vec 0.8.0", ] [[package]] @@ -1234,6 +1236,15 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" +[[package]] +name = "bit-vec" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51" +dependencies = [ + "serde", +] + [[package]] name = "bitcoin-io" version = "0.1.4" @@ -1434,9 +1445,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.44" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" +checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" dependencies = [ "iana-time-zone", "js-sys", @@ -1635,6 +1646,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710" dependencies = [ + "getrandom 0.4.2", "hybrid-array", "rand_core 0.10.1", ] @@ -1859,9 +1871,9 @@ dependencies = [ [[package]] name = "diesel" -version = "2.3.9" +version = "2.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9940fb8467a0a06312218ed384185cb8536aa10d8ec017d0ce7fad2c1bd882d5" +checksum = "29fe29a87fb84c631ffb3ba21798c4b1f3a964701ba78f0dce4bf8668562ec88" dependencies = [ "chrono", "diesel_derives", @@ -1875,9 +1887,9 @@ dependencies = [ [[package]] name = "diesel-async" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c20ddcc6737cecdaef3dfecb2796bdfe3002456521189d30be8e4c5a1bc821d" +checksum = "dd39af30158d444884f166fe4c58f35dc40ad71ad017bb59408a3448526ff4bd" dependencies = [ "bb8", "diesel", @@ -2436,8 +2448,6 @@ dependencies = [ "allocator-api2", "equivalent", "foldhash 0.2.0", - "serde", - "serde_core", ] [[package]] @@ -2445,6 +2455,11 @@ name = "hashbrown" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" +dependencies = [ + "foldhash 0.2.0", + "serde", + "serde_core", +] [[package]] name = "heck" @@ -2493,9 +2508,9 @@ dependencies = [ [[package]] name = "http" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" dependencies = [ "bytes", "itoa", @@ -2990,15 +3005,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "keccak" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" -dependencies = [ - "cpufeatures 0.2.17", -] - [[package]] name = "keccak" version = "0.2.0" @@ -3122,9 +3128,9 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "macro-string" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" +checksum = "59a9dbbfc75d2688ed057456ce8a3ee3f48d12eec09229f560f3643b9f275653" dependencies = [ "proc-macro2", "quote", @@ -3249,18 +3255,18 @@ dependencies = [ [[package]] name = "ml-dsa" -version = "0.1.0-rc.9" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a596bd65985e2b343c3fd6cc4ade15cdd76da66b15936cfbce72ea661cdbb2" +checksum = "add6b9d92e496f16f4526d68ff29da1483aba4b119baeab8bed3b9e3544a6f3d" dependencies = [ "const-oid 0.10.2", + "crypto-common 0.2.1", "ctutils", "hybrid-array", "module-lattice", "pkcs8 0.11.0", - "rand_core 0.10.1", - "sha3 0.11.0", - "signature 3.0.0-rc.10", + "shake", + "signature 3.0.0", "zeroize", ] @@ -3274,15 +3280,15 @@ dependencies = [ "kem", "module-lattice", "rand_core 0.10.1", - "sha3 0.11.0", + "sha3", "zeroize", ] [[package]] name = "module-lattice" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc7c90d33a0dac244570c26461d761ffaeadb3bfc2b17cc625ae2185cafdffae" +checksum = "0c61b87c9683ab7cb1c6871d261ad5479b6b10ceb52c4352aaca3b5d35a8febe" dependencies = [ "ctutils", "hybrid-array", @@ -3739,7 +3745,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744" dependencies = [ "bit-set", - "bit-vec", + "bit-vec 0.8.0", "bitflags", "num-traits", "rand 0.9.4", @@ -3753,9 +3759,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568" +checksum = "528ac67416ff8646872a3c02cad9cc4ee5dc9f9540c9b10771855c95cb2e5ae1" dependencies = [ "bytes", "prost-derive", @@ -3784,9 +3790,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" +checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf" dependencies = [ "anyhow", "itertools 0.14.0", @@ -3797,9 +3803,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8991c4cbdb8bc5b11f0b074ffe286c30e523de90fee5ba8132f1399f23cb3dd7" +checksum = "f94967dc7688f3054c7fac87473ffae4cc4c3904800e2d9f5b857246d8963b0a" dependencies = [ "chrono", "prost", @@ -4013,9 +4019,9 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.14.7" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10b99e0098aa4082912d4c649628623db6aba77335e4f4569ff5083a6448b32e" +checksum = "57f6d249aad744e274e682777a50283a225a32705394ee6d5fcc01efa25e4055" dependencies = [ "aws-lc-rs", "pem", @@ -4306,9 +4312,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.40" +version = "0.23.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f" dependencies = [ "aws-lc-rs", "log", @@ -4469,10 +4475,21 @@ checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ "bitcoin_hashes", "rand 0.8.6", - "secp256k1-sys", + "secp256k1-sys 0.10.1", "serde", ] +[[package]] +name = "secp256k1" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2" +dependencies = [ + "bitcoin_hashes", + "rand 0.9.4", + "secp256k1-sys 0.11.0", +] + [[package]] name = "secp256k1-sys" version = "0.10.1" @@ -4482,6 +4499,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "3.7.0" @@ -4644,16 +4670,6 @@ dependencies = [ "digest 0.11.2", ] -[[package]] -name = "sha3" -version = "0.10.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77fd7028345d415a4034cf8777cd4f8ab1851274233b45f84e3d955502d93874" -dependencies = [ - "digest 0.10.7", - "keccak 0.1.6", -] - [[package]] name = "sha3" version = "0.11.0" @@ -4661,7 +4677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be176f1a57ce4e3d31c1a166222d9768de5954f811601fb7ca06fc8203905ce1" dependencies = [ "digest 0.11.2", - "keccak 0.2.0", + "keccak", ] [[package]] @@ -4674,6 +4690,17 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "shake" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09057cb2149ad4cbd2da1e26b351f9a4c354219421229c69c3063e6f61947c4a" +dependencies = [ + "digest 0.11.2", + "keccak", + "sponge-cursor", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -4711,9 +4738,9 @@ dependencies = [ [[package]] name = "signature" -version = "3.0.0-rc.10" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f1880df446116126965eeec169136b2e0251dba37c6223bcc819569550edea3" +checksum = "28d567dcbaf0049cb8ac2608a76cd95ff9e4412e1899d389ee400918ca7537f5" dependencies = [ "digest 0.11.2", "rand_core 0.10.1", @@ -4807,6 +4834,12 @@ dependencies = [ "der 0.8.0", ] +[[package]] +name = "sponge-cursor" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a0219bd7d979d58245a4f41f695e1ac9f8befdffadd7f61f1bae9e39abc6620" + [[package]] name = "sqlite-wasm-rs" version = "0.5.3" @@ -4936,9 +4969,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53f425ae0b12e2f5ae65542e00898d500d4d318b4baf09f40fd0d410454e9947" +checksum = "ec005042c7d952febc1a3ef5b0f6674e9054aa836877a31c90b20e25b3d31744" dependencies = [ "paste", "proc-macro2", @@ -5132,9 +5165,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.1" +version = "1.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" dependencies = [ "bytes", "libc", @@ -5248,9 +5281,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec7c61a0695dc1887c1b53952990f3ad2e3a31453e1f49f10e75424943a93ec" +checksum = "ac2a5518c70fa84342385732db33fb3f44bc4cc748936eb5833d2df34d6445ef" dependencies = [ "async-trait", "axum", @@ -5280,9 +5313,9 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1882ac3bf5ef12877d7ed57aad87e75154c11931c2ba7e6cde5e22d63522c734" +checksum = "c68f61875ac5293cf72e6c8cf0158086428c82c37229e98c840878f1706b0322" dependencies = [ "prettyplease", "proc-macro2", @@ -5292,9 +5325,9 @@ dependencies = [ [[package]] name = "tonic-prost" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55376a0bbaa4975a3f10d009ad763d8f4108f067c7c2e74f3001fb49778d309" +checksum = "50849f68853be452acf590cde0b146665b8d507b3b8af17261df47e02c209ea0" dependencies = [ "bytes", "prost", @@ -5303,9 +5336,9 @@ dependencies = [ [[package]] name = "tonic-prost-build" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3144df636917574672e93d0f56d7edec49f90305749c668df5101751bb8f95a" +checksum = "654e5643eff75d7f8c99197ce1440ed19a3474eada74c12bbac488b2cafdae27" dependencies = [ "prettyplease", "proc-macro2", @@ -6009,9 +6042,6 @@ name = "winnow" version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" -dependencies = [ - "memchr", -] [[package]] name = "winnow" @@ -6140,7 +6170,7 @@ dependencies = [ "kem", "ml-kem", "rand_core 0.10.1", - "sha3 0.11.0", + "sha3", "x25519-dalek 3.0.0-pre.6", "zeroize", ] @@ -6188,10 +6218,11 @@ dependencies = [ [[package]] name = "yasna" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +checksum = "b5f6765e852b9b4dc8e2a76843e4d64d1cea8e79bcde0b6901aea8e7c7f08282" dependencies = [ + "bit-vec 0.9.1", "time", ] diff --git a/server/Cargo.toml b/server/Cargo.toml index cd588a8..2274221 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -6,31 +6,31 @@ resolver = "3" [workspace.dependencies] -alloy = "2.0.4" +alloy = "2.1.0" async-trait = "0.1.89" base64 = "0.22.1" -chrono = { version = "0.4.44", features = ["serde"] } +chrono = { version = "0.4.45", features = ["serde"] } futures = "0.3.32" k256 = { version = "0.13.4", features = ["ecdsa", "pkcs8"] } kameo = {git = "https://github.com/hdbg/kameo.git", rev = "805b417"} kameo_actors = {git = "https://github.com/hdbg/kameo.git", rev = "805b417"} hmac = "0.13.0" miette = { version = "7.6.0", features = ["fancy", "serde"] } -ml-dsa = { version = "0.1.0-rc.9", features = ["zeroize"] } +ml-dsa = { version = "0.1.1", features = ["zeroize"] } mutants = "0.0.4" -prost = "0.14.3" -prost-types = { version = "0.14.3", features = ["chrono"] } +prost = "0.14.4" +prost-types = { version = "0.14.4", features = ["chrono"] } rand = "0.10.1" -rcgen = { version = "0.14.7", features = [ "aws_lc_rs", "pem", "x509-parser", "zeroize" ], default-features = false } +rcgen = { version = "0.14.8", features = [ "aws_lc_rs", "pem", "x509-parser", "zeroize" ], default-features = false } rstest = "0.26.1" -rustls = { version = "0.23.40", features = ["aws-lc-rs", "logging", "prefer-post-quantum", "std"], default-features = false } +rustls = { version = "0.23.41", features = ["aws-lc-rs", "logging", "prefer-post-quantum", "std"], default-features = false } rustls-pki-types = "1.14.1" sha2 = "0.11" smlang = "0.8.0" thiserror = "2.0.18" -tokio = { version = "1.52.1", features = ["full"] } +tokio = { version = "1.52.3", features = ["full"] } tokio-stream = { version = "0.1.18", features = ["full"] } -tonic = { version = "0.14.5", features = [ "deflate", "gzip", "tls-connect-info", "zstd" ] } +tonic = { version = "0.14.6", features = [ "deflate", "gzip", "tls-connect-info", "zstd" ] } tracing = "0.1.44" x25519-dalek = { version = "2.0.1", features = ["getrandom"] } diff --git a/server/crates/arbiter-client/Cargo.toml b/server/crates/arbiter-client/Cargo.toml index 9b0e229..e1ad8a0 100644 --- a/server/crates/arbiter-client/Cargo.toml +++ b/server/crates/arbiter-client/Cargo.toml @@ -20,7 +20,7 @@ tonic.features = ["tls-aws-lc"] tokio.workspace = true tokio-stream.workspace = true thiserror.workspace = true -http = "1.4.0" +http = "1.4.2" rustls-webpki = { version = "0.103.13", features = ["aws-lc-rs"] } async-trait.workspace = true chrono.workspace = true diff --git a/server/crates/arbiter-crypto/src/authn/v1.rs b/server/crates/arbiter-crypto/src/authn/v1.rs index 6f38e44..350b078 100644 --- a/server/crates/arbiter-crypto/src/authn/v1.rs +++ b/server/crates/arbiter-crypto/src/authn/v1.rs @@ -1,8 +1,8 @@ use chrono::{DateTime, Utc}; use hmac::digest::Digest; use ml_dsa::{ - EncodedVerifyingKey, Error, KeyGen, MlDsa87, Seed, Signature as MlDsaSignature, - SigningKey as MlDsaSigningKey, VerifyingKey as MlDsaVerifyingKey, signature::Keypair as _, + EncodedVerifyingKey, Error, ExpandedSigningKey, Generate, MlDsa87, Seed, + Signature as MlDsaSignature, SigningKey as MlDsaSigningKey, VerifyingKey as MlDsaVerifyingKey, }; use rand::RngExt; @@ -77,7 +77,10 @@ impl crate::hashing::Hashable for PublicKey { pub struct Signature(Box>); #[derive(Debug)] -pub struct SigningKey(Box>); +pub struct SigningKey { + key: Box>, + seed: Seed, +} impl PublicKey { pub fn to_bytes(&self) -> Vec { @@ -100,24 +103,31 @@ impl Signature { impl SigningKey { pub fn generate() -> Self { - Self(Box::new(KeyParams::key_gen(&mut rand::rng()))) + let seed = MlDsaSigningKey::::generate_from_rng(&mut rand::rng()).to_seed(); + Self { + key: Box::new(ExpandedSigningKey::from_seed(&seed)), + seed, + } } pub fn from_seed(seed: [u8; 32]) -> Self { - Self(Box::new(KeyParams::from_seed(&Seed::from(seed)))) + let seed = Seed::from(seed); + Self { + key: Box::new(ExpandedSigningKey::from_seed(&seed)), + seed, + } } pub fn to_seed(&self) -> [u8; 32] { - self.0.to_seed().into() + self.seed.into() } pub fn public_key(&self) -> PublicKey { - self.0.verifying_key().into() + self.key.verifying_key().into() } pub fn sign_message(&self, message: &[u8], context: &[u8]) -> Result { - self.0 - .signing_key() + self.key .sign_deterministic(message, context) .map(Into::into) } @@ -145,12 +155,6 @@ impl From> for Signature { } } -impl From> for SigningKey { - fn from(value: MlDsaSigningKey) -> Self { - Self(Box::new(value)) - } -} - impl TryFrom> for PublicKey { type Error = (); @@ -188,15 +192,15 @@ impl TryFrom<&'_ [u8]> for Signature { #[cfg(test)] mod tests { - use ml_dsa::{KeyGen, MlDsa87, signature::Keypair as _}; + use ml_dsa::{Generate as _, MlDsa87, SigningKey as RealSigningKey, signature::Keypair as _}; use crate::authn::AuthChallenge; - use super::{CLIENT_CONTEXT, PublicKey, Signature, SigningKey, OPERATOR_CONTEXT}; + use super::{CLIENT_CONTEXT, OPERATOR_CONTEXT, PublicKey, Signature, SigningKey}; #[test] fn public_key_round_trip_decodes() { - let key = MlDsa87::key_gen(&mut rand::rng()); + let key = RealSigningKey::::generate(); let encoded = PublicKey::from(key.verifying_key()).to_bytes(); let decoded = PublicKey::try_from(encoded.as_slice()).expect("public key should decode"); diff --git a/server/crates/arbiter-proto/Cargo.toml b/server/crates/arbiter-proto/Cargo.toml index b8667be..2ddb958 100644 --- a/server/crates/arbiter-proto/Cargo.toml +++ b/server/crates/arbiter-proto/Cargo.toml @@ -9,7 +9,7 @@ license = "Apache-2.0" tonic.workspace = true tokio.workspace = true futures.workspace = true -tonic-prost = "0.14.5" +tonic-prost = "0.14.6" prost.workspace = true kameo.workspace = true url = "2.5.8" @@ -22,7 +22,7 @@ async-trait.workspace = true tokio-stream.workspace = true [build-dependencies] -tonic-prost-build = "0.14.5" +tonic-prost-build = "0.14.6" [dev-dependencies] rstest.workspace = true diff --git a/server/crates/arbiter-server/Cargo.toml b/server/crates/arbiter-server/Cargo.toml index 7790bd6..be93d34 100644 --- a/server/crates/arbiter-server/Cargo.toml +++ b/server/crates/arbiter-server/Cargo.toml @@ -9,8 +9,8 @@ license = "Apache-2.0" workspace = true [dependencies] -diesel = { version = "2.3.9", features = ["chrono", "returning_clauses_for_sqlite_3_35", "serde_json", "time", "uuid"] } -diesel-async = { version = "0.9.0", features = [ +diesel = { version = "2.3.10", features = ["chrono", "returning_clauses_for_sqlite_3_35", "serde_json", "time", "uuid"] } +diesel-async = { version = "0.9.2", features = [ "bb8", "migrations", "sqlite", @@ -44,7 +44,7 @@ hmac.workspace = true alloy.workspace = true prost-types.workspace = true arbiter-tokens-registry.path = "../arbiter-tokens-registry" -anyhow = "1.0.102" +anyhow = "1.0.103" mutants.workspace = true subtle = "2.6.1" x25519-dalek.workspace = true diff --git a/server/crates/arbiter-server/tests/client/auth.rs b/server/crates/arbiter-server/tests/client/auth.rs index 90763a8..9108c72 100644 --- a/server/crates/arbiter-server/tests/client/auth.rs +++ b/server/crates/arbiter-server/tests/client/auth.rs @@ -16,7 +16,7 @@ use arbiter_server::{ use diesel::{ExpressionMethods as _, NullableExpressionMethods as _, QueryDsl as _, insert_into}; use diesel_async::RunQueryDsl; -use ml_dsa::{KeyGen, MlDsa87, SigningKey, VerifyingKey, signature::Keypair}; +use ml_dsa::{Generate as _, MlDsa87, SigningKey, VerifyingKey, signature::Keypair}; fn metadata(name: &str, description: Option<&str>, version: Option<&str>) -> ClientMetadata { ClientMetadata { @@ -73,7 +73,7 @@ async fn insert_registered_client( fn sign_client_challenge(key: &SigningKey, challenge: &AuthChallenge) -> authn::Signature { let challenge = challenge.format(); - key.signing_key() + key.expanded_key() .sign_deterministic(&challenge, CLIENT_CONTEXT) .unwrap() .into() @@ -81,7 +81,7 @@ fn sign_client_challenge(key: &SigningKey, challenge: &AuthChallenge) - async fn insert_bootstrap_sentinel_operator(db: &db::DatabasePool) { let mut conn = db.get().await.unwrap(); - let sentinel_key = verifying_key(&MlDsa87::key_gen(&mut rand::rng())) + let sentinel_key = verifying_key(&SigningKey::::generate()) .encode() .0 .to_vec(); @@ -120,7 +120,7 @@ pub async fn unregistered_pubkey_rejected() { connect_client(props, &mut server_transport).await; }); - let new_key = MlDsa87::key_gen(&mut rand::rng()); + let new_key = SigningKey::::generate(); test_transport .send(auth::Inbound::AuthChallengeRequest { @@ -140,7 +140,7 @@ pub async fn challenge_auth() { let db = db::create_test_pool().await; let actors = spawn_test_actors(&db).await; - let new_key = MlDsa87::key_gen(&mut rand::rng()); + let new_key = SigningKey::::generate(); Box::pin(insert_registered_client( &db, @@ -206,7 +206,7 @@ pub async fn challenge_auth() { pub async fn metadata_unchanged_does_not_append_history() { let db = db::create_test_pool().await; let actors = spawn_test_actors(&db).await; - let new_key = MlDsa87::key_gen(&mut rand::rng()); + let new_key = SigningKey::::generate(); let requested = metadata("client", Some("desc"), Some("1.0.0")); Box::pin(insert_registered_client( @@ -269,7 +269,7 @@ pub async fn metadata_unchanged_does_not_append_history() { pub async fn metadata_change_appends_history_and_repoints_binding() { let db = db::create_test_pool().await; let actors = spawn_test_actors(&db).await; - let new_key = MlDsa87::key_gen(&mut rand::rng()); + let new_key = SigningKey::::generate(); Box::pin(insert_registered_client( &db, @@ -357,7 +357,7 @@ pub async fn challenge_auth_rejects_integrity_tag_mismatch() { let db = db::create_test_pool().await; let actors = spawn_test_actors(&db).await; - let new_key = MlDsa87::key_gen(&mut rand::rng()); + let new_key = SigningKey::::generate(); let requested = metadata("client", Some("desc"), Some("1.0.0")); { diff --git a/server/crates/arbiter-server/tests/operator/auth.rs b/server/crates/arbiter-server/tests/operator/auth.rs index cc1f8f3..dadb32e 100644 --- a/server/crates/arbiter-server/tests/operator/auth.rs +++ b/server/crates/arbiter-server/tests/operator/auth.rs @@ -14,7 +14,7 @@ use arbiter_server::{ use async_trait::async_trait; use diesel::{ExpressionMethods as _, QueryDsl, insert_into}; use diesel_async::RunQueryDsl; -use ml_dsa::{KeyGen, MlDsa87, SigningKey, VerifyingKey, signature::Keypair}; +use ml_dsa::{Generate as _, MlDsa87, SigningKey, VerifyingKey, signature::Keypair}; use tokio::sync::mpsc; fn verifying_key(key: &SigningKey) -> VerifyingKey { @@ -26,7 +26,7 @@ fn sign_operator_challenge( challenge: &AuthChallenge, ) -> authn::Signature { let challenge = challenge.format(); - key.signing_key() + key.expanded_key() .sign_deterministic(&challenge, OPERATOR_CONTEXT) .unwrap() .into() @@ -170,7 +170,7 @@ pub async fn bootstrap_token_auth() { auth::authenticate(&mut props, &mut server_transport).await }); - let new_key = MlDsa87::key_gen(&mut rand::rng()); + let new_key = SigningKey::::generate(); test_transport .send(auth::Inbound::AuthChallengeRequest { pubkey: verifying_key(&new_key).into(), @@ -227,7 +227,7 @@ pub async fn bootstrap_invalid_token_auth() { auth::authenticate(&mut props, &mut server_transport).await }); - let new_key = MlDsa87::key_gen(&mut rand::rng()); + let new_key = SigningKey::::generate(); test_transport .send(auth::Inbound::AuthChallengeRequest { pubkey: verifying_key(&new_key).into(), @@ -280,7 +280,7 @@ pub async fn challenge_auth() { .await .unwrap(); - let new_key = MlDsa87::key_gen(&mut rand::rng()); + let new_key = SigningKey::::generate(); let pubkey_bytes = authn::PublicKey::from(verifying_key(&new_key)).to_bytes(); { @@ -366,7 +366,7 @@ pub async fn challenge_auth_rejects_integrity_tag_mismatch_when_unsealed() { .await .unwrap(); - let new_key = MlDsa87::key_gen(&mut rand::rng()); + let new_key = SigningKey::::generate(); let pubkey_bytes = authn::PublicKey::from(verifying_key(&new_key)).to_bytes(); { @@ -439,7 +439,7 @@ pub async fn challenge_auth_rejects_invalid_signature() { .await .unwrap(); - let new_key = MlDsa87::key_gen(&mut rand::rng()); + let new_key = SigningKey::::generate(); let pubkey_bytes = authn::PublicKey::from(verifying_key(&new_key)).to_bytes(); {