[pbs-devel] [PATCH proxmox 2/2] sys: crypt: use is_some_and
Maximiliano Sandoval
m.sandoval at proxmox.com
Tue Aug 27 09:56:27 CEST 2024
Signed-off-by: Maximiliano Sandoval <m.sandoval at proxmox.com>
---
proxmox-sys/src/crypt.rs | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/proxmox-sys/src/crypt.rs b/proxmox-sys/src/crypt.rs
index 5565d0d5..5d8826a9 100644
--- a/proxmox-sys/src/crypt.rs
+++ b/proxmox-sys/src/crypt.rs
@@ -71,7 +71,12 @@ pub fn crypt(password: &[u8], salt: &[u8]) -> Result<String, Error> {
// > output field of their data argument, and crypt writes an invalid hash to its static
// > storage area. This string will be shorter than 13 characters, will begin with a ‘*’,
// > and will not compare equal to setting.
- if data.output.first().is_none() || Some(&('*' as libc::c_char)) == data.output.first() {
+ if data.output.first().is_none()
+ || data
+ .output
+ .first()
+ .is_some_and(|c| *c == '*' as libc::c_char)
+ {
bail!("internal error: crypt_r returned invalid hash");
}
CStr::from_ptr(&data.output as *const _)
@@ -133,7 +138,7 @@ pub fn crypt_gensalt(prefix: &str, count: u64, rbytes: &[u8]) -> Result<String,
// while it states that this is "in addition" to returning a null pointer, this isn't how
// `crypt_r` seems to behave (sometimes only setting an invalid hash) so add this here too just
// in case.
- if output.first().is_none() || Some(&('*' as libc::c_char)) == output.first() {
+ if output.first().is_none() || output.first().is_some_and(|c| *c == '*' as libc::c_char) {
bail!("internal error: crypt_gensalt_rn could not create a valid salt");
}
--
2.39.2
More information about the pbs-devel
mailing list