Skip to content

Commit d46d5a0

Browse files
A6GibKmbilelmoussaoui
authored andcommitted
client: crypto: Rename expected parameter
So it is clear we are talking about a mac.
1 parent 059d9bc commit d46d5a0

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

client/src/crypto/native.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@ pub(crate) fn compute_mac(data: impl AsRef<[u8]>, key: &Key) -> Result<crate::Ma
132132
pub(crate) fn verify_mac(
133133
data: impl AsRef<[u8]>,
134134
key: &Key,
135-
expected: impl AsRef<[u8]>,
135+
expected_mac: impl AsRef<[u8]>,
136136
) -> Result<bool, super::Error> {
137137
let mut mac = MacAlg::new_from_slice(key.as_ref()).unwrap();
138138
mac.update(data.as_ref());
139-
Ok(mac.verify_slice(expected.as_ref()).is_ok())
139+
Ok(mac.verify_slice(expected_mac.as_ref()).is_ok())
140140
}
141141

142142
pub(crate) fn verify_checksum_md5(digest: impl AsRef<[u8]>, content: impl AsRef<[u8]>) -> bool {

client/src/crypto/openssl.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,12 @@ pub(crate) fn compute_mac(data: impl AsRef<[u8]>, key: &Key) -> Result<Mac, supe
153153
pub(crate) fn verify_mac(
154154
data: impl AsRef<[u8]>,
155155
key: &Key,
156-
expected: impl AsRef<[u8]>,
156+
expected_mac: impl AsRef<[u8]>,
157157
) -> Result<bool, super::Error> {
158-
Ok(memcmp::eq(compute_mac(&data, key)?.as_slice(), expected.as_ref()))
158+
Ok(memcmp::eq(
159+
compute_mac(&data, key)?.as_slice(),
160+
expected_mac.as_ref(),
161+
))
159162
}
160163

161164
pub(crate) fn verify_checksum_md5(digest: impl AsRef<[u8]>, content: impl AsRef<[u8]>) -> bool {

0 commit comments

Comments
 (0)