turnkey/openpgp-card
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename 'prompt' parameters to 'pinpad_prompt'.

Browse source
This commit is contained in:
Heiko Schaefer 2022-05-31 00:30:17 +02:00
parent e9bac43cad
commit ccba7c7e9f
No known key found for this signature in database
GPG key ID: 4A849A1904CCBD7D
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
openpgp-card-sequoia/src/card.rs
View file

@ -71,8 +71,8 @@ impl<'a> Open<'a> {
Ok(()) Ok(())
} }
pub fn verify_user_pinpad(&mut self, prompt: &dyn Fn()) -> Result<(), Error> { pub fn verify_user_pinpad(&mut self, pinpad_prompt: &dyn Fn()) -> Result<(), Error> {
prompt(); pinpad_prompt();
let _ = self.opt.verify_pw1_user_pinpad()?; let _ = self.opt.verify_pw1_user_pinpad()?;
self.pw1 = true; self.pw1 = true;
@ -88,8 +88,11 @@ impl<'a> Open<'a> {
Ok(()) Ok(())
} }
pub fn verify_user_for_signing_pinpad(&mut self, prompt: &dyn Fn()) -> Result<(), Error> { pub fn verify_user_for_signing_pinpad(
prompt(); &mut self,
pinpad_prompt: &dyn Fn(),
) -> Result<(), Error> {
pinpad_prompt();
let _ = self.opt.verify_pw1_sign_pinpad()?; let _ = self.opt.verify_pw1_sign_pinpad()?;
@ -105,8 +108,8 @@ impl<'a> Open<'a> {
Ok(()) Ok(())
} }
pub fn verify_admin_pinpad(&mut self, prompt: &dyn Fn()) -> Result<(), Error> { pub fn verify_admin_pinpad(&mut self, pinpad_prompt: &dyn Fn()) -> Result<(), Error> {
prompt(); pinpad_prompt();
let _ = self.opt.verify_pw3_pinpad()?; let _ = self.opt.verify_pw3_pinpad()?;
self.pw3 = true; self.pw3 = true;
@ -131,8 +134,8 @@ impl<'a> Open<'a> {
self.opt.change_pw1(old, new) self.opt.change_pw1(old, new)
} }
pub fn change_user_pin_pinpad(&mut self, prompt: &dyn Fn()) -> Result<(), Error> { pub fn change_user_pin_pinpad(&mut self, pinpad_prompt: &dyn Fn()) -> Result<(), Error> {
prompt(); pinpad_prompt();
self.opt.change_pw1_pinpad() self.opt.change_pw1_pinpad()
} }
@ -144,8 +147,8 @@ impl<'a> Open<'a> {
self.opt.change_pw3(old, new) self.opt.change_pw3(old, new)
} }
pub fn change_admin_pin_pinpad(&mut self, prompt: &dyn Fn()) -> Result<(), Error> { pub fn change_admin_pin_pinpad(&mut self, pinpad_prompt: &dyn Fn()) -> Result<(), Error> {
prompt(); pinpad_prompt();
self.opt.change_pw3_pinpad() self.opt.change_pw3_pinpad()
} }