void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 13:03:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

secure_eq in AES for macOS

Browse source
This commit is contained in:
Adam Ierymenko 2022-12-19 15:49:44 -05:00
parent 7da9b6cec5
commit 6517cc0cd1
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
crypto/src/aes.rs
View file

@ -288,7 +288,7 @@ mod fruit_flavored {
#[inline(always)]
pub fn finish_decrypt(&mut self, expected_tag: &[u8]) -> bool {
self.finish_encrypt().eq(expected_tag)
crate::secure_eq(&self.finish_encrypt(), expected_tag)
}
}
@ -419,12 +419,7 @@ mod openssl_aes {
false => CipherCtxRef::decrypt_init,
};
f(
&mut self.2,
Some(unsafe { CipherRef::from_ptr(t.as_ptr() as *mut _) }),
None,
None,
).unwrap();
f(&mut self.2, Some(unsafe { CipherRef::from_ptr(t.as_ptr() as *mut _) }), None, None).unwrap();
self.2.set_key_length(key.len()).unwrap();
@ -454,7 +449,9 @@ mod openssl_aes {
/// Encrypt or decrypt in place (same operation with CTR mode)
#[inline(always)]
pub fn crypt_in_place(&mut self, data: &mut [u8]) {
self.2.cipher_update(unsafe { &*std::slice::from_raw_parts(data.as_ptr(), data.len()) }, Some(data)).unwrap();
self.2
.cipher_update(unsafe { &*std::slice::from_raw_parts(data.as_ptr(), data.len()) }, Some(data))
.unwrap();
}
#[inline(always)]