diff --git a/Cargo.lock b/Cargo.lock index 88d515824f9..318adc7f37e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1212,9 +1212,20 @@ dependencies = [ [[package]] name = "rpassword" -version = "5.0.1" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +dependencies = [ + "libc", + "rtoolbox", + "winapi", +] + +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" dependencies = [ "libc", "winapi", diff --git a/Cargo.toml b/Cargo.toml index 82bd1cde716..fa9f101a323 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -166,7 +166,7 @@ version = "1.3.1" optional = true [dependencies.rpassword] -version = "5.0.0" +version = "7.2.0" optional = true [dependencies.serde] diff --git a/src/jsonrpc/client/key.rs b/src/jsonrpc/client/key.rs index e7a1bdfc76c..8e7db158375 100644 --- a/src/jsonrpc/client/key.rs +++ b/src/jsonrpc/client/key.rs @@ -19,8 +19,7 @@ pub fn key_set(key_desc: KeyDescription, keyfile_path: Option<&str>) -> StratisR do_request!(KeySet, key_desc; file.as_raw_fd()) } None => { - let password = - rpassword::prompt_password_stdout("Enter passphrase followed by return: ")?; + let password = rpassword::prompt_password("Enter passphrase followed by return: ")?; if password.is_empty() { return Ok(()); } diff --git a/src/jsonrpc/client/pool.rs b/src/jsonrpc/client/pool.rs index 1a1338f87fc..c26e1e8d233 100644 --- a/src/jsonrpc/client/pool.rs +++ b/src/jsonrpc/client/pool.rs @@ -29,7 +29,7 @@ pub fn pool_start( prompt: bool, ) -> StratisResult<()> { if prompt { - let password = rpassword::prompt_password_stdout("Enter passphrase followed by return: ")?; + let password = rpassword::prompt_password("Enter passphrase followed by return: ")?; if password.is_empty() { return Ok(()); } diff --git a/tests/stratis_min.rs b/tests/stratis_min.rs index 48b28e50d70..4d6fac27f03 100644 --- a/tests/stratis_min.rs +++ b/tests/stratis_min.rs @@ -248,23 +248,3 @@ fn stratis_min_list_default() { fn test_stratis_min_list_defaults() { test_with_stratisd_min_sim(stratis_min_list_default); } - -fn stratis_min_capture_key() { - let mut cmd = Command::cargo_bin("stratis-min").unwrap(); - let key = "akey"; - cmd.arg("key").arg("set").arg("--capture-key").arg(key); - cmd.write_stdin("keyval"); - cmd.assert().success(); - let mut cmd = Command::cargo_bin("stratis-min").unwrap(); - cmd.arg("key") - .assert() - .success() - .stdout(predicate::str::contains(key)); -} - -#[test] -// Verify that adding a key using --capture-key works and -// lists the new key in the output of 'keys'. -fn test_stratis_min_capture_key() { - test_with_stratisd_min_sim(stratis_min_capture_key); -}