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

Turns out a Mutex is not really any slower...

Browse source
This commit is contained in:
Adam Ierymenko 2023-03-14 15:22:37 -04:00
parent d81db5caa9
commit c4cb7c4429
1 changed files with 12 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
crypto/src/aes_fruity.rs
View file

@ -3,7 +3,7 @@
// MacOS implementation of AES primitives since CommonCrypto seems to be faster than OpenSSL, especially on ARM64. // MacOS implementation of AES primitives since CommonCrypto seems to be faster than OpenSSL, especially on ARM64.
use std::os::raw::{c_int, c_void}; use std::os::raw::{c_int, c_void};
use std::ptr::{null, null_mut}; use std::ptr::{null, null_mut};
use std::sync::atomic::AtomicPtr; use std::sync::Mutex;
use crate::secret::Secret; use crate::secret::Secret;
use crate::secure_eq; use crate::secure_eq;
@ -172,25 +172,18 @@ impl AesGcm<false> {
} }
} }
pub struct Aes(AtomicPtr<c_void>, AtomicPtr<c_void>); pub struct Aes(Mutex<(*mut c_void, *mut c_void)>);
impl Drop for Aes { impl Drop for Aes {
#[inline(always)] #[inline(always)]
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
loop { let p = self.0.lock().unwrap();
let p = self.0.load(std::sync::atomic::Ordering::Acquire); if !p.0.is_null() {
if !p.is_null() { CCCryptorRelease(p.0);
CCCryptorRelease(p);
break;
}
} }
loop { if !p.1.is_null() {
let p = self.1.load(std::sync::atomic::Ordering::Acquire); CCCryptorRelease(p.1);
if !p.is_null() {
CCCryptorRelease(p);
break;
}
} }
} }
} }
@ -238,7 +231,7 @@ impl Aes {
), ),
0 0
); );
Self(AtomicPtr::new(p0), AtomicPtr::new(p1)) Self(Mutex::new((p0, p1)))
} }
} }
@ -247,16 +240,8 @@ impl Aes {
assert_eq!(data.len(), 16); assert_eq!(data.len(), 16);
unsafe { unsafe {
let mut data_out_written = 0; let mut data_out_written = 0;
loop { let p = self.0.lock().unwrap();
let p = self.0.load(std::sync::atomic::Ordering::Acquire); CCCryptorUpdate(p.0, data.as_ptr().cast(), 16, data.as_mut_ptr().cast(), 16, &mut data_out_written);
if !p.is_null() {
CCCryptorUpdate(p, data.as_ptr().cast(), 16, data.as_mut_ptr().cast(), 16, &mut data_out_written);
self.0.store(p, std::sync::atomic::Ordering::Release);
break;
} else {
std::thread::yield_now();
}
}
} }
} }
@ -265,16 +250,8 @@ impl Aes {
assert_eq!(data.len(), 16); assert_eq!(data.len(), 16);
unsafe { unsafe {
let mut data_out_written = 0; let mut data_out_written = 0;
loop { let p = self.0.lock().unwrap();
let p = self.1.load(std::sync::atomic::Ordering::Acquire); CCCryptorUpdate(p.1, data.as_ptr().cast(), 16, data.as_mut_ptr().cast(), 16, &mut data_out_written);
if !p.is_null() {
CCCryptorUpdate(p, data.as_ptr().cast(), 16, data.as_mut_ptr().cast(), 16, &mut data_out_written);
self.1.store(p, std::sync::atomic::Ordering::Release);
break;
} else {
std::thread::yield_now();
}
}
} }
} }
} }