zeroize: Remove some unsafe code

RustCrypto · Oct 29, 2023 · ca89cfc · ca89cfc
1 parent 6c39ebb
commit ca89cfc
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/zeroize/Cargo.toml b/zeroize/Cargo.toml
@@ -20,6 +20,7 @@ rust-version = "1.60"
 [dependencies]
 serde = { version = "1.0", default-features = false, optional = true }
 zeroize_derive = { version = "1.3", path = "derive", optional = true }
+zerocopy = { version = "0.7.19", default-features = false, features = ["simd"] }
 
 [features]
 default = ["alloc"]

diff --git a/zeroize/src/aarch64.rs b/zeroize/src/aarch64.rs
@@ -7,14 +7,16 @@ use crate::{atomic_fence, volatile_write, Zeroize};
 
 use core::arch::aarch64::*;
 
+use zerocopy::FromZeroes;
+
 macro_rules! impl_zeroize_for_simd_register {
     ($($type:ty),* $(,)?) => {
         $(
             #[cfg_attr(docsrs, doc(cfg(target_arch = "aarch64")))]
             impl Zeroize for $type {
                 #[inline]
                 fn zeroize(&mut self) {
-                    volatile_write(self, unsafe { core::mem::zeroed() });
+                    volatile_write(self, Self::new_zeroed());
                     atomic_fence();
                 }
             }

diff --git a/zeroize/src/x86.rs b/zeroize/src/x86.rs
@@ -8,14 +8,16 @@ use core::arch::x86::*;
 #[cfg(target_arch = "x86_64")]
 use core::arch::x86_64::*;
 
+use zerocopy::FromZeroes;
+
 macro_rules! impl_zeroize_for_simd_register {
     ($($type:ty),* $(,)?) => {
         $(
             #[cfg_attr(docsrs, doc(cfg(any(target_arch = "x86", target_arch = "x86_64"))))]
             impl Zeroize for $type {
                 #[inline]
                 fn zeroize(&mut self) {
-                    volatile_write(self, unsafe { core::mem::zeroed() });
+                    volatile_write(self, Self::new_zeroed());
                     atomic_fence();
                 }
             }