xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sasl: Improve frame parsing

Browse source 
All keys only have a single char, so avoid allocating a whole String for
them.  Also move to a BTreeMap as this is more efficient on such keys.
This commit is contained in:
Emmanuel Gil Peyrot 2024-09-25 21:53:50 +02:00
commit 0267383803
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -153,9 +153,9 @@ impl<S: ScramProvider> Mechanism for Scram<S> {
} => {
let frame =
parse_frame(challenge).map_err(|_| MechanismError::CannotDecodeChallenge)?;
let server_nonce = frame.get("r");
let salt = frame.get("s").and_then(|v| Base64.decode(v).ok());
let iterations = frame.get("i").and_then(|v| v.parse().ok());
let server_nonce = frame.get(&'r');
let salt = frame.get(&'s').and_then(|v| Base64.decode(v).ok());
let iterations = frame.get(&'i').and_then(|v| v.parse().ok());
let server_nonce = server_nonce.ok_or(MechanismError::NoServerNonce)?;
let salt = salt.ok_or(MechanismError::NoServerSalt)?;
let iterations = iterations.ok_or(MechanismError::NoServerIterations)?;
@ -206,7 +206,7 @@ impl<S: ScramProvider> Mechanism for Scram<S> {
ScramState::GotServerData {
ref server_signature,
} => {
if let Some(sig) = frame.get("v").and_then(|v| Base64.decode(v).ok()) {
if let Some(sig) = frame.get(&'v').and_then(|v| Base64.decode(v).ok()) {
if sig == *server_signature {
Ok(())
} else {