From 3b3baff47c4bbfeb555a6ac256103ebd7915ae4e Mon Sep 17 00:00:00 2001
From: Josh Holtrop <josh@wolfssl.com>
Date: Fri, 4 Sep 2026 12:07:06 -0400
Subject: [PATCH] Rust wrapper: copy aead keys directly into return struct

Avoid local variable to store them.

Fixes F-11286.
---
 wrapper/rust/wolfssl-wolfcrypt/src/aes.rs     | 36 +++++++++----------
 .../src/chacha20_poly1305.rs                  | 12 +++----
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/wrapper/rust/wolfssl-wolfcrypt/src/aes.rs b/wrapper/rust/wolfssl-wolfcrypt/src/aes.rs
index 9c30ce37cad..d4ac376b110 100644
--- a/wrapper/rust/wolfssl-wolfcrypt/src/aes.rs
+++ b/wrapper/rust/wolfssl-wolfcrypt/src/aes.rs
@@ -524,9 +524,9 @@ impl AeadCore for Aes128Ccm {
 #[cfg(all(aes_ccm, feature = "aead"))]
 impl KeyInit for Aes128Ccm {
     fn new(key: &aead::Key<Self>) -> Self {
-        let mut k = [0u8; 16];
-        k.copy_from_slice(key.as_ref());
-        Aes128Ccm { key: k }
+        let mut out = Aes128Ccm { key: [0u8; 16] };
+        out.key.copy_from_slice(key.as_ref());
+        out
     }
 }
 
@@ -576,9 +576,9 @@ impl AeadCore for Aes192Ccm {
 #[cfg(all(aes_ccm, feature = "aead"))]
 impl KeyInit for Aes192Ccm {
     fn new(key: &aead::Key<Self>) -> Self {
-        let mut k = [0u8; 24];
-        k.copy_from_slice(key.as_ref());
-        Aes192Ccm { key: k }
+        let mut out = Aes192Ccm { key: [0u8; 24] };
+        out.key.copy_from_slice(key.as_ref());
+        out
     }
 }
 
@@ -628,9 +628,9 @@ impl AeadCore for Aes256Ccm {
 #[cfg(all(aes_ccm, feature = "aead"))]
 impl KeyInit for Aes256Ccm {
     fn new(key: &aead::Key<Self>) -> Self {
-        let mut k = [0u8; 32];
-        k.copy_from_slice(key.as_ref());
-        Aes256Ccm { key: k }
+        let mut out = Aes256Ccm { key: [0u8; 32] };
+        out.key.copy_from_slice(key.as_ref());
+        out
     }
 }
 
@@ -1740,9 +1740,9 @@ impl AeadCore for Aes128Gcm {
 #[cfg(all(aes_gcm, feature = "aead"))]
 impl KeyInit for Aes128Gcm {
     fn new(key: &aead::Key<Self>) -> Self {
-        let mut k = [0u8; 16];
-        k.copy_from_slice(key.as_ref());
-        Aes128Gcm { key: k }
+        let mut out = Aes128Gcm { key: [0u8; 16] };
+        out.key.copy_from_slice(key.as_ref());
+        out
     }
 }
 
@@ -1792,9 +1792,9 @@ impl AeadCore for Aes192Gcm {
 #[cfg(all(aes_gcm, feature = "aead"))]
 impl KeyInit for Aes192Gcm {
     fn new(key: &aead::Key<Self>) -> Self {
-        let mut k = [0u8; 24];
-        k.copy_from_slice(key.as_ref());
-        Aes192Gcm { key: k }
+        let mut out = Aes192Gcm { key: [0u8; 24] };
+        out.key.copy_from_slice(key.as_ref());
+        out
     }
 }
 
@@ -1844,9 +1844,9 @@ impl AeadCore for Aes256Gcm {
 #[cfg(all(aes_gcm, feature = "aead"))]
 impl KeyInit for Aes256Gcm {
     fn new(key: &aead::Key<Self>) -> Self {
-        let mut k = [0u8; 32];
-        k.copy_from_slice(key.as_ref());
-        Aes256Gcm { key: k }
+        let mut out = Aes256Gcm { key: [0u8; 32] };
+        out.key.copy_from_slice(key.as_ref());
+        out
     }
 }
 
diff --git a/wrapper/rust/wolfssl-wolfcrypt/src/chacha20_poly1305.rs b/wrapper/rust/wolfssl-wolfcrypt/src/chacha20_poly1305.rs
index 80e4c86b778..2b6e5ccffaf 100644
--- a/wrapper/rust/wolfssl-wolfcrypt/src/chacha20_poly1305.rs
+++ b/wrapper/rust/wolfssl-wolfcrypt/src/chacha20_poly1305.rs
@@ -337,9 +337,9 @@ impl aead::AeadCore for ChaCha20Poly1305Aead {
 #[cfg(feature = "aead")]
 impl aead::KeyInit for ChaCha20Poly1305Aead {
     fn new(key: &aead::Key<Self>) -> Self {
-        let mut k = [0u8; 32];
-        k.copy_from_slice(key.as_ref());
-        ChaCha20Poly1305Aead { key: k }
+        let mut out = ChaCha20Poly1305Aead { key: [0u8; 32] };
+        out.key.copy_from_slice(key.as_ref());
+        out
     }
 }
 
@@ -526,9 +526,9 @@ impl aead::AeadCore for XChaCha20Poly1305Aead {
 #[cfg(all(xchacha20_poly1305, feature = "aead"))]
 impl aead::KeyInit for XChaCha20Poly1305Aead {
     fn new(key: &aead::Key<Self>) -> Self {
-        let mut k = [0u8; 32];
-        k.copy_from_slice(key.as_ref());
-        XChaCha20Poly1305Aead { key: k }
+        let mut out = XChaCha20Poly1305Aead { key: [0u8; 32] };
+        out.key.copy_from_slice(key.as_ref());
+        out
     }
 }