aes-gcm: Pass GCM key to constructors by reference.

When the constructors delegate to an assembly function that takes a reference,
have the constructor also take a reference.

Author: briansmith

src/aead/aes_gcm.rs

@@ -85,13 +85,13 @@ impl DynKey {
             let aes_key = aes::hw::Key::new(key, aes, cpu.get_feature())?;
             let gcm_key_value = derive_gcm_key_value(&aes_key);
             let combo = if let Some(cpu) = cpu.get_feature() {
-                let gcm_key = gcm::vclmulavx2::Key::new(gcm_key_value, cpu);
+                let gcm_key = gcm::vclmulavx2::Key::new(&gcm_key_value, cpu);
                 Self::VAesClMulAvx2(Combo { aes_key, gcm_key })
             } else if let Some(cpu) = cpu.get_feature() {
-                let gcm_key = gcm::clmulavxmovbe::Key::new(gcm_key_value, cpu);
+                let gcm_key = gcm::clmulavxmovbe::Key::new(&gcm_key_value, cpu);
                 Self::AesHwClMulAvxMovbe(Combo { aes_key, gcm_key })
             } else {
-                let gcm_key = gcm::clmul::Key::new(gcm_key_value, gcm);
+                let gcm_key = gcm::clmul::Key::new(&gcm_key_value, gcm);
                 Self::AesHwClMul(Combo { aes_key, gcm_key })
             };
             return Ok(combo);
@@ -105,7 +105,7 @@ impl DynKey {
         if let (Some(aes), Some(gcm)) = (cpu.get_feature(), cpu.get_feature()) {
             let aes_key = aes::hw::Key::new(key, aes, cpu.get_feature())?;
             let gcm_key_value = derive_gcm_key_value(&aes_key);
-            let gcm_key = gcm::clmul::Key::new(gcm_key_value, gcm);
+            let gcm_key = gcm::clmul::Key::new(&gcm_key_value, gcm);
             return Ok(Self::AesHwClMul(Combo { aes_key, gcm_key }));
         }
 
@@ -131,15 +131,15 @@ impl DynKey {
     fn new_neon(key: aes::KeyBytes, cpu: cpu::aarch64::Neon) -> Result<Self, error::Unspecified> {
         let aes_key = aes::vp::Key::new(key, cpu)?;
         let gcm_key_value = derive_gcm_key_value(&aes_key);
-        let gcm_key = gcm::neon::Key::new(gcm_key_value, cpu);
+        let gcm_key = gcm::neon::Key::new(&gcm_key_value, cpu);
         Ok(Self::Simd(Combo { aes_key, gcm_key }))
     }
 
     #[cfg(all(target_arch = "arm", target_endian = "little"))]
     fn new_neon(key: aes::KeyBytes, cpu: cpu::arm::Neon) -> Result<Self, error::Unspecified> {
         let aes_key = aes::vp::Key::new(key, cpu)?;
         let gcm_key_value = derive_gcm_key_value(&aes_key);
-        let gcm_key = gcm::neon::Key::new(gcm_key_value, cpu);
+        let gcm_key = gcm::neon::Key::new(&gcm_key_value, cpu);
         Ok(Self::Simd(Combo { aes_key, gcm_key }))
     }
 

src/aead/gcm/clmul.rs

@@ -18,7 +18,10 @@
     target_arch = "x86_64"
 ))]
 
-use super::{ffi::{BLOCK_LEN, KeyValue}, HTable, UpdateBlock, Xi};
+use super::{
+    ffi::{KeyValue, BLOCK_LEN},
+    HTable, UpdateBlock, Xi,
+};
 use crate::cpu;
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 use {super::UpdateBlocks, crate::polyfill::slice::AsChunks};
@@ -30,15 +33,15 @@ pub struct Key {
 
 impl Key {
     #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
-    pub(in super::super) fn new(value: KeyValue, _cpu: cpu::aarch64::PMull) -> Self {
+    pub(in super::super) fn new(value: &KeyValue, _cpu: cpu::aarch64::PMull) -> Self {
         Self {
             h_table: unsafe { htable_new!(gcm_init_clmul, value) },
         }
     }
 
     #[cfg(target_arch = "x86")]
     pub(in super::super) fn new(
-        value: KeyValue,
+        value: &KeyValue,
         _cpu: (cpu::intel::ClMul, cpu::intel::Ssse3),
     ) -> Self {
         Self {
@@ -49,7 +52,7 @@ impl Key {
     #[cfg(target_arch = "x86_64")]
     #[inline(never)]
     pub(in super::super) fn new(
-        value: KeyValue,
+        value: &KeyValue,
         _cpu: (cpu::intel::ClMul, cpu::intel::Ssse3),
     ) -> Self {
         Self {

src/aead/gcm/clmulavxmovbe.rs

@@ -25,7 +25,7 @@ pub struct Key {
 impl Key {
     #[inline(never)]
     pub(in super::super) fn new(
-        value: KeyValue,
+        value: &KeyValue,
         _required_cpu_features: (intel::ClMul, intel::Avx, intel::Movbe),
     ) -> Self {
         Self {

src/aead/gcm/ffi.rs

@@ -31,7 +31,7 @@ macro_rules! htable_new {
     ( $name:ident, $value:expr $(,)? ) => {{
         use crate::aead::gcm::ffi::HTable;
         prefixed_extern! {
-            fn $name(HTable: &mut HTable, h: &[u64; 2]);
+            fn $name(HTable: &mut HTable, h: &KeyValue);
         }
         HTable::new($name, $value)
     }};
@@ -61,6 +61,7 @@ macro_rules! ghash {
     }};
 }
 
+#[repr(transparent)]
 pub(in super::super) struct KeyValue([u64; 2]);
 
 impl KeyValue {
@@ -85,13 +86,13 @@ impl KeyValue {
 ))]
 impl HTable {
     pub(super) unsafe fn new(
-        init: unsafe extern "C" fn(HTable: &mut HTable, &[u64; 2]),
-        value: KeyValue,
+        init: unsafe extern "C" fn(HTable: &mut HTable, &KeyValue),
+        value: &KeyValue,
     ) -> Self {
         let mut r = Self {
             Htable: [U128 { hi: 0, lo: 0 }; HTABLE_LEN],
         };
-        unsafe { init(&mut r, &value.0) };
+        unsafe { init(&mut r, &value) };
         r
     }
 

src/aead/gcm/neon.rs

@@ -27,14 +27,14 @@ pub struct Key {
 
 impl Key {
     #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
-    pub(in super::super) fn new(value: KeyValue, _cpu: cpu::aarch64::Neon) -> Self {
+    pub(in super::super) fn new(value: &KeyValue, _cpu: cpu::aarch64::Neon) -> Self {
         Self {
             h_table: unsafe { htable_new!(gcm_init_neon, value) },
         }
     }
 
     #[cfg(all(target_arch = "arm", target_endian = "little"))]
-    pub(in super::super) fn new(value: KeyValue, _cpu: cpu::arm::Neon) -> Self {
+    pub(in super::super) fn new(value: &KeyValue, _cpu: cpu::arm::Neon) -> Self {
         Self {
             h_table: unsafe { htable_new!(gcm_init_neon, value) },
         }

src/aead/gcm/vclmulavx2.rs

@@ -27,7 +27,7 @@ pub struct Key {
 }
 
 impl Key {
-    pub(in super::super) fn new(value: KeyValue, _cpu: (Avx2, VAesClmul)) -> Self {
+    pub(in super::super) fn new(value: &KeyValue, _cpu: (Avx2, VAesClmul)) -> Self {
         Self {
             h_table: unsafe { htable_new!(gcm_init_vpclmulqdq_avx2, value) },
         }