From 635fa85e39004e8d5c61c35c4cbb0ff57a07e04a Mon Sep 17 00:00:00 2001
From: Arthur Gautier <arthur.gautier@arista.com>
Date: Thu, 5 Sep 2024 13:37:27 -0700
Subject: [PATCH] ed448: zeroize key material

---
 Cargo.lock         |  1 +
 ed448/Cargo.toml   |  1 +
 ed448/src/pkcs8.rs | 17 +++++++++++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6eedea80..d99f7f00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -407,6 +407,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "signature",
+ "zeroize",
 ]
 
 [[package]]
diff --git a/ed448/Cargo.toml b/ed448/Cargo.toml
index ac1ee3b7..33dab6e1 100644
--- a/ed448/Cargo.toml
+++ b/ed448/Cargo.toml
@@ -25,6 +25,7 @@ signature = { version = "=2.3.0-pre.4", default-features = false }
 pkcs8 = { version = "=0.11.0-rc.0", optional = true }
 serde = { version = "1", optional = true, default-features = false }
 serde_bytes = { version = "0.11", optional = true }
+zeroize = { version = "1", optional = true, default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.4"
diff --git a/ed448/src/pkcs8.rs b/ed448/src/pkcs8.rs
index 2740881a..bdc833a2 100644
--- a/ed448/src/pkcs8.rs
+++ b/ed448/src/pkcs8.rs
@@ -24,6 +24,9 @@ pub use pkcs8::{spki::EncodePublicKey, EncodePrivateKey};
 #[cfg(feature = "alloc")]
 pub use pkcs8::der::{asn1::BitStringRef, Document, SecretDocument};
 
+#[cfg(feature = "zeroize")]
+use zeroize::Zeroize;
+
 use core::fmt;
 
 /// Algorithm [`ObjectIdentifier`] for the Ed448 digital signature algorithm
@@ -103,11 +106,17 @@ impl KeypairBytes {
     }
 }
 
+impl Drop for KeypairBytes {
+    fn drop(&mut self) {
+        #[cfg(feature = "zeroize")]
+        self.secret_key.zeroize()
+    }
+}
+
 #[cfg(feature = "alloc")]
 impl EncodePrivateKey for KeypairBytes {
     fn to_pkcs8_der(&self) -> Result<SecretDocument> {
         // Serialize private key as nested OCTET STRING
-        // TODO(tarcieri): zeroize `private_key`
         let mut private_key = [0u8; 2 + (Self::BYTE_SIZE / 2)];
         private_key[0] = 0x04;
         private_key[1] = 0x39;
@@ -118,8 +127,12 @@ impl EncodePrivateKey for KeypairBytes {
             private_key: &private_key,
             public_key: self.public_key.as_ref().map(|pk| pk.0.as_slice()),
         };
+        let result = SecretDocument::encode_msg(&private_key_info)?;
+
+        #[cfg(feature = "zeroize")]
+        private_key.zeroize();
 
-        Ok(SecretDocument::encode_msg(&private_key_info)?)
+        Ok(result)
     }
 }