From 1efcb8837c1f13c04565b46cd8ecdc9320b0ea57 Mon Sep 17 00:00:00 2001 From: Alex Emmet <111742636+Alex-Emmet@users.noreply.github.com> Date: Thu, 2 Jul 2026 23:26:44 +0200 Subject: [PATCH] Format --- client/src/lib.rs | 3 ++- host/src/lib.rs | 55 +++++++++++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/client/src/lib.rs b/client/src/lib.rs index e044997..223ea9f 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -539,7 +539,8 @@ impl MTPClient { .add_typed_default(DataType::Version, DataValue::Str(version_str.clone())) .add_typed_default(DataType::PublicKeys, DataValue::Bytes(pk_bytes.clone())); if let Some(desc) = &config.description { - register = register.add_typed_default(DataType::Description, DataValue::Str(desc.clone())); + register = + register.add_typed_default(DataType::Description, DataValue::Str(desc.clone())); } if let Err(e) = sender.send(®ister).await { sender.close(); diff --git a/host/src/lib.rs b/host/src/lib.rs index 294a537..9cfb5b5 100644 --- a/host/src/lib.rs +++ b/host/src/lib.rs @@ -251,7 +251,9 @@ impl MTPHost { Some(v) => v, None => return Err(AcceptError::MissingVersion), }; - let negotiated = match self.registry.negotiate(std::slice::from_ref(&client_version)) + let negotiated = match self + .registry + .negotiate(std::slice::from_ref(&client_version)) { Some(v) => v, None => return Err(AcceptError::UnsupportedVersion(client_version)), @@ -288,7 +290,9 @@ impl MTPHost { Some(v) => v, None => return Err(AcceptError::MissingVersion), }; - let negotiated = match self.registry.negotiate(std::slice::from_ref(&client_version)) + let negotiated = match self + .registry + .negotiate(std::slice::from_ref(&client_version)) { Some(v) => v, None => return Err(AcceptError::UnsupportedVersion(client_version)), @@ -435,7 +439,16 @@ impl MTPHost { )); }; - self.complete_auth_handshake(sender, receiver, flow, response_type, &version_str, client_version, description).await + self.complete_auth_handshake( + sender, + receiver, + flow, + response_type, + &version_str, + client_version, + description, + ) + .await } /* @@ -455,7 +468,7 @@ impl MTPHost { description: Option, ) -> Result, AcceptError> { use mtp_crypto::{ - auth, verify_ed25519, verify_ml_dsa, Ed25519Signer, MlDsaSigner, SignatureScheme, + Ed25519Signer, MlDsaSigner, SignatureScheme, auth, verify_ed25519, verify_ml_dsa, }; let tm = mtp_codec::TypeMap::latest(); @@ -688,7 +701,9 @@ impl MTPHost { })?, _ => { sender.close(); - return Err(AcceptError::AuthenticationFailed("missing public keys".into())); + return Err(AcceptError::AuthenticationFailed( + "missing public keys".into(), + )); } }; let pk_bytes = bundle.as_bytes(); @@ -696,10 +711,7 @@ impl MTPHost { .complete_auth_handshake( sender, receiver, - Flow::Register { - bundle, - pk_bytes, - }, + Flow::Register { bundle, pk_bytes }, mtp_codec::CommunicationType::RegisterResponse, &version_str, client_version, @@ -718,20 +730,17 @@ impl MTPHost { if cid > 0 && let Some(bundle) = (self.config.get_existing_user)(cid).await { - return self - .complete_auth_handshake( - sender, - receiver, - Flow::Login { - id: cid, - bundle, - }, - mtp_codec::CommunicationType::IdentificationResponse, - &version_str, - client_version, - description, - ) - .await; + return self + .complete_auth_handshake( + sender, + receiver, + Flow::Login { id: cid, bundle }, + mtp_codec::CommunicationType::IdentificationResponse, + &version_str, + client_version, + description, + ) + .await; } // Unknown (or zero) client id → unauthenticated connection.