diff --git a/joule-code/joule-code-rs/Cargo.lock b/joule-code/joule-code-rs/Cargo.lock index 0d9139c18..1874397e1 100644 --- a/joule-code/joule-code-rs/Cargo.lock +++ b/joule-code/joule-code-rs/Cargo.lock @@ -73,7 +73,7 @@ dependencies = [ "nom 7.1.3", "num-traits", "rusticata-macros", - "thiserror 2.0.20", + "thiserror", "time", ] @@ -431,7 +431,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1" dependencies = [ - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -926,7 +926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -1013,7 +1013,7 @@ dependencies = [ "rand_core 0.6.4", "serde", "serdect", - "thiserror 2.0.20", + "thiserror", "visibility", "zeroize", ] @@ -1335,45 +1335,23 @@ dependencies = [ "digest 0.11.3", ] -[[package]] -name = "hpke-rs" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11bd4ee27b79fa1820e72ef8489cc729c87299ec3f7f52b8fc8dcb87cb2d485" -dependencies = [ - "hpke-rs-crypto 0.2.0", - "log", - "serde", - "tls_codec 0.4.2", - "zeroize", -] - [[package]] name = "hpke-rs" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812de62ab573b876c6c40d7553bae9402ae3bad95b64af06f964388eecb9b7b1" dependencies = [ - "hpke-rs-crypto 0.7.0", + "hpke-rs-crypto", "hpke-rs-libcrux", - "hpke-rs-rust-crypto 0.7.0", + "hpke-rs-rust-crypto", "libcrux-sha3", "log", "serde", "subtle", - "tls_codec 0.5.0", + "tls_codec", "zeroize", ] -[[package]] -name = "hpke-rs-crypto" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c3f1ae0a26c18d6469a70db1217136056261c4a244b09a755bc60bd4e055b67" -dependencies = [ - "rand_core 0.6.4", -] - [[package]] name = "hpke-rs-crypto" version = "0.7.0" @@ -1390,7 +1368,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c1ace95ef11fbbd84527eada5fc1304f66720fc4c008db30d888d62d3c52613" dependencies = [ - "hpke-rs-crypto 0.7.0", + "hpke-rs-crypto", "libcrux-aead", "libcrux-ecdh", "libcrux-hkdf", @@ -1402,24 +1380,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "hpke-rs-rust-crypto" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08d4500baf0aced746723d3515d08212bdb9d941df6d1aca3d46d1619b2a1cf" -dependencies = [ - "aes-gcm", - "chacha20poly1305", - "hkdf 0.12.4", - "hpke-rs-crypto 0.2.0", - "p256", - "p384", - "rand_chacha 0.3.1", - "rand_core 0.6.4", - "sha2 0.10.9", - "x25519-dalek 2.0.1", -] - [[package]] name = "hpke-rs-rust-crypto" version = "0.7.0" @@ -1429,7 +1389,7 @@ dependencies = [ "aes-gcm", "chacha20poly1305", "hkdf 0.13.0", - "hpke-rs-crypto 0.7.0", + "hpke-rs-crypto", "k256", "ml-kem", "p256", @@ -1731,7 +1691,7 @@ dependencies = [ "ed25519-dalek", "jcp-schema", "serde", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -1744,7 +1704,7 @@ dependencies = [ "jcp-schema", "serde", "serde_json", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -1766,7 +1726,7 @@ dependencies = [ "hex", "serde", "serde_json", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -1781,7 +1741,7 @@ dependencies = [ "jni-sys", "log", "simd_cesu8", - "thiserror 2.0.20", + "thiserror", "walkdir", "windows-link", ] @@ -1835,7 +1795,7 @@ dependencies = [ "ed25519-dalek", "joule-code-schema", "serde", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -1855,11 +1815,11 @@ dependencies = [ "frost-ed25519", "joule-code-cargo", "joule-code-schema", - "openmls 0.6.0", + "openmls", "openmls_basic_credential", - "openmls_rust_crypto 0.3.0", + "openmls_rust_crypto", "rand 0.8.8", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -1916,7 +1876,7 @@ dependencies = [ "joule-code-schema", "joulecontract-receipt", "joulecontract-schema", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -1928,7 +1888,7 @@ dependencies = [ "joule-code-schema", "serde", "serde_json", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -1947,7 +1907,7 @@ dependencies = [ "proof-schema", "proof-solvers", "serde", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -1970,7 +1930,7 @@ dependencies = [ "sandbox-schema", "serde", "serde_json", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -1981,7 +1941,7 @@ dependencies = [ "joule-code-cargo", "joule-code-schema", "serde", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -1996,7 +1956,7 @@ dependencies = [ "joule-code-spec", "serde", "serde_json", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -2007,7 +1967,7 @@ dependencies = [ "blake3", "ciborium", "serde", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -2018,7 +1978,7 @@ dependencies = [ "joule-code-cargo", "joule-code-schema", "serde", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -2044,7 +2004,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.9", - "thiserror 2.0.20", + "thiserror", "tokio", "tracing", "uuid", @@ -2072,7 +2032,7 @@ dependencies = [ "serde_json", "sha2 0.10.9", "str0m", - "thiserror 2.0.20", + "thiserror", "tokio", "toml", "tracing", @@ -2109,13 +2069,13 @@ dependencies = [ "getrandom 0.2.17", "hex", "joule-moq", - "openmls 0.9.1", - "openmls_rust_crypto 0.6.0", - "openmls_traits 0.6.0", + "openmls", + "openmls_rust_crypto", + "openmls_traits", "serde", "serde_json", "sha2 0.10.9", - "tls_codec 0.5.0", + "tls_codec", ] [[package]] @@ -2136,7 +2096,7 @@ dependencies = [ "rustls", "serde", "serde_json", - "thiserror 2.0.20", + "thiserror", "tokio", "tokio-tungstenite", "toml", @@ -2163,7 +2123,7 @@ version = "0.6.0" dependencies = [ "joulecontract-schema", "serde", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -2174,7 +2134,7 @@ dependencies = [ "proof-cascade", "proof-schema", "serde", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -2186,7 +2146,7 @@ dependencies = [ "joulecontract-seal", "serde", "serde_json", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -2197,7 +2157,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.9", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -2209,7 +2169,7 @@ dependencies = [ "rand 0.8.8", "serde", "serde_json", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -2223,7 +2183,7 @@ dependencies = [ "joulecontract-schema", "serde", "serde_json", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -2249,7 +2209,7 @@ dependencies = [ "quinn", "serde", "serde_json", - "thiserror 2.0.20", + "thiserror", "tokio", "tokio-util", "tracing", @@ -2356,7 +2316,7 @@ dependencies = [ "libcrux-curve25519", "libcrux-p256", "rand 0.10.2", - "tls_codec 0.5.0", + "tls_codec", ] [[package]] @@ -2439,7 +2399,7 @@ dependencies = [ "libcrux-sha3", "libcrux-traits", "rand 0.10.2", - "tls_codec 0.5.0", + "tls_codec", ] [[package]] @@ -2743,20 +2703,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -[[package]] -name = "openmls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f1295188c6665fb9e96466180ac0a919ef52b5861cf7e86523823661348a597" -dependencies = [ - "log", - "openmls_traits 0.3.0", - "rayon", - "serde", - "thiserror 1.0.69", - "tls_codec 0.4.2", -] - [[package]] name = "openmls" version = "0.9.1" @@ -2766,41 +2712,31 @@ dependencies = [ "getrandom 0.4.3", "log", "openmls_serialization_helpers", - "openmls_traits 0.6.0", + "openmls_traits", "rayon", "serde", "serde_bytes", - "thiserror 2.0.20", - "tls_codec 0.5.0", + "thiserror", + "tls_codec", "web-time", "zeroize", ] [[package]] name = "openmls_basic_credential" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465874276a4e2a3e391b25a464059a224c70c5c77ca1e3f595032bb310ab8984" +checksum = "dbd3f0c3422e7c7a8496f042b547b0c28d0793f8ba97feb401966e58196a1e40" dependencies = [ "ed25519-dalek", - "openmls_traits 0.3.0", + "ml-dsa", + "openmls_traits", "p256", - "rand 0.8.8", + "p384", + "rand_core 0.6.4", "serde", - "tls_codec 0.4.2", -] - -[[package]] -name = "openmls_memory_storage" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9cc9eb04ed97262fa96382d7dbf0adfebd5ecde7dbafc7070f9231dd9cf08b" -dependencies = [ - "log", - "openmls_traits 0.3.0", - "serde", - "serde_json", - "thiserror 1.0.69", + "tls_codec", + "zeroize", ] [[package]] @@ -2810,35 +2746,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce927945a16eaa19302ed5ccef052f01ba68f2ba7ae67e4ac4ff2fc661445364" dependencies = [ "log", - "openmls_traits 0.6.0", + "openmls_traits", "serde", "serde_json", - "thiserror 2.0.20", -] - -[[package]] -name = "openmls_rust_crypto" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1038331eabb5e63f276c9f866c081167c3ec1448ece0bf2bd535d1ecb5083d39" -dependencies = [ - "aes-gcm", - "chacha20poly1305", - "ed25519-dalek", - "hkdf 0.12.4", - "hmac 0.12.1", - "hpke-rs 0.2.0", - "hpke-rs-crypto 0.2.0", - "hpke-rs-rust-crypto 0.2.0", - "openmls_memory_storage 0.3.0", - "openmls_traits 0.3.0", - "p256", - "rand 0.8.8", - "rand_chacha 0.3.1", - "serde", - "sha2 0.10.9", - "thiserror 1.0.69", - "tls_codec 0.4.2", + "thiserror", ] [[package]] @@ -2852,20 +2763,20 @@ dependencies = [ "ed25519-dalek", "hkdf 0.13.0", "hmac 0.13.0", - "hpke-rs 0.7.0", - "hpke-rs-crypto 0.7.0", - "hpke-rs-rust-crypto 0.7.0", + "hpke-rs", + "hpke-rs-crypto", + "hpke-rs-rust-crypto", "ml-dsa", - "openmls_memory_storage 0.6.0", - "openmls_traits 0.6.0", + "openmls_memory_storage", + "openmls_traits", "p256", "p384", "rand_chacha 0.3.1", "rand_core 0.10.1", "rand_core 0.6.4", "sha2 0.11.1", - "thiserror 2.0.20", - "tls_codec 0.5.0", + "thiserror", + "tls_codec", ] [[package]] @@ -2877,17 +2788,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.119", - "thiserror 2.0.20", -] - -[[package]] -name = "openmls_traits" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443afa05406adc75fbfa0c3e04db93c5647b763861a474ae1aa8a99c362b80f8" -dependencies = [ - "serde", - "tls_codec 0.4.2", + "thiserror", ] [[package]] @@ -2897,7 +2798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac13edad8698eb1917cbc1dab99591fa1594d84320904fe3fc5121854f95831c" dependencies = [ "serde", - "tls_codec 0.5.0", + "tls_codec", ] [[package]] @@ -3126,7 +3027,7 @@ dependencies = [ "hex", "serde", "serde_json", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -3151,7 +3052,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.20", + "thiserror", "tokio", "tracing", "web-time", @@ -3175,7 +3076,7 @@ dependencies = [ "rustls-pki-types", "rustls-platform-verifier", "slab", - "thiserror 2.0.20", + "thiserror", "tinyvec", "tracing", "web-time", @@ -3192,7 +3093,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3479,7 +3380,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3524,7 +3425,7 @@ dependencies = [ "libloading", "sandbox-schema", "serde", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -3535,7 +3436,7 @@ dependencies = [ "blake3", "ciborium", "serde", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -3565,7 +3466,7 @@ dependencies = [ "rand 0.9.5", "rustc-hash", "slab", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -3983,33 +3884,13 @@ dependencies = [ "syn 3.0.4", ] -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - [[package]] name = "thiserror" version = "2.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f" dependencies = [ - "thiserror-impl 2.0.20", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", + "thiserror-impl", ] [[package]] @@ -4087,17 +3968,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "tls_codec" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de2e01245e2bb89d6f05801c564fa27624dbd7b1846859876c7dad82e90bf6b" -dependencies = [ - "serde", - "tls_codec_derive 0.4.2", - "zeroize", -] - [[package]] name = "tls_codec" version = "0.5.0" @@ -4106,21 +3976,10 @@ checksum = "18cc98286004cea38f717e2b03d990fc774fbfd38a82720de40e5c94365067c8" dependencies = [ "serde", "serde_bytes", - "tls_codec_derive 0.5.0", + "tls_codec_derive", "zeroize", ] -[[package]] -name = "tls_codec_derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2e76690929402faae40aebdda620a2c0e25dd6d3b9afe48867dfd95991f4bd" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "tls_codec_derive" version = "0.5.0" @@ -4301,7 +4160,7 @@ dependencies = [ "log", "rand 0.9.5", "sha1", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -4503,7 +4362,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.61.2", ] [[package]] @@ -4684,7 +4543,7 @@ dependencies = [ "rustls-pki-types", "sha2 0.11.1", "socket2", - "thiserror 2.0.20", + "thiserror", "time", "tokio", "tracing", @@ -4701,7 +4560,7 @@ checksum = "aad9059572c7dbd6901ccef37f3b7321678cd708dcf58a64b1921dbeab7bfede" dependencies = [ "httlib-huffman", "octets", - "thiserror 2.0.20", + "thiserror", "url", ] @@ -4766,7 +4625,7 @@ dependencies = [ "oid-registry", "ring", "rusticata-macros", - "thiserror 2.0.20", + "thiserror", "time", ] diff --git a/joule-code/joule-code-rs/crates/joule-code-collab/Cargo.toml b/joule-code/joule-code-rs/crates/joule-code-collab/Cargo.toml index 4bb8f5cd4..06632410d 100644 --- a/joule-code/joule-code-rs/crates/joule-code-collab/Cargo.toml +++ b/joule-code/joule-code-rs/crates/joule-code-collab/Cargo.toml @@ -18,6 +18,6 @@ ed25519-dalek.workspace = true rand = "0.8" # MLS group keying (RFC 9420) for the collaborating set — demonstrated in # tests/mls_keying.rs. Dev-dep so the library's runtime deps stay light. -openmls = "0.6" -openmls_rust_crypto = "0.3" -openmls_basic_credential = "0.3" +openmls = "=0.9.1" +openmls_rust_crypto = "=0.6.0" +openmls_basic_credential = "=0.6.0" diff --git a/joule-code/joule-code-rs/crates/joule-code-collab/tests/mls_keying.rs b/joule-code/joule-code-rs/crates/joule-code-collab/tests/mls_keying.rs index 50a9e0be5..219a9aac4 100644 --- a/joule-code/joule-code-rs/crates/joule-code-collab/tests/mls_keying.rs +++ b/joule-code/joule-code-rs/crates/joule-code-collab/tests/mls_keying.rs @@ -45,7 +45,7 @@ fn key_package( fn export(group: &MlsGroup, provider: &OpenMlsRustCrypto) -> Vec { group - .export_secret(provider, EXPORT_LABEL, &[], 32) + .export_secret(provider.crypto(), EXPORT_LABEL, &[], 32) .expect("export secret") } diff --git a/smart-byte/smart-byte-rs/Cargo.lock b/smart-byte/smart-byte-rs/Cargo.lock index f97dc2ef5..75bc2bdf1 100644 --- a/smart-byte/smart-byte-rs/Cargo.lock +++ b/smart-byte/smart-byte-rs/Cargo.lock @@ -1564,7 +1564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -1970,9 +1970,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.14" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733" +checksum = "7d29020232d6aa3fb1daca64c1127cf662cf97f254ae16c18c05b8ab635fc118" dependencies = [ "atomic-waker", "bytes", @@ -5343,7 +5343,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -5402,7 +5402,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -5558,7 +5558,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b55fb86dfd3a2f5f76ea78310a88f96c4ea21a3031f8d212443d56123fd0521" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -6538,7 +6538,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -7260,7 +7260,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.61.2", ] [[package]]