From e0eb70d84885ce7a8c1eba2b04152422643ed945 Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@briansmith.org>
Date: Tue, 10 Oct 2023 20:41:39 -0700
Subject: [PATCH] Remove `From<Block> for [u64; 2]`.

---
 src/aead/block.rs        | 7 -------
 src/aead/gcm/gcm_nohw.rs | 5 ++++-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/aead/block.rs b/src/aead/block.rs
index 1700ec2bf..e3c6b0343 100644
--- a/src/aead/block.rs
+++ b/src/aead/block.rs
@@ -49,13 +49,6 @@ impl From<[u64; 2]> for Block {
     }
 }
 
-impl From<Block> for [u64; 2] {
-    #[inline]
-    fn from(Block(components): Block) -> Self {
-        components.map(Into::into)
-    }
-}
-
 impl BitXorAssign for Block {
     #[inline]
     fn bitxor_assign(&mut self, a: Self) {
diff --git a/src/aead/gcm/gcm_nohw.rs b/src/aead/gcm/gcm_nohw.rs
index 9b64bdb8d..1099aa756 100644
--- a/src/aead/gcm/gcm_nohw.rs
+++ b/src/aead/gcm/gcm_nohw.rs
@@ -235,7 +235,10 @@ pub(super) fn ghash(xi: &mut Xi, h: super::u128, input: &[[u8; BLOCK_LEN]]) {
 
 #[inline]
 fn with_swapped_xi(Xi(xi): &mut Xi, f: impl FnOnce(&mut [u64; 2])) {
-    let unswapped: [u64; 2] = (*xi).into();
+    let unswapped: [u64; 2] = {
+        let xi: &[[u8; 8]; 2] = xi.as_ref().chunks_fixed();
+        xi.map(u64::from_be_bytes)
+    };
     let mut swapped: [u64; 2] = [unswapped[1], unswapped[0]];
     f(&mut swapped);
     *xi = Block::from([swapped[1], swapped[0]])