From 7a71f88eb6f5811ef4b9d02b99acf78205cc71d8 Mon Sep 17 00:00:00 2001 From: Heiko Schaefer Date: Thu, 11 Nov 2021 16:37:23 +0100 Subject: [PATCH] Rename Open::open() to Open::new() --- card-functionality/src/list-cards.rs | 2 +- card-functionality/src/tests.rs | 2 +- openpgp-card-examples/src/bin/decrypt.rs | 2 +- openpgp-card-examples/src/bin/detach-sign.rs | 2 +- openpgp-card-sequoia/src/card.rs | 10 +++------- openpgp-card-sequoia/src/lib.rs | 10 +++++----- openpgp-card-sequoia/src/main.rs | 8 ++++---- tools/src/bin/opgpcard-pin/main.rs | 2 +- tools/src/bin/opgpcard/main.rs | 12 ++++++------ 9 files changed, 23 insertions(+), 27 deletions(-) diff --git a/card-functionality/src/list-cards.rs b/card-functionality/src/list-cards.rs index 0ff1477..1d68ce2 100644 --- a/card-functionality/src/list-cards.rs +++ b/card-functionality/src/list-cards.rs @@ -10,7 +10,7 @@ fn main() -> Result<()> { println!("The following OpenPGP cards are connected to your system:"); for mut ca in PcscClient::cards()? { - let open = Open::open(&mut ca)?; + let open = Open::new(&mut ca)?; println!(" {}", open.application_identifier()?.ident()); } diff --git a/card-functionality/src/tests.rs b/card-functionality/src/tests.rs index f22aefb..578e73f 100644 --- a/card-functionality/src/tests.rs +++ b/card-functionality/src/tests.rs @@ -254,7 +254,7 @@ pub fn test_keygen( public_key_material_to_key(&pkm, KeyType::Authentication, ts)?; // Generate a Cert for this set of generated keys - let mut open = Open::open(&mut ca)?; + let mut open = Open::new(&mut ca)?; let cert = make_cert(&mut open, key_sig, Some(key_dec), Some(key_aut), "123456")?; let armored = String::from_utf8(cert.armored().to_vec()?)?; diff --git a/openpgp-card-examples/src/bin/decrypt.rs b/openpgp-card-examples/src/bin/decrypt.rs index ab16cab..b759218 100644 --- a/openpgp-card-examples/src/bin/decrypt.rs +++ b/openpgp-card-examples/src/bin/decrypt.rs @@ -23,7 +23,7 @@ fn main() -> Result<(), Box> { let cert_file = &args[2]; let mut ca = PcscClient::open_by_ident(card_ident)?; - let mut open = Open::open(&mut ca)?; + let mut open = Open::new(&mut ca)?; let pin = std::fs::read_to_string(pin_file)?; diff --git a/openpgp-card-examples/src/bin/detach-sign.rs b/openpgp-card-examples/src/bin/detach-sign.rs index 1ac0bd3..9e0266b 100644 --- a/openpgp-card-examples/src/bin/detach-sign.rs +++ b/openpgp-card-examples/src/bin/detach-sign.rs @@ -24,7 +24,7 @@ fn main() -> Result<(), Box> { let cert_file = &args[2]; let mut ca = PcscClient::open_by_ident(card_ident)?; - let mut open = Open::open(&mut ca)?; + let mut open = Open::new(&mut ca)?; let pin = std::fs::read_to_string(pin_file)?; diff --git a/openpgp-card-sequoia/src/card.rs b/openpgp-card-sequoia/src/card.rs index ff5ef4a..3493fb0 100644 --- a/openpgp-card-sequoia/src/card.rs +++ b/openpgp-card-sequoia/src/card.rs @@ -47,22 +47,18 @@ pub struct Open<'a> { } impl<'a> Open<'a> { - pub fn open(card_app: &'a mut CardApp) -> Result { + pub fn new(card_app: &'a mut CardApp) -> Result { let ard = card_app.get_application_related_data()?; card_app.init_caps(&ard)?; - Ok(Self::new(card_app, ard)) - } - - fn new(card_app: &'a mut CardApp, ard: ApplicationRelatedData) -> Self { - Self { + Ok(Self { card_app, ard, pw1: false, pw1_sign: false, pw3: false, - } + }) } pub fn verify_user(&mut self, pin: &str) -> Result<(), Error> { diff --git a/openpgp-card-sequoia/src/lib.rs b/openpgp-card-sequoia/src/lib.rs index 1607e08..3adee2d 100644 --- a/openpgp-card-sequoia/src/lib.rs +++ b/openpgp-card-sequoia/src/lib.rs @@ -18,7 +18,7 @@ //! # fn main() -> Result<(), Box> { //! for card in PcscClient::cards()? { //! let mut ca = card.into(); -//! let open = Open::open(&mut ca)?; +//! let open = Open::new(&mut ca)?; //! println!("Found OpenPGP card with ident '{}'", //! open.application_identifier()?.ident()); //! } @@ -34,7 +34,7 @@ //! //! # fn main() -> Result<(), Box> { //! let mut ca = PcscClient::open_by_ident("abcd:12345678")?.into(); -//! let mut open = Open::open(&mut ca)?; +//! let mut open = Open::new(&mut ca)?; //! # Ok(()) //! # } //! ``` @@ -56,7 +56,7 @@ //! // Open card via PCSC //! use sequoia_openpgp::policy::StandardPolicy; //! let mut ca = PcscClient::open_by_ident("abcd:12345678")?.into(); -//! let mut open = Open::open(&mut ca)?; +//! let mut open = Open::new(&mut ca)?; //! //! // Get authorization for user access to the card with password //! open.verify_user("123456")?; @@ -97,7 +97,7 @@ //! // Open card via PCSC //! use sequoia_openpgp::policy::StandardPolicy; //! let mut ca = PcscClient::open_by_ident("abcd:12345678")?.into(); -//! let mut open = Open::open(&mut ca)?; +//! let mut open = Open::new(&mut ca)?; //! //! // Get authorization for signing access to the card with password //! open.verify_user_for_signing("123456")?; @@ -127,7 +127,7 @@ //! # fn main() -> Result<(), Box> { //! // Open card via PCSC //! let mut ca = PcscClient::open_by_ident("abcd:12345678")?.into(); -//! let mut open = Open::open(&mut ca)?; +//! let mut open = Open::new(&mut ca)?; //! //! // Get authorization for admin access to the card with password //! open.verify_admin("12345678")?; diff --git a/openpgp-card-sequoia/src/main.rs b/openpgp-card-sequoia/src/main.rs index 43b6703..48b3f08 100644 --- a/openpgp-card-sequoia/src/main.rs +++ b/openpgp-card-sequoia/src/main.rs @@ -36,7 +36,7 @@ fn main() -> Result<(), Box> { if let Ok(test_card_ident) = test_card_ident { let mut card = PcscClient::open_by_ident(&test_card_ident)?; - let mut open = Open::open(&mut card)?; + let mut open = Open::new(&mut card)?; // card metadata @@ -151,7 +151,7 @@ fn main() -> Result<(), Box> { // Open fresh Card for decrypt // ----------------------------- let mut card = PcscClient::open_by_ident(&test_card_ident)?; - let mut open = Open::open(&mut card)?; + let mut open = Open::new(&mut card)?; // Check that we're still using the expected card let app_id = open.application_identifier()?; @@ -190,7 +190,7 @@ fn main() -> Result<(), Box> { // Open fresh Card for signing // ----------------------------- let mut card = PcscClient::open_by_ident(&test_card_ident)?; - let mut open = Open::open(&mut card)?; + let mut open = Open::new(&mut card)?; // Sign open.verify_user_for_signing("123456")?; @@ -220,7 +220,7 @@ fn main() -> Result<(), Box> { println!("The following OpenPGP cards are connected to your system:"); for mut card in PcscClient::cards()? { - let open = Open::open(&mut card)?; + let open = Open::new(&mut card)?; println!(" {}", open.application_identifier()?.ident()); } } diff --git a/tools/src/bin/opgpcard-pin/main.rs b/tools/src/bin/opgpcard-pin/main.rs index c4770b8..68f8e03 100644 --- a/tools/src/bin/opgpcard-pin/main.rs +++ b/tools/src/bin/opgpcard-pin/main.rs @@ -14,7 +14,7 @@ fn main() -> Result<(), Box> { let cli = cli::Cli::from_args(); let mut card = PcscClient::open_by_ident(&cli.ident)?; - let mut open = Open::open(&mut card)?; + let mut open = Open::new(&mut card)?; match cli.cmd { cli::Command::SetUserPin {} => { diff --git a/tools/src/bin/opgpcard/main.rs b/tools/src/bin/opgpcard/main.rs index 6da2582..525970d 100644 --- a/tools/src/bin/opgpcard/main.rs +++ b/tools/src/bin/opgpcard/main.rs @@ -72,7 +72,7 @@ fn main() -> Result<(), Box> { cmd, } => { let mut card = util::open_card(&ident)?; - let mut open = Open::open(&mut card)?; + let mut open = Open::new(&mut card)?; match cmd { cli::AdminCommand::Name { name } => { @@ -138,7 +138,7 @@ fn list_cards() -> Result<()> { println!("Available OpenPGP cards:"); for mut card in cards { - let open = Open::open(&mut card)?; + let open = Open::new(&mut card)?; println!(" {}", open.application_identifier()?.ident()); } } else { @@ -158,7 +158,7 @@ fn print_status(ident: Option, verbose: bool) -> Result<()> { return Err(anyhow::anyhow!("Found {} cards", cards.len())); } }; - let mut open = Open::open(&mut ca)?; + let mut open = Open::new(&mut ca)?; print!("OpenPGP card {}", open.application_identifier()?.ident()); @@ -290,7 +290,7 @@ fn decrypt( let input = util::open_or_stdin(input.as_deref())?; let mut card = util::open_card(ident)?; - let mut open = Open::open(&mut card)?; + let mut open = Open::new(&mut card)?; let mut user = util::get_user(&mut open, pin_file)?; let d = user.decryptor(&cert, &p)?; @@ -315,7 +315,7 @@ fn sign_detached( let mut input = util::open_or_stdin(input.as_deref())?; let mut card = util::open_card(ident)?; - let mut open = Open::open(&mut card)?; + let mut open = Open::new(&mut card)?; let mut sign = util::get_sign(&mut open, pin_file)?; let s = sign.signer(&cert, &p)?; @@ -332,7 +332,7 @@ fn sign_detached( fn factory_reset(ident: &str) -> Result<()> { println!("Resetting Card {}", ident); let mut card = util::open_card(ident)?; - Open::open(&mut card)?.factory_reset() + Open::new(&mut card)?.factory_reset() } fn key_import_yolo(mut admin: Admin, key: &Cert) -> Result<()> {