pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client: Remove Result from Mechanism::initial().

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2020-02-25 23:31:21 +01:00
parent 7d78455981
commit 09745829f1
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sasl/src/client/mechanisms/plain.rs
View file

@ -39,12 +39,12 @@ impl Mechanism for Plain {
} }
} }
fn initial(&mut self) -> Result<Vec<u8>, String> { fn initial(&mut self) -> Vec<u8> {
let mut auth = Vec::new(); let mut auth = Vec::new();
auth.push(0); auth.push(0);
auth.extend(self.username.bytes()); auth.extend(self.username.bytes());
auth.push(0); auth.push(0);
auth.extend(self.password.bytes()); auth.extend(self.password.bytes());
Ok(auth) auth
} }
} }

8
sasl/src/client/mechanisms/scram.rs
View file

@ -93,7 +93,7 @@ impl<S: ScramProvider> Mechanism for Scram<S> {
} }
} }
fn initial(&mut self) -> Result<Vec<u8>, String> { fn initial(&mut self) -> Vec<u8> {
let mut gs2_header = Vec::new(); let mut gs2_header = Vec::new();
gs2_header.extend(self.channel_binding.header()); gs2_header.extend(self.channel_binding.header());
let mut bare = Vec::new(); let mut bare = Vec::new();
@ -108,7 +108,7 @@ impl<S: ScramProvider> Mechanism for Scram<S> {
initial_message: bare, initial_message: bare,
gs2_header: gs2_header, gs2_header: gs2_header,
}; };
Ok(data) data
} }
fn response(&mut self, challenge: &[u8]) -> Result<Vec<u8>, String> { fn response(&mut self, challenge: &[u8]) -> Result<Vec<u8>, String> {
@ -206,7 +206,7 @@ mod tests {
let server_final = b"v=rmF9pqV8S7suAoZWja4dJRkFsKQ="; let server_final = b"v=rmF9pqV8S7suAoZWja4dJRkFsKQ=";
let mut mechanism = let mut mechanism =
Scram::<Sha1>::new_with_nonce(username, password, client_nonce.to_owned()); Scram::<Sha1>::new_with_nonce(username, password, client_nonce.to_owned());
let init = mechanism.initial().unwrap(); let init = mechanism.initial();
assert_eq!( assert_eq!(
String::from_utf8(init.clone()).unwrap(), String::from_utf8(init.clone()).unwrap(),
String::from_utf8(client_init[..].to_owned()).unwrap() String::from_utf8(client_init[..].to_owned()).unwrap()
@ -231,7 +231,7 @@ mod tests {
let server_final = b"v=6rriTRBi23WpRR/wtup+mMhUZUn/dB5nLTJRsjl95G4="; let server_final = b"v=6rriTRBi23WpRR/wtup+mMhUZUn/dB5nLTJRsjl95G4=";
let mut mechanism = let mut mechanism =
Scram::<Sha256>::new_with_nonce(username, password, client_nonce.to_owned()); Scram::<Sha256>::new_with_nonce(username, password, client_nonce.to_owned());
let init = mechanism.initial().unwrap(); let init = mechanism.initial();
assert_eq!( assert_eq!(
String::from_utf8(init.clone()).unwrap(), String::from_utf8(init.clone()).unwrap(),
String::from_utf8(client_init[..].to_owned()).unwrap() String::from_utf8(client_init[..].to_owned()).unwrap()

4
sasl/src/client/mod.rs
View file

@ -11,8 +11,8 @@ pub trait Mechanism {
Self: Sized; Self: Sized;
/// Provides initial payload of the SASL mechanism. /// Provides initial payload of the SASL mechanism.
fn initial(&mut self) -> Result<Vec<u8>, String> { fn initial(&mut self) -> Vec<u8> {
Ok(Vec::new()) Vec::new()
} }
/// Creates a response to the SASL challenge. /// Creates a response to the SASL challenge.