summaryrefslogtreecommitdiffstats
path: root/openpgp
diff options
context:
space:
mode:
authorNora Widdecke <nora@sequoia-pgp.org>2022-09-08 17:49:08 +0200
committerNora Widdecke <nora@sequoia-pgp.org>2022-09-29 20:10:57 +0200
commit7936e3513ee339650a7ac2eff11edd2fac3f037d (patch)
treef57c47e23b8781d0690c8b39f9b9917e1f19edea /openpgp
parentf89695585459799981d83c0b6eecb13511490e56 (diff)
openpgp, sq: Update dependency rpassword to 6.
- rpassword underwent some rework. The successor of read_password_from_tty seems to be prompt_password, relevant commits to rpassword: - e6023757df00a67a1e16796db50c5ffad41b6268 - 2edf6cee07573ec4aa86531e6177ee90331d5c60
Diffstat (limited to 'openpgp')
-rw-r--r--openpgp/Cargo.toml2
-rw-r--r--openpgp/examples/notarize.rs7
-rw-r--r--openpgp/examples/sign-detached.rs7
-rw-r--r--openpgp/examples/sign.rs7
4 files changed, 13 insertions, 10 deletions
diff --git a/openpgp/Cargo.toml b/openpgp/Cargo.toml
index f9ce98ee..6b24955d 100644
--- a/openpgp/Cargo.toml
+++ b/openpgp/Cargo.toml
@@ -87,7 +87,7 @@ lalrpop = { version = ">=0.17", default-features = false }
[dev-dependencies]
quickcheck = { version = "1", default-features = false }
rand = { version = "0.8" }
-rpassword = "5.0"
+rpassword = "6.0"
criterion = { version = "0.3.4", features = ["html_reports"] }
[features]
diff --git a/openpgp/examples/notarize.rs b/openpgp/examples/notarize.rs
index 22fbf301..95e2e171 100644
--- a/openpgp/examples/notarize.rs
+++ b/openpgp/examples/notarize.rs
@@ -39,9 +39,10 @@ fn main() -> openpgp::Result<()> {
keys.push({
let mut key = key.clone();
if key.secret().is_encrypted() {
- let password = rpassword::read_password_from_tty(
- Some(&format!("Please enter password to decrypt \
- {}/{}: ",tsk, key)))?;
+ let password = rpassword::prompt_password(format!(
+ "Please enter password to decrypt {}/{}: ",
+ tsk, key
+ ))?;
let algo = key.pk_algo();
key.secret_mut()
.decrypt_in_place(algo, &password.into())
diff --git a/openpgp/examples/sign-detached.rs b/openpgp/examples/sign-detached.rs
index dfc46ab5..3360f7f8 100644
--- a/openpgp/examples/sign-detached.rs
+++ b/openpgp/examples/sign-detached.rs
@@ -36,9 +36,10 @@ fn main() -> openpgp::Result<()> {
keys.push({
let mut key = key.clone();
if key.secret().is_encrypted() {
- let password = rpassword::read_password_from_tty(
- Some(&format!("Please enter password to decrypt \
- {}/{}: ",tsk, key)))?;
+ let password = rpassword::prompt_password(format!(
+ "Please enter password to decrypt {}/{}: ",
+ tsk, key
+ ))?;
let algo = key.pk_algo();
key.secret_mut()
.decrypt_in_place(algo, &password.into())
diff --git a/openpgp/examples/sign.rs b/openpgp/examples/sign.rs
index 02feea96..585242c4 100644
--- a/openpgp/examples/sign.rs
+++ b/openpgp/examples/sign.rs
@@ -34,9 +34,10 @@ fn main() -> openpgp::Result<()> {
keys.push({
let mut key = key.clone();
if key.secret().is_encrypted() {
- let password = rpassword::read_password_from_tty(
- Some(&format!("Please enter password to decrypt \
- {}/{}: ",tsk, key)))?;
+ let password = rpassword::prompt_password(format!(
+ "Please enter password to decrypt {}/{}: ",
+ tsk, key
+ ))?;
let algo = key.pk_algo();
key.secret_mut()
.decrypt_in_place(algo, &password.into())