From f83ea3b50f30b105e1138b2baeb2046bee51e79c Mon Sep 17 00:00:00 2001
From: Aydin Mercan <aydin@mercan.dev>
Date: Sat, 17 Sep 2022 15:31:34 +0300
Subject: [PATCH] bearssl/rsa: zeroize the keys

---
 bearssl/src/rsa.rs         |  7 ++++---
 bearssl/src/rsa/private.rs | 43 ++++++++++++++++++++++++++++++++++++++
 bearssl/src/rsa/public.rs  | 20 ++++++++++++++++++
 3 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 bearssl/src/rsa/private.rs
 create mode 100644 bearssl/src/rsa/public.rs

diff --git a/bearssl/src/rsa.rs b/bearssl/src/rsa.rs
index 6cf3a85..c7e81d4 100644
--- a/bearssl/src/rsa.rs
+++ b/bearssl/src/rsa.rs
@@ -1,4 +1,5 @@
-use bearssl_sys::*;
+mod private;
+mod public;
 
-pub struct PublicKey(pub(crate) br_rsa_public_key);
-pub struct PrivateKey(pub(crate) br_rsa_private_key);
+pub use private::PrivateKey;
+pub use public::PublicKey;
diff --git a/bearssl/src/rsa/private.rs b/bearssl/src/rsa/private.rs
new file mode 100644
index 0000000..8402df7
--- /dev/null
+++ b/bearssl/src/rsa/private.rs
@@ -0,0 +1,43 @@
+use core::ops::Drop;
+use core::slice;
+
+use bearssl_sys::br_rsa_private_key;
+
+#[repr(transparent)]
+pub struct PrivateKey(pub(crate) br_rsa_private_key);
+
+#[cfg(feature = "zeroize")]
+impl Drop for PrivateKey {
+    fn drop(&mut self) {
+        use zeroize::Zeroize;
+
+        self.zeroize();
+    }
+}
+
+#[cfg(feature = "zeroize")]
+impl zeroize::ZeroizeOnDrop for PrivateKey {}
+
+#[cfg(feature = "zeroize")]
+impl zeroize::Zeroize for PrivateKey {
+    fn zeroize(&mut self) {
+        // Safety: Slice constructions should be safe as long as lengths have not been modified
+        // outside what BearSSL set.
+        unsafe {
+            let p = slice::from_raw_parts_mut(self.0.p, self.0.plen);
+            p.zeroize();
+
+            let q = slice::from_raw_parts_mut(self.0.q, self.0.qlen);
+            q.zeroize();
+
+            let dp = slice::from_raw_parts_mut(self.0.dp, self.0.dplen);
+            dp.zeroize();
+
+            let dq = slice::from_raw_parts_mut(self.0.dq, self.0.dqlen);
+            dq.zeroize();
+
+            let iq = slice::from_raw_parts_mut(self.0.iq, self.0.iqlen);
+            iq.zeroize();
+        }
+    }
+}
diff --git a/bearssl/src/rsa/public.rs b/bearssl/src/rsa/public.rs
new file mode 100644
index 0000000..99e1f75
--- /dev/null
+++ b/bearssl/src/rsa/public.rs
@@ -0,0 +1,20 @@
+use core::ops::Drop;
+use core::slice;
+
+use bearssl_sys::br_rsa_public_key;
+
+#[repr(transparent)]
+pub struct PublicKey(pub(crate) br_rsa_public_key);
+
+#[cfg(feature = "zeroize")]
+impl zeroize::Zeroize for PublicKey {
+    fn zeroize(&mut self) {
+        unsafe {
+            let n = slice::from_raw_parts_mut(self.0.n, self.0.nlen);
+            n.zeroize();
+
+            let e = slice::from_raw_parts_mut(self.0.e, self.0.elen);
+            e.zeroize();
+        }
+    }
+}