From a3f8ff6371e96a634dcebd2bc4160aafc145379b Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 10 Feb 2024 15:04:11 +0800 Subject: [PATCH] add zeroize API to AES port this was missed on an earlier pass --- Cargo.lock | 7 +++++-- services/aes/Cargo.toml | 1 + services/aes/src/soft.rs | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a6b4fa249..b54c9bfa1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,6 +23,7 @@ name = "aes" version = "0.8.3" dependencies = [ "cipher", + "zeroize", ] [[package]] @@ -1150,13 +1151,13 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "curve25519-dalek" version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", - "engine-25519", - "engine25519-as", "fiat-crypto 0.2.6", "platforms", "rustc_version 0.4.0", @@ -1167,6 +1168,8 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", diff --git a/services/aes/Cargo.toml b/services/aes/Cargo.toml index 1c0a3143e..89862afb6 100644 --- a/services/aes/Cargo.toml +++ b/services/aes/Cargo.toml @@ -8,6 +8,7 @@ description = "AES library for Xous" # Dependency versions enforced by Cargo.lock. [dependencies] cipher = "0.4.2" +zeroize = { version = "1.6.0", optional = true, default_features = false } [features] hazmat = [] # Expose cryptographically hazardous APIs diff --git a/services/aes/src/soft.rs b/services/aes/src/soft.rs index 5e41cd739..d03eb8ab4 100644 --- a/services/aes/src/soft.rs +++ b/services/aes/src/soft.rs @@ -107,6 +107,17 @@ macro_rules! define_aes_impl { fn write_alg_name(f: &mut fmt::Formatter<'_>) -> fmt::Result { f.write_str(stringify!($name)) } } + impl Drop for $name { + #[inline] + fn drop(&mut self) { + #[cfg(feature = "zeroize")] + zeroize::Zeroize::zeroize(&mut self.keys); + } + } + + #[cfg(feature = "zeroize")] + impl zeroize::ZeroizeOnDrop for $name {} + #[doc=$doc] ///block cipher (encrypt-only) #[derive(Clone)] @@ -155,6 +166,9 @@ macro_rules! define_aes_impl { } } + #[cfg(feature = "zeroize")] + impl zeroize::ZeroizeOnDrop for $name_enc {} + #[doc=$doc] ///block cipher (decrypt-only) #[derive(Clone)] @@ -213,6 +227,9 @@ macro_rules! define_aes_impl { } } + #[cfg(feature = "zeroize")] + impl zeroize::ZeroizeOnDrop for $name_dec {} + pub(crate) struct $name_back_enc<'a>(&'a $name); impl<'a> BlockSizeUser for $name_back_enc<'a> {