From 9edd459d86e744f841f36b028ca98cc3c377bd60 Mon Sep 17 00:00:00 2001
From: Heiko Schaefer <heiko@schaefer.name>
Date: Thu, 21 Apr 2022 16:15:28 +0200
Subject: [PATCH] Update to rpassword 6

---
 tools/Cargo.toml               | 2 +-
 tools/src/bin/opgpcard/main.rs | 2 +-
 tools/src/bin/opgpcard/util.rs | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/Cargo.toml b/tools/Cargo.toml
index 78c4a9f..6c92e3c 100644
--- a/tools/Cargo.toml
+++ b/tools/Cargo.toml
@@ -17,7 +17,7 @@ openpgp-card = { path = "../openpgp-card", version = "0.2.3" }
 openpgp-card-pcsc = { path = "../pcsc", version = "0.2" }
 openpgp-card-sequoia = { path = "../openpgp-card-sequoia", version = "0.0.10" }
 sshkeys = "0.3.2"
-rpassword = "5"
+rpassword = "6"
 anyhow = "1"
 clap = { version = "3.1", features = ["derive"] }
 env_logger = "0.9"
diff --git a/tools/src/bin/opgpcard/main.rs b/tools/src/bin/opgpcard/main.rs
index 2cba6fe..6c36b4b 100644
--- a/tools/src/bin/opgpcard/main.rs
+++ b/tools/src/bin/opgpcard/main.rs
@@ -321,7 +321,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                         load_pin(&path)?
                     } else {
                         // input resetting code
-                        rpassword::read_password_from_tty(Some("Enter resetting code: "))?
+                        rpassword::prompt_password("Enter resetting code: ")?
                             .as_bytes()
                             .to_vec()
                     };
diff --git a/tools/src/bin/opgpcard/util.rs b/tools/src/bin/opgpcard/util.rs
index 9fdea33..6de96aa 100644
--- a/tools/src/bin/opgpcard/util.rs
+++ b/tools/src/bin/opgpcard/util.rs
@@ -29,7 +29,7 @@ pub(crate) fn get_pin(open: &mut Open, pin_file: Option<PathBuf>, msg: &str) ->
         Some(load_pin(&path).ok()?)
     } else if !open.feature_pinpad_verify() {
         // we have no pin file and no pinpad
-        let pin = rpassword::read_password_from_tty(Some(msg)).ok()?;
+        let pin = rpassword::prompt_password(msg).ok()?;
         Some(pin.into_bytes())
     } else {
         // we have a pinpad
@@ -40,8 +40,8 @@ pub(crate) fn get_pin(open: &mut Open, pin_file: Option<PathBuf>, msg: &str) ->
 /// Let the user input a PIN twice, return PIN if both entries match, error otherwise
 pub(crate) fn input_pin_twice(msg1: &str, msg2: &str) -> Result<Vec<u8>> {
     // get new user pin
-    let newpin1 = rpassword::read_password_from_tty(Some(msg1))?;
-    let newpin2 = rpassword::read_password_from_tty(Some(msg2))?;
+    let newpin1 = rpassword::prompt_password(msg1)?;
+    let newpin2 = rpassword::prompt_password(msg2)?;
 
     if newpin1 != newpin2 {
         Err(anyhow::anyhow!("PINs do not match."))