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

xmpp-parsers: Simplify hash conversion to Vec

Browse source 
Use `GenericArray::to_vec()` and `slice::to_vec()` directly.
This commit is contained in:
Emmanuel Gil Peyrot 2024-12-15 17:30:19 +01:00 • committed by xmpp ftw
commit d738939f89
2 changed files with 16 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

31
parsers/src/caps.rs
View file

@ -110,9 +110,7 @@ fn compute_identities(identities: &[Identity]) -> Vec<u8> {
let lang = identity.lang.clone().unwrap_or_default(); let lang = identity.lang.clone().unwrap_or_default();
let name = identity.name.clone().unwrap_or_default(); let name = identity.name.clone().unwrap_or_default();
let string = format!("{}/{}/{}/{}", identity.category, identity.type_, lang, name); let string = format!("{}/{}/{}/{}", identity.category, identity.type_, lang, name);
let bytes = string.as_bytes(); let mut vec = string.as_bytes().to_vec();
let mut vec = Vec::with_capacity(bytes.len());
vec.extend_from_slice(bytes);
vec.push(b'<'); vec.push(b'<');
vec vec
}) })
@ -120,11 +118,12 @@ fn compute_identities(identities: &[Identity]) -> Vec<u8> {
fn compute_extensions(extensions: &[DataForm]) -> Vec<u8> { fn compute_extensions(extensions: &[DataForm]) -> Vec<u8> {
compute_items(extensions, |extension| { compute_items(extensions, |extension| {
let mut bytes = vec![];
// TODO: maybe handle the error case? // TODO: maybe handle the error case?
if let Some(ref form_type) = extension.form_type { let mut bytes = if let Some(ref form_type) = extension.form_type {
bytes.extend_from_slice(form_type.as_bytes()); form_type.as_bytes().to_vec()
} } else {
vec![]
};
bytes.push(b'<'); bytes.push(b'<');
for field in extension.fields.clone() { for field in extension.fields.clone() {
if field.var.as_deref() == Some("FORM_TYPE") { if field.var.as_deref() == Some("FORM_TYPE") {
@ -159,10 +158,6 @@ pub fn compute_disco(disco: &DiscoInfoResult) -> Vec<u8> {
final_string final_string
} }
fn get_hash_vec(hash: &[u8]) -> Vec<u8> {
hash.to_vec()
}
/// Hashes the result of [compute_disco()] with one of the supported [hash /// Hashes the result of [compute_disco()] with one of the supported [hash
/// algorithms](../hashes/enum.Algo.html). /// algorithms](../hashes/enum.Algo.html).
pub fn hash_caps(data: &[u8], algo: Algo) -> Result<Hash, String> { pub fn hash_caps(data: &[u8], algo: Algo) -> Result<Hash, String> {
@ -170,23 +165,23 @@ pub fn hash_caps(data: &[u8], algo: Algo) -> Result<Hash, String> {
hash: match algo { hash: match algo {
Algo::Sha_1 => { Algo::Sha_1 => {
let hash = Sha1::digest(data); let hash = Sha1::digest(data);
get_hash_vec(hash.as_slice()) hash.to_vec()
} }
Algo::Sha_256 => { Algo::Sha_256 => {
let hash = Sha256::digest(data); let hash = Sha256::digest(data);
get_hash_vec(hash.as_slice()) hash.to_vec()
} }
Algo::Sha_512 => { Algo::Sha_512 => {
let hash = Sha512::digest(data); let hash = Sha512::digest(data);
get_hash_vec(hash.as_slice()) hash.to_vec()
} }
Algo::Sha3_256 => { Algo::Sha3_256 => {
let hash = Sha3_256::digest(data); let hash = Sha3_256::digest(data);
get_hash_vec(hash.as_slice()) hash.to_vec()
} }
Algo::Sha3_512 => { Algo::Sha3_512 => {
let hash = Sha3_512::digest(data); let hash = Sha3_512::digest(data);
get_hash_vec(hash.as_slice()) hash.to_vec()
} }
Algo::Blake2b_256 => { Algo::Blake2b_256 => {
let mut hasher = Blake2bVar::new(32).unwrap(); let mut hasher = Blake2bVar::new(32).unwrap();
@ -281,9 +276,7 @@ mod tests {
.parse() .parse()
.unwrap(); .unwrap();
let data = b"client/pc//Exodus 0.9.1<http://jabber.org/protocol/caps<http://jabber.org/protocol/disco#info<http://jabber.org/protocol/disco#items<http://jabber.org/protocol/muc<"; let expected = b"client/pc//Exodus 0.9.1<http://jabber.org/protocol/caps<http://jabber.org/protocol/disco#info<http://jabber.org/protocol/disco#items<http://jabber.org/protocol/muc<".to_vec();
let mut expected = Vec::with_capacity(data.len());
expected.extend_from_slice(data);
let disco = DiscoInfoResult::try_from(elem).unwrap(); let disco = DiscoInfoResult::try_from(elem).unwrap();
let caps = caps::compute_disco(&disco); let caps = caps::compute_disco(&disco);
assert_eq!(caps, expected); assert_eq!(caps, expected);

14
parsers/src/ecaps2.rs
View file

@ -124,12 +124,6 @@ pub fn compute_disco(disco: &DiscoInfoResult) -> Result<Vec<u8>, Error> {
Ok(final_string) Ok(final_string)
} }
fn get_hash_vec(hash: &[u8]) -> Vec<u8> {
let mut vec = Vec::with_capacity(hash.len());
vec.extend_from_slice(hash);
vec
}
/// Hashes the result of [compute_disco()] with one of the supported [hash /// Hashes the result of [compute_disco()] with one of the supported [hash
/// algorithms](../hashes/enum.Algo.html). /// algorithms](../hashes/enum.Algo.html).
pub fn hash_ecaps2(data: &[u8], algo: Algo) -> Result<Hash, Error> { pub fn hash_ecaps2(data: &[u8], algo: Algo) -> Result<Hash, Error> {
@ -137,19 +131,19 @@ pub fn hash_ecaps2(data: &[u8], algo: Algo) -> Result<Hash, Error> {
hash: match algo { hash: match algo {
Algo::Sha_256 => { Algo::Sha_256 => {
let hash = Sha256::digest(data); let hash = Sha256::digest(data);
get_hash_vec(hash.as_slice()) hash.to_vec()
} }
Algo::Sha_512 => { Algo::Sha_512 => {
let hash = Sha512::digest(data); let hash = Sha512::digest(data);
get_hash_vec(hash.as_slice()) hash.to_vec()
} }
Algo::Sha3_256 => { Algo::Sha3_256 => {
let hash = Sha3_256::digest(data); let hash = Sha3_256::digest(data);
get_hash_vec(hash.as_slice()) hash.to_vec()
} }
Algo::Sha3_512 => { Algo::Sha3_512 => {
let hash = Sha3_512::digest(data); let hash = Sha3_512::digest(data);
get_hash_vec(hash.as_slice()) hash.to_vec()
} }
Algo::Blake2b_256 => { Algo::Blake2b_256 => {
let mut hasher = Blake2bVar::new(32).unwrap(); let mut hasher = Blake2bVar::new(32).unwrap();