Merge pull request #195 from brotskydotcom/linux-native-feature

Release v3.0.3

This fixes #194 and updates all dependencies.

Author: brotskydotcom

Cargo.toml

@@ -6,7 +6,7 @@ keywords = ["password", "credential", "keychain", "keyring", "cross-platform"]
 license = "MIT OR Apache-2.0"
 name = "keyring"
 repository = "https://github.com/hwchen/keyring-rs.git"
-version = "3.0.2"
+version = "3.0.3"
 rust-version = "1.75"
 edition = "2021"
 exclude = [".github/"]

README.md

@@ -99,6 +99,7 @@ Thanks to the following for helping make this library better, whether through co
 - @Alexei-Barnes
 - @benwr
 - @bhkaminski
+- @Brooooooklyn
 - @brotskydotcom
 - @complexspaces
 - @connor4312

src/keyutils.rs

@@ -147,7 +147,7 @@ impl CredentialApi for KeyutilsCredential {
         // Add to the session keyring
         let key = self
             .session
-            .add_key(&self.description, password)
+            .add_key(&self.description, secret)
             .map_err(decode_error)?;
 
         // Directly link to the persistent keyring as well

src/lib.rs

@@ -169,8 +169,8 @@ pub mod mock;
 // no duplicate keystores on any platform
 //
 #[cfg(any(
-    all(feature = "linux-keyutils", feature = "sync-secret-service"),
-    all(feature = "linux-keyutils", feature = "async-secret-service"),
+    all(feature = "linux-native", feature = "sync-secret-service"),
+    all(feature = "linux-native", feature = "async-secret-service"),
     all(feature = "sync-secret-service", feature = "async-secret-service")
 ))]
 compile_error!("You can enable at most one keystore per target architecture");
@@ -179,9 +179,9 @@ compile_error!("You can enable at most one keystore per target architecture");
 // Pick the *nix keystore
 //
 
-#[cfg(all(target_os = "linux", feature = "linux-keyutils"))]
+#[cfg(all(target_os = "linux", feature = "linux-native"))]
 pub mod keyutils;
-#[cfg(all(target_os = "linux", feature = "linux-keyutils"))]
+#[cfg(all(target_os = "linux", feature = "linux-native"))]
 use keyutils as default;
 
 #[cfg(all(
@@ -198,7 +198,7 @@ use secret_service as default;
 #[cfg(all(
     target_os = "linux",
     not(any(
-        feature = "linux-keyutils",
+        feature = "linux-native",
         feature = "sync-secret-service",
         feature = "async-secret-service"
     ))

tests/basic.rs

@@ -14,7 +14,7 @@ fn test_missing_entry() {
 }
 
 #[test]
-#[cfg(all(target_os = "linux", not(feature = "linux-default-keyutils")))]
+#[cfg(all(target_os = "linux", not(feature = "linux-native")))]
 fn test_empty_password() {
     let name = generate_random_string();
     let entry = Entry::new(&name, &name).expect("Can't create entry");