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

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

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();
auth.push(0);
auth.extend(self.username.bytes());
auth.push(0);
auth.extend(self.password.bytes());
Ok(auth)
auth
}
}

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

View file

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