added fixes for windows and serde

Signed-off-by: Michael Lodder <redmike7@gmail.com>

Author: mikelodder7

.github/workflows/cryptex.yml

@@ -27,6 +27,7 @@ jobs:
           toolchain: stable
           components: clippy
       - run: cargo clippy --no-default-features --features linux-secret-service -- -D warnings
+      - run: cargo clippy --no-default-features --features serde -- -D warnings
       - run: cargo clippy --no-default-features --features file -- -D warnings
       - run: cargo clippy --no-default-features --features "linux-secret-service,file" -- -D warnings
 

Cargo.toml

@@ -27,12 +27,14 @@ file = ["argon2", "chacha20poly1305", "dirs", "rusqlite"]
 linux-secret-service = ["secret-service", "uzers"]
 macos-keychain = ["security-framework", "security-framework-sys", "core-foundation", "core-foundation-sys", "uzers"]
 windows-credentials = ["windows"]
+serde = ["dep:serde", "postcard"]
 
 [dependencies]
 clap = "4"
 colored = "3.0"
 hex = "0.4"
 rpassword = "7"
+postcard = { version = "1", features = ["use-std"] , optional = true }
 serde = { version = "1", optional = true }
 subtle = "2"
 whoami = "2"
@@ -60,6 +62,5 @@ windows = { version = "0.62", features = [
     "Win32_Foundation",
     "Win32_Security_Credentials",
     "Win32_Security_Cryptography",
-    "Win32_Storage_FileSystem",
 ], optional = true }
 

src/keyring/keyringsecret.rs

@@ -13,7 +13,7 @@ use crate::error::KeyRingError;
 #[cfg(feature = "serde")]
 use serde::{
     Deserialize, Deserializer, Serialize, Serializer,
-    de::{Error as DError, Visitor},
+    de::{DeserializeOwned, Error as DError, Visitor},
 };
 use zeroize::Zeroize;
 
@@ -65,6 +65,21 @@ impl KeyRingSecret {
     pub fn is_empty(&self) -> bool {
         self.0.is_empty()
     }
+
+    #[cfg(feature = "serde")]
+    pub fn from_serde<S: Serialize>(input: S) -> Result<Self, KeyRingError> {
+        Ok(Self(
+            postcard::to_stdvec(&input).map_err(|e| KeyRingError::from(e.to_string().as_str()))?,
+        ))
+    }
+
+    #[cfg(feature = "serde")]
+    pub fn to_serde<D: DeserializeOwned>(&self) -> Result<D, KeyRingError> {
+        Ok(
+            postcard::from_bytes(&self.0)
+                .map_err(|e| KeyRingError::from(e.to_string().as_str()))?,
+        )
+    }
 }
 
 impl PartialEq for KeyRingSecret {

src/keyring/sqlcipher.rs

@@ -125,15 +125,19 @@ fn get_keyring_file(in_path: Option<PathBuf>) -> PathBuf {
 
 #[cfg(target_os = "windows")]
 fn make_hidden(path: &Path) {
-    use ::windows::Win32::Storage::FileSystem::{FILE_ATTRIBUTE_HIDDEN, SetFileAttributesW};
-    use ::windows::core::PCWSTR;
     use std::ffi::OsStr;
     use std::iter::once;
     use std::os::windows::ffi::OsStrExt;
 
+    const FILE_ATTRIBUTE_HIDDEN: u32 = 0x2;
+
+    unsafe extern "system" {
+        fn SetFileAttributesW(lpfilename: *const u16, dwfileattributes: u32) -> i32;
+    }
+
     let wide: Vec<u16> = OsStr::new(path).encode_wide().chain(once(0)).collect();
     unsafe {
-        let _ = SetFileAttributesW(PCWSTR(wide.as_ptr()), FILE_ATTRIBUTE_HIDDEN);
+        SetFileAttributesW(wide.as_ptr(), FILE_ATTRIBUTE_HIDDEN);
     }
 }