diff --git a/apps/tauri/src-tauri/Cargo.lock b/apps/tauri/src-tauri/Cargo.lock index f36c6fd..bd30bce 100644 --- a/apps/tauri/src-tauri/Cargo.lock +++ b/apps/tauri/src-tauri/Cargo.lock @@ -315,12 +315,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" - [[package]] name = "base64ct" version = "1.8.3" @@ -2740,44 +2734,31 @@ dependencies = [ [[package]] name = "mtp" version = "0.2.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471#e8b7c433e697660214fa17162f08ce6792792471" dependencies = [ "mtp-client", - "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", "mtp-host", - "mtp-transport 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-type-map 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-transport 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-type-map 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", "mtp-webserver", ] [[package]] name = "mtp-client" version = "0.2.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471#e8b7c433e697660214fa17162f08ce6792792471" dependencies = [ - "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-transport 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-transport 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", "rand 0.10.2", "tokio", ] -[[package]] -name = "mtp-codec" -version = "0.2.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" -dependencies = [ - "base64 0.23.1", - "byteorder", - "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-type-map 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "rand 0.10.2", -] - [[package]] name = "mtp-codec" version = "0.2.0" @@ -2791,14 +2772,16 @@ dependencies = [ ] [[package]] -name = "mtp-common" +name = "mtp-codec" version = "0.2.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471#e8b7c433e697660214fa17162f08ce6792792471" dependencies = [ - "quinn", - "rustls", - "thiserror 2.0.19", - "wtransport", + "base64 0.22.1", + "byteorder", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-type-map 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "rand 0.10.2", ] [[package]] @@ -2812,12 +2795,43 @@ dependencies = [ "wtransport", ] +[[package]] +name = "mtp-common" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471#e8b7c433e697660214fa17162f08ce6792792471" +dependencies = [ + "quinn", + "rustls", + "thiserror 2.0.19", + "wtransport", +] + [[package]] name = "mtp-crypto" version = "0.2.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=a81ac4efca46fbf0e708c1a0f184735fc9bf7fec#a81ac4efca46fbf0e708c1a0f184735fc9bf7fec" dependencies = [ - "base64 0.23.1", + "base64 0.22.1", + "chacha20poly1305", + "ed25519-dalek", + "getrandom 0.4.3", + "hkdf", + "ml-dsa", + "rand 0.10.2", + "rand_core 0.10.1", + "rustls", + "sha2 0.11.0", + "thiserror 1.0.69", + "tokio", + "zeroize", +] + +[[package]] +name = "mtp-crypto" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471#e8b7c433e697660214fa17162f08ce6792792471" +dependencies = [ + "base64 0.22.1", "chacha20poly1305", "ed25519-dalek", "getrandom 0.4.3", @@ -2834,54 +2848,16 @@ dependencies = [ "zeroize", ] -[[package]] -name = "mtp-crypto" -version = "0.2.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=a81ac4efca46fbf0e708c1a0f184735fc9bf7fec#a81ac4efca46fbf0e708c1a0f184735fc9bf7fec" -dependencies = [ - "base64 0.22.1", - "chacha20poly1305", - "ed25519-dalek", - "getrandom 0.4.3", - "hkdf", - "ml-dsa", - "rand 0.10.2", - "rand_core 0.10.1", - "rustls", - "sha2 0.11.0", - "thiserror 1.0.69", - "tokio", - "zeroize", -] - [[package]] name = "mtp-host" version = "0.2.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471#e8b7c433e697660214fa17162f08ce6792792471" dependencies = [ - "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-transport 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "rand 0.10.2", - "tokio", - "tracing", - "wtransport", -] - -[[package]] -name = "mtp-transport" -version = "0.2.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" -dependencies = [ - "async-trait", - "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "rcgen", - "rustls", - "rustls-native-certs", - "sha2 0.11.0", + "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-transport 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "rand 0.8.7", "tokio", "tracing", "wtransport", @@ -2906,12 +2882,21 @@ dependencies = [ ] [[package]] -name = "mtp-type-map" +name = "mtp-transport" version = "0.2.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471#e8b7c433e697660214fa17162f08ce6792792471" dependencies = [ - "serde", - "serde_yaml", + "async-trait", + "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "rcgen", + "rustls", + "rustls-native-certs", + "sha2 0.11.0", + "tokio", + "tracing", + "wtransport", ] [[package]] @@ -2923,10 +2908,19 @@ dependencies = [ "serde_yaml", ] +[[package]] +name = "mtp-type-map" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471#e8b7c433e697660214fa17162f08ce6792792471" +dependencies = [ + "serde", + "serde_yaml", +] + [[package]] name = "mtp-webserver" version = "0.2.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471#e8b7c433e697660214fa17162f08ce6792792471" dependencies = [ "async-trait", "bytes", @@ -2937,11 +2931,11 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", - "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", + "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", "mtp-host", - "mtp-transport 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-transport 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=e8b7c433e697660214fa17162f08ce6792792471)", "quinn", "rand 0.10.2", "rustls", @@ -3808,13 +3802,24 @@ 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 0.3.1", + "rand_core 0.6.4", +] + [[package]] name = "rand" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" dependencies = [ - "rand_chacha", + "rand_chacha 0.9.0", "rand_core 0.9.5", ] @@ -3829,6 +3834,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_chacha" version = "0.9.0" diff --git a/apps/tauri/src-tauri/Cargo.toml b/apps/tauri/src-tauri/Cargo.toml index 78acd24..f193993 100644 --- a/apps/tauri/src-tauri/Cargo.toml +++ b/apps/tauri/src-tauri/Cargo.toml @@ -24,7 +24,7 @@ serde_json = "1" base64 = "0.22" reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] } tokio = { version = "1", features = ["rt-multi-thread", "sync", "time"] } -mtp = { git = "https://git.methanium.net/methanium/mtp.git", rev = "7182272e3edb0079d7b74b45b2f62a298d2fee22", features = ["client", "crypto"] } +mtp = { git = "https://git.methanium.net/methanium/mtp.git", rev = "e8b7c433e697660214fa17162f08ce6792792471", features = ["client", "crypto"] } mtp-transport = { git = "https://git.methanium.net/methanium/mtp.git", rev = "a81ac4efca46fbf0e708c1a0f184735fc9bf7fec" } webpki-root-certs = "1" tauri-plugin-deep-link = "2"