From c8cb45128e7b75695be5231e811d194b3a8010ab Mon Sep 17 00:00:00 2001 From: mamoniot Date: Thu, 9 Mar 2023 11:57:48 -0500 Subject: [PATCH] adding macos --- crypto/src/aes_fruity.rs | 28 ++++----------------------- crypto/src/{aes.rs => aes_openssl.rs} | 0 crypto/src/lib.rs | 3 ++- 3 files changed, 6 insertions(+), 25 deletions(-) rename crypto/src/{aes.rs => aes_openssl.rs} (100%) diff --git a/crypto/src/aes_fruity.rs b/crypto/src/aes_fruity.rs index d7e18d067..07172420e 100644 --- a/crypto/src/aes_fruity.rs +++ b/crypto/src/aes_fruity.rs @@ -135,14 +135,7 @@ mod fruit_flavored { assert_eq!(data.len(), 16); unsafe { let mut data_out_written = 0; - CCCryptorUpdate( - self.0, - data.as_ptr().cast(), - 16, - data.as_mut_ptr().cast(), - 16, - &mut data_out_written, - ); + CCCryptorUpdate(self.0, data.as_ptr().cast(), 16, data.as_mut_ptr().cast(), 16, &mut data_out_written); } } @@ -168,14 +161,7 @@ mod fruit_flavored { assert_eq!(data.len(), 16); unsafe { let mut data_out_written = 0; - CCCryptorUpdate( - self.1, - data.as_ptr().cast(), - 16, - data.as_mut_ptr().cast(), - 16, - &mut data_out_written, - ); + CCCryptorUpdate(self.1, data.as_ptr().cast(), 16, data.as_mut_ptr().cast(), 16, &mut data_out_written); } } } @@ -357,15 +343,9 @@ mod fruit_flavored { pub fn crypt_in_place(&mut self, data: &mut [u8]) { unsafe { if self.1 { - assert_eq!( - CCCryptorGCMEncrypt(self.0, data.as_ptr().cast(), data.len(), data.as_mut_ptr().cast()), - 0 - ); + assert_eq!(CCCryptorGCMEncrypt(self.0, data.as_ptr().cast(), data.len(), data.as_mut_ptr().cast()), 0); } else { - assert_eq!( - CCCryptorGCMDecrypt(self.0, data.as_ptr().cast(), data.len(), data.as_mut_ptr().cast()), - 0 - ); + assert_eq!(CCCryptorGCMDecrypt(self.0, data.as_ptr().cast(), data.len(), data.as_mut_ptr().cast()), 0); } } } diff --git a/crypto/src/aes.rs b/crypto/src/aes_openssl.rs similarity index 100% rename from crypto/src/aes.rs rename to crypto/src/aes_openssl.rs diff --git a/crypto/src/lib.rs b/crypto/src/lib.rs index 7e0ebdd52..404631e4d 100644 --- a/crypto/src/lib.rs +++ b/crypto/src/lib.rs @@ -7,7 +7,6 @@ mod ec; pub mod aes_gmac_siv; pub mod secret; pub mod random; -pub mod aes; pub mod hash; pub mod mimcvdf; pub mod p384; @@ -17,6 +16,8 @@ pub mod salsa; pub mod typestate; pub mod x25519; +pub mod aes; + /// This must be called before using any function from this library. pub fn init() {