Try updating windows in memsec

bitwarden · Sep 24, 2024 · 45f3d32 · 45f3d32
1 parent dd37d1d
commit 45f3d32
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 81 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/bitwarden-crypto/Cargo.toml b/crates/bitwarden-crypto/Cargo.toml
@@ -46,8 +46,10 @@ uniffi = { version = "=0.28.1", optional = true }
 uuid = { version = ">=1.3.3, <2.0", features = ["serde"] }
 zeroize = { version = ">=1.7.0, <2.0", features = ["derive", "aarch64"] }
 
-[target.'cfg(all(not(target_arch = "wasm32"), not(windows)))'.dependencies]
-memsec = { version = "0.7.0", features = ["alloc_ext"] }
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+memsec = { version = "0.7.0", features = [
+    "alloc_ext",
+], git = "https://github.com/dani-garcia/memsec", rev = "3d2e272d284442637bac0a7d94f76883960db7e2" }
 
 [dev-dependencies]
 criterion = { version = "0.5.1", features = ["html_reports"] }

diff --git a/crates/bitwarden-crypto/src/service/key_store/rust_impl.rs b/crates/bitwarden-crypto/src/service/key_store/rust_impl.rs
@@ -15,11 +15,7 @@ pub(crate) struct RustImplKeyData<Key: KeyRef> {
 
 impl<Key: KeyRef> Drop for RustImplKeyData<Key> {
     fn drop(&mut self) {
-        #[cfg(all(
-            not(target_arch = "wasm32"),
-            not(feature = "no-memory-hardening"),
-            not(windows)
-        ))]
+        #[cfg(all(not(target_arch = "wasm32"), not(feature = "no-memory-hardening")))]
         {
             use std::mem::MaybeUninit;
 
@@ -54,11 +50,7 @@ impl<Key: KeyRef> KeyData<Key> for RustImplKeyData<Key> {
         #[allow(unused_mut)]
         let mut data: Box<_> = std::iter::repeat_with(|| None).take(capacity).collect();
 
-        #[cfg(all(
-            not(target_arch = "wasm32"),
-            not(feature = "no-memory-hardening"),
-            not(windows)
-        ))]
+        #[cfg(all(not(target_arch = "wasm32"), not(feature = "no-memory-hardening")))]
         {
             let entry_size = std::mem::size_of::<Option<(Key, Key::KeyValue)>>();
             unsafe {