Fix cfg flags, silence warnings

bitwarden · Sep 24, 2024 · 38343d2 · 38343d2
1 parent bcd712f
commit 38343d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/crates/bitwarden-crypto/src/service/context.rs b/crates/bitwarden-crypto/src/service/context.rs
@@ -21,6 +21,7 @@ pub(crate) struct RustCryptoServiceContext<
     pub(crate) local_asymmetric_keys: Box<dyn KeyStore<AsymmKeyRef>>,
 }
 
+#[allow(unused)]
 impl<'a, SymmKeyRef: SymmetricKeyRef, AsymmKeyRef: AsymmetricKeyRef>
     RustCryptoServiceContext<'a, SymmKeyRef, AsymmKeyRef>
 {

diff --git a/crates/bitwarden-crypto/src/service/key_store/rust_impl.rs b/crates/bitwarden-crypto/src/service/key_store/rust_impl.rs
@@ -1,5 +1,3 @@
-use std::mem::MaybeUninit;
-
 use super::{
     util::{KeyData, SliceKeyStore},
     KeyRef,
@@ -17,8 +15,10 @@ pub(crate) struct RustImplKeyData<Key: KeyRef> {
 
 impl<Key: KeyRef> Drop for RustImplKeyData<Key> {
     fn drop(&mut self) {
-        #[cfg(any(not(target_arch = "wasm32"), not(feature = "no-memory-hardening")))]
+        #[cfg(all(not(target_arch = "wasm32"), not(feature = "no-memory-hardening")))]
         {
+            use std::mem::MaybeUninit;
+
             let entry_size = std::mem::size_of::<Option<(Key, Key::KeyValue)>>();
             unsafe {
                 memsec::munlock(
@@ -47,9 +47,10 @@ impl<Key: KeyRef> KeyData<Key> for RustImplKeyData<Key> {
     }
 
     fn with_capacity(capacity: usize) -> Self {
+        #[allow(unused_mut)]
         let mut data: Box<_> = std::iter::repeat_with(|| None).take(capacity).collect();
 
-        #[cfg(any(not(target_arch = "wasm32"), not(feature = "no-memory-hardening")))]
+        #[cfg(all(not(target_arch = "wasm32"), not(feature = "no-memory-hardening")))]
         {
             let entry_size = std::mem::size_of::<Option<(Key, Key::KeyValue)>>();
             unsafe {