diff --git a/apps/backend/Cargo.lock b/apps/backend/Cargo.lock index 39a5ab5..e9ec275 100644 --- a/apps/backend/Cargo.lock +++ b/apps/backend/Cargo.lock @@ -346,6 +346,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "const-oid" version = "0.10.2" @@ -426,23 +432,8 @@ dependencies = [ "cfg-if", "cpufeatures 0.2.17", "curve25519-dalek-derive", - "fiat-crypto 0.2.9", - "rustc_version", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eed333089e2e1c1ac8c6c0398e5e2497b4c9926ca6d0365ed1e099afa5bc23" -dependencies = [ - "cfg-if", - "cpufeatures 0.3.0", - "curve25519-dalek-derive", - "digest 0.11.3", - "fiat-crypto 0.3.0", + "digest 0.10.7", + "fiat-crypto", "rustc_version", "subtle", "zeroize", @@ -465,14 +456,24 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4583a4551df46e2792f82ceeac45e850d2e2d5debba0b91f102385cda5b11f06" +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid 0.9.6", + "pem-rfc7468", + "zeroize", +] + [[package]] name = "der" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a69dedd701da44b0536442edf09c81a64b0ab97a7a4a5e3d1971f00027cbc63d" dependencies = [ - "const-oid", - "pem-rfc7468", + "const-oid 0.10.2", "zeroize", ] @@ -513,7 +514,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ "block-buffer 0.12.1", - "const-oid", + "const-oid 0.10.2", "crypto-common 0.2.2", "ctutils", ] @@ -537,25 +538,24 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "ed25519" -version = "3.0.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29fcf32e6c73d1079f83ab4d782de2d81620346a5f38c6237a86a22f8368980a" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "pkcs8", - "signature", + "pkcs8 0.10.2", + "signature 2.2.0", ] [[package]] name = "ed25519-dalek" -version = "3.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ebaa1a2bf1290ab3bfe5a7b771d050ebffab2711c19a81691c683a5144a25de" +checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" dependencies = [ - "curve25519-dalek 5.0.0", + "curve25519-dalek", "ed25519", "serde", - "sha2", - "signature", + "sha2 0.10.9", "subtle", "zeroize", ] @@ -600,12 +600,6 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" -[[package]] -name = "fiat-crypto" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24" - [[package]] name = "find-msvc-tools" version = "0.1.10" @@ -1371,14 +1365,14 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "add6b9d92e496f16f4526d68ff29da1483aba4b119baeab8bed3b9e3544a6f3d" dependencies = [ - "const-oid", + "const-oid 0.10.2", "crypto-common 0.2.2", "ctutils", "hybrid-array", "module-lattice", - "pkcs8", + "pkcs8 0.11.0", "shake", - "signature", + "signature 3.0.0", ] [[package]] @@ -1420,8 +1414,8 @@ dependencies = [ [[package]] name = "mtp" -version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=f6a8b464e0daae6c7753208f3d8601d21cd47ab2#f6a8b464e0daae6c7753208f3d8601d21cd47ab2" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" dependencies = [ "mtp-client", "mtp-codec", @@ -1435,45 +1429,45 @@ dependencies = [ [[package]] name = "mtp-client" -version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=f6a8b464e0daae6c7753208f3d8601d21cd47ab2#f6a8b464e0daae6c7753208f3d8601d21cd47ab2" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" dependencies = [ "mtp-codec", "mtp-common", "mtp-crypto", "mtp-transport", - "rand", + "rand 0.10.2", "tokio", ] [[package]] name = "mtp-codec" -version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=f6a8b464e0daae6c7753208f3d8601d21cd47ab2#f6a8b464e0daae6c7753208f3d8601d21cd47ab2" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" dependencies = [ - "base64 0.23.1", + "base64 0.22.1", "byteorder", "mtp-common", "mtp-crypto", "mtp-type-map", - "rand", - "thiserror 2.0.20", + "rand 0.10.2", ] [[package]] name = "mtp-common" -version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=f6a8b464e0daae6c7753208f3d8601d21cd47ab2#f6a8b464e0daae6c7753208f3d8601d21cd47ab2" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" dependencies = [ "quinn", + "rustls", "thiserror 2.0.20", "wtransport", ] [[package]] name = "mtp-crypto" -version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=f6a8b464e0daae6c7753208f3d8601d21cd47ab2#f6a8b464e0daae6c7753208f3d8601d21cd47ab2" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" dependencies = [ "base64 0.22.1", "chacha20poly1305", @@ -1482,11 +1476,11 @@ dependencies = [ "hkdf", "ml-dsa", "mlkem-tls", - "rand", - "rand_core 0.6.4", + "rand 0.10.2", + "rand_core 0.10.1", "rustls", "serde", - "sha2", + "sha2 0.11.0", "thiserror 1.0.69", "tokio", "zeroize", @@ -1494,15 +1488,14 @@ dependencies = [ [[package]] name = "mtp-host" -version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=f6a8b464e0daae6c7753208f3d8601d21cd47ab2#f6a8b464e0daae6c7753208f3d8601d21cd47ab2" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" dependencies = [ "mtp-codec", "mtp-common", "mtp-crypto", "mtp-transport", - "rand", - "thiserror 2.0.20", + "rand 0.8.7", "tokio", "tracing", "wtransport", @@ -1510,28 +1503,26 @@ dependencies = [ [[package]] name = "mtp-transport" -version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=f6a8b464e0daae6c7753208f3d8601d21cd47ab2#f6a8b464e0daae6c7753208f3d8601d21cd47ab2" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" dependencies = [ "async-trait", "mtp-codec", "mtp-common", "mtp-crypto", - "rand", "rcgen", "rustls", "rustls-native-certs", - "sha2", + "sha2 0.11.0", "tokio", "tracing", "wtransport", - "zeroize", ] [[package]] name = "mtp-type-map" -version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=f6a8b464e0daae6c7753208f3d8601d21cd47ab2#f6a8b464e0daae6c7753208f3d8601d21cd47ab2" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" dependencies = [ "serde", "serde_yaml", @@ -1539,8 +1530,8 @@ dependencies = [ [[package]] name = "mtp-webserver" -version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=f6a8b464e0daae6c7753208f3d8601d21cd47ab2#f6a8b464e0daae6c7753208f3d8601d21cd47ab2" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" dependencies = [ "async-trait", "bytes", @@ -1557,6 +1548,7 @@ dependencies = [ "mtp-host", "mtp-transport", "quinn", + "rand 0.10.2", "rustls", "thiserror 2.0.20", "tokio", @@ -1686,9 +1678,9 @@ dependencies = [ [[package]] name = "pem-rfc7468" -version = "1.0.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6305423e0e7738146434843d1694d621cce767262b2a86910beab705e4493d9" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" dependencies = [ "base64ct", ] @@ -1705,14 +1697,24 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der 0.7.10", + "spki 0.7.3", +] + [[package]] name = "pkcs8" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451913da69c775a56034ea8d9003d27ee8948e12443eae7c038ba100a4f21cb7" dependencies = [ - "der", - "spki", + "der 0.8.1", + "spki 0.8.0", ] [[package]] @@ -1753,6 +1755,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + [[package]] name = "proc-macro2" version = "1.0.107" @@ -1794,7 +1805,7 @@ dependencies = [ "fastbloom", "getrandom 0.4.3", "lru-slab", - "rand", + "rand 0.10.2", "rand_pcg", "ring", "rustc-hash", @@ -1837,6 +1848,17 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" +[[package]] +name = "rand" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a" +dependencies = [ + "libc", + "rand_chacha", + "rand_core 0.6.4", +] + [[package]] name = "rand" version = "0.10.2" @@ -1848,6 +1870,16 @@ dependencies = [ "rand_core 0.10.1", ] +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + [[package]] name = "rand_core" version = "0.6.4" @@ -2232,6 +2264,17 @@ dependencies = [ "unsafe-libyaml", ] +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures 0.2.17", + "digest 0.10.7", +] + [[package]] name = "sha2" version = "0.11.0" @@ -2289,6 +2332,15 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core 0.6.4", +] + [[package]] name = "signature" version = "3.0.0" @@ -2343,6 +2395,16 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der 0.7.10", +] + [[package]] name = "spki" version = "0.8.0" @@ -2350,7 +2412,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f" dependencies = [ "base64ct", - "der", + "der 0.8.1", ] [[package]] @@ -3153,7 +3215,7 @@ dependencies = [ "rustls", "rustls-native-certs", "rustls-pki-types", - "sha2", + "sha2 0.11.0", "socket2", "thiserror 2.0.20", "time", @@ -3182,7 +3244,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ - "curve25519-dalek 4.1.3", + "curve25519-dalek", "rand_core 0.6.4", "serde", "zeroize", @@ -3240,6 +3302,26 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zerocopy" +version = "0.8.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556764e583adb45a9f8d413c2a147fa7e8d821e48e12b14fd560b607998b75eb" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ab42fc20575779bd240faa45f94a74256f755c0fa9e89f0ede20d91d0cdfc1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "zerofrom" version = "0.1.8" diff --git a/apps/backend/Cargo.toml b/apps/backend/Cargo.toml index 0286932..8d8270d 100644 --- a/apps/backend/Cargo.toml +++ b/apps/backend/Cargo.toml @@ -8,7 +8,7 @@ axum = "0.8" base64 = "0.23" chrono = { version = "0.4", features = ["serde"] } http = "1" -mtp = { git = "https://git.methanium.net/methanium/mtp.git", rev = "f6a8b464e0daae6c7753208f3d8601d21cd47ab2", features = ["crypto", "web-server"] } +mtp = { git = "https://git.methanium.net/methanium/mtp.git", rev = "a692bed326dbfc8eac1a05825f4a287cbab6fd3e", features = ["crypto", "web-server"] } reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] } serde = { version = "1", features = ["derive"] } serde_json = "1"