aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2020-04-06 07:37:54 -0400
committerJesse Luehrs <doy@tozt.net>2020-04-06 07:37:54 -0400
commit1da46a8e36bd881c7c3de5d5f53c33bf1035e908 (patch)
tree83073a78118f127bdd9e55d16d9e8198e9888043 /src
parent1c40a0f9ff0ced652ee8b74f2333000ca47a0692 (diff)
downloadrbw-1da46a8e36bd881c7c3de5d5f53c33bf1035e908.tar.gz
rbw-1da46a8e36bd881c7c3de5d5f53c33bf1035e908.zip
rename
Diffstat (limited to 'src')
-rw-r--r--src/bin/agent.rs10
-rw-r--r--src/pinentry.rs2
2 files changed, 5 insertions, 7 deletions
diff --git a/src/bin/agent.rs b/src/bin/agent.rs
index dedfe68..7c08216 100644
--- a/src/bin/agent.rs
+++ b/src/bin/agent.rs
@@ -62,9 +62,8 @@ async fn login(
) {
let mut state = state.write().await;
let email = "bitwarden@tozt.net"; // XXX read from config
- let password = rbw::pinentry::pinentry("prompt", "desc", tty)
- .await
- .unwrap();
+ let password =
+ rbw::pinentry::getpin("prompt", "desc", tty).await.unwrap();
let (access_token, iterations, protected_key) =
rbw::actions::login(email, &password).await.unwrap();
state.access_token = Some(access_token);
@@ -89,9 +88,8 @@ async fn unlock(
) {
let mut state = state.write().await;
let email = "bitwarden@tozt.net"; // XXX read from config
- let password = rbw::pinentry::pinentry("prompt", "desc", tty)
- .await
- .unwrap();
+ let password =
+ rbw::pinentry::getpin("prompt", "desc", tty).await.unwrap();
let (enc_key, mac_key) = rbw::actions::unlock(
email,
&password,
diff --git a/src/pinentry.rs b/src/pinentry.rs
index 8a25759..aced54f 100644
--- a/src/pinentry.rs
+++ b/src/pinentry.rs
@@ -2,7 +2,7 @@ use crate::prelude::*;
use tokio::io::AsyncWriteExt as _;
-pub async fn pinentry(
+pub async fn getpin(
prompt: &str,
desc: &str,
tty: Option<&str>,