diff --git a/Cargo.toml b/Cargo.toml index 4b08f5c..d0818c0 100644 --- a/Cargo.toml +++ b/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/"] diff --git a/README.md b/README.md index 799447a..2c36a2d 100644 --- a/README.md +++ b/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 diff --git a/src/keyutils.rs b/src/keyutils.rs index 4ef1ae8..fa17708 100644 --- a/src/keyutils.rs +++ b/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 diff --git a/src/lib.rs b/src/lib.rs index 5804faf..974e879 100644 --- a/src/lib.rs +++ b/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" )) diff --git a/tests/basic.rs b/tests/basic.rs index 1f2f6de..77a646f 100644 --- a/tests/basic.rs +++ b/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");