Merge pull request #110 from RustCrypto/aesni/mem-zeroed

aesni: use mem::zeroed instead of MaybeUninit
RustCrypto · May 27, 2020 · 044bc4c · 044bc4c
2 parents 179262e + d3f1942
commit 044bc4c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/aes/aesni/src/aes128/expand.rs b/aes/aesni/src/aes128/expand.rs
@@ -1,6 +1,6 @@
 use crate::arch::*;
 
-use core::mem::MaybeUninit;
+use core::mem;
 
 macro_rules! expand_round {
     ($enc_keys:expr, $dec_keys:expr, $pos:expr, $round:expr) => {
@@ -27,8 +27,8 @@ macro_rules! expand_round {
 #[inline(always)]
 pub(super) fn expand(key: &[u8; 16]) -> ([__m128i; 11], [__m128i; 11]) {
     unsafe {
-        let mut enc_keys: [__m128i; 11] = MaybeUninit::zeroed().assume_init();
-        let mut dec_keys: [__m128i; 11] = MaybeUninit::zeroed().assume_init();
+        let mut enc_keys: [__m128i; 11] = mem::zeroed();
+        let mut dec_keys: [__m128i; 11] = mem::zeroed();
 
         // Safety: `loadu` supports unaligned loads
         #[allow(clippy::cast_ptr_alignment)]

diff --git a/aes/aesni/src/aes192/expand.rs b/aes/aesni/src/aes192/expand.rs
@@ -1,7 +1,6 @@
 use crate::arch::*;
 
-use core::mem::{self, MaybeUninit};
-use core::ptr;
+use core::{mem, ptr};
 
 macro_rules! expand_round {
     ($t1:expr, $t3:expr, $round:expr) => {{
@@ -41,8 +40,8 @@ macro_rules! shuffle {
 #[inline(always)]
 pub(super) fn expand(key: &[u8; 24]) -> ([__m128i; 13], [__m128i; 13]) {
     unsafe {
-        let mut enc_keys: [__m128i; 13] = MaybeUninit::zeroed().assume_init();
-        let mut dec_keys: [__m128i; 13] = MaybeUninit::zeroed().assume_init();
+        let mut enc_keys: [__m128i; 13] = mem::zeroed();
+        let mut dec_keys: [__m128i; 13] = mem::zeroed();
 
         macro_rules! store {
             ($i:expr, $k:expr) => {

diff --git a/aes/aesni/src/aes256/expand.rs b/aes/aesni/src/aes256/expand.rs
@@ -1,6 +1,6 @@
 use crate::arch::*;
 
-use core::mem::MaybeUninit;
+use core::mem;
 
 macro_rules! expand_round {
     ($enc_keys:expr, $dec_keys:expr, $pos:expr, $round:expr) => {
@@ -66,8 +66,8 @@ pub(super) fn expand(key: &[u8; 32]) -> ([__m128i; 15], [__m128i; 15]) {
     // Safety: `loadu` and `storeu` support unaligned access
     #[allow(clippy::cast_ptr_alignment)]
     unsafe {
-        let mut enc_keys: [__m128i; 15] = MaybeUninit::zeroed().assume_init();
-        let mut dec_keys: [__m128i; 15] = MaybeUninit::zeroed().assume_init();
+        let mut enc_keys: [__m128i; 15] = mem::zeroed();
+        let mut dec_keys: [__m128i; 15] = mem::zeroed();
 
         let kp = key.as_ptr() as *const __m128i;
         let k1 = _mm_loadu_si128(kp);

diff --git a/aes/aesni/src/ctr.rs b/aes/aesni/src/ctr.rs
@@ -1,8 +1,7 @@
 #![allow(clippy::unreadable_literal)]
 
 use crate::arch::*;
-use core::cmp;
-use core::mem::{self, MaybeUninit};
+use core::{cmp, mem};
 
 use super::{Aes128, Aes192, Aes256};
 use block_cipher::consts::U16;
@@ -94,7 +93,7 @@ macro_rules! impl_ctr {
             #[inline(always)]
             fn next_block8(&mut self) -> [__m128i; 8] {
                 let mut ctr = self.ctr;
-                let mut block8: [__m128i; 8] = unsafe { MaybeUninit::zeroed().assume_init() };
+                let mut block8: [__m128i; 8] = unsafe { mem::zeroed() };
                 for i in 0..8 {
                     block8[i] = swap_bytes(ctr);
                     ctr = inc_be(ctr);