From 1988e450bd255bb004050148868d1e084b688c34 Mon Sep 17 00:00:00 2001
From: Justin Smith <justsmth@amazon.com>
Date: Wed, 2 Aug 2023 16:23:25 -0400
Subject: [PATCH 1/2] Remove unneeded calls to .cast()

---
 aws-lc-rs/src/aead/aead_ctx.rs | 2 +-
 aws-lc-rs/src/aead/poly1305.rs | 3 +--
 aws-lc-rs/src/agreement.rs     | 2 +-
 aws-lc-rs/src/ec.rs            | 2 +-
 aws-lc-rs/src/hmac.rs          | 6 +-----
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/aws-lc-rs/src/aead/aead_ctx.rs b/aws-lc-rs/src/aead/aead_ctx.rs
index ae788ca6a86..a2aaab5e003 100644
--- a/aws-lc-rs/src/aead/aead_ctx.rs
+++ b/aws-lc-rs/src/aead/aead_ctx.rs
@@ -69,7 +69,7 @@ impl AeadCtx {
             if 1 != EVP_AEAD_CTX_init(
                 aead_ctx.as_mut_ptr(),
                 aead,
-                key_bytes.as_ptr().cast(),
+                key_bytes.as_ptr(),
                 key_bytes.len(),
                 TAG_LEN,
                 null_mut(),
diff --git a/aws-lc-rs/src/aead/poly1305.rs b/aws-lc-rs/src/aead/poly1305.rs
index 9c6e6275a61..8163dd79b1b 100644
--- a/aws-lc-rs/src/aead/poly1305.rs
+++ b/aws-lc-rs/src/aead/poly1305.rs
@@ -35,8 +35,7 @@ pub struct Context {
 // are used, is only correct when the state buffer is 64-byte aligned.
 #[repr(C, align(64))]
 #[allow(non_camel_case_types)]
-struct poly1305_state([u8; OPAQUE_LEN]);
-const OPAQUE_LEN: usize = 512;
+struct poly1305_state(aws_lc::poly1305_state);
 
 impl Context {
     #[inline]
diff --git a/aws-lc-rs/src/agreement.rs b/aws-lc-rs/src/agreement.rs
index 23a0fbec57a..aed90ae5c40 100644
--- a/aws-lc-rs/src/agreement.rs
+++ b/aws-lc-rs/src/agreement.rs
@@ -358,7 +358,7 @@ impl EphemeralPrivateKey {
             KeyInner::X25519(priv_key) => {
                 let mut buffer = [0u8; MAX_PUBLIC_KEY_LEN];
                 unsafe {
-                    X25519_public_from_private(buffer.as_mut_ptr().cast(), priv_key.as_ptr());
+                    X25519_public_from_private(buffer.as_mut_ptr(), priv_key.as_ptr());
                 }
 
                 Ok(PublicKey {
diff --git a/aws-lc-rs/src/ec.rs b/aws-lc-rs/src/ec.rs
index 955736a9a06..38be14d7c1b 100644
--- a/aws-lc-rs/src/ec.rs
+++ b/aws-lc-rs/src/ec.rs
@@ -344,7 +344,7 @@ unsafe fn ec_point_to_bytes(
         **ec_group,
         **ec_point,
         pt_conv_form,
-        buf.as_mut_ptr().cast(),
+        buf.as_mut_ptr(),
         PUBLIC_KEY_MAX_LEN,
         null_mut(),
     );
diff --git a/aws-lc-rs/src/hmac.rs b/aws-lc-rs/src/hmac.rs
index 8e2cccf9d14..6c36cee4a7b 100644
--- a/aws-lc-rs/src/hmac.rs
+++ b/aws-lc-rs/src/hmac.rs
@@ -370,11 +370,7 @@ impl Context {
     #[inline]
     fn try_update(&mut self, data: &[u8]) -> Result<(), Unspecified> {
         unsafe {
-            if 1 != HMAC_Update(
-                self.key.get_hmac_ctx_ptr(),
-                data.as_ptr().cast(),
-                data.len(),
-            ) {
+            if 1 != HMAC_Update(self.key.get_hmac_ctx_ptr(), data.as_ptr(), data.len()) {
                 return Err(Unspecified);
             }
         }

From 712747dd41506061969d10449bf519a42e6939b0 Mon Sep 17 00:00:00 2001
From: Justin Smith <justsmth@amazon.com>
Date: Wed, 2 Aug 2023 17:22:12 -0400
Subject: [PATCH 2/2] Satisfy clippy

---
 aws-lc-rs/src/error.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aws-lc-rs/src/error.rs b/aws-lc-rs/src/error.rs
index 0a772d9fae5..6ffb8d59822 100644
--- a/aws-lc-rs/src/error.rs
+++ b/aws-lc-rs/src/error.rs
@@ -256,6 +256,7 @@ mod tests {
         let unspecified = super::Unspecified::from(key_rejected);
         assert_eq!("Unspecified", unspecified.description());
 
+        #[allow(clippy::redundant_locals)]
         let unspecified = unspecified;
         assert_eq!("Unspecified", unspecified.description());
     }