From 1104e60b331b92b2e6f11db7b19fcdfbbf3c3fb4 Mon Sep 17 00:00:00 2001 From: Heiko Schaefer Date: Thu, 27 Oct 2022 11:01:39 +0200 Subject: [PATCH] examples: use new Card interface --- openpgp-card-examples/src/bin/decrypt.rs | 12 ++++++------ openpgp-card-examples/src/bin/detach-sign.rs | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/openpgp-card-examples/src/bin/decrypt.rs b/openpgp-card-examples/src/bin/decrypt.rs index 4c8c7bb..fd276d6 100644 --- a/openpgp-card-examples/src/bin/decrypt.rs +++ b/openpgp-card-examples/src/bin/decrypt.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MIT OR Apache-2.0 use openpgp_card_pcsc::PcscBackend; -use openpgp_card_sequoia::card::Card; +use openpgp_card_sequoia::card::{Card, Open}; use openpgp::parse::{stream::DecryptorBuilder, Parse}; use openpgp::policy::StandardPolicy; @@ -19,16 +19,16 @@ fn main() -> Result<(), Box> { let card_ident = &args[0]; let pin_file = &args[1]; - let card_backend = PcscBackend::open_by_ident(card_ident, None)?; + let backend = PcscBackend::open_by_ident(card_ident, None)?; - let mut card = Card::new(card_backend); - let mut open = card.transaction()?; + let mut card: Card = backend.into(); + let mut transaction = card.transaction()?; let pin = std::fs::read(pin_file)?; - open.verify_user(&pin)?; + transaction.verify_user(&pin)?; - let mut user = open.user_card().unwrap(); + let mut user = transaction.user_card().unwrap(); let p = StandardPolicy::new(); diff --git a/openpgp-card-examples/src/bin/detach-sign.rs b/openpgp-card-examples/src/bin/detach-sign.rs index 7aa36c0..fc64101 100644 --- a/openpgp-card-examples/src/bin/detach-sign.rs +++ b/openpgp-card-examples/src/bin/detach-sign.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MIT OR Apache-2.0 use openpgp_card_pcsc::PcscBackend; -use openpgp_card_sequoia::card::Card; +use openpgp_card_sequoia::card::{Card, Open}; use openpgp::serialize::stream::{Armorer, Message, Signer}; use sequoia_openpgp as openpgp; @@ -18,16 +18,16 @@ fn main() -> Result<(), Box> { let card_ident = &args[0]; let pin_file = &args[1]; - let card_backend = PcscBackend::open_by_ident(card_ident, None)?; + let backend = PcscBackend::open_by_ident(card_ident, None)?; - let mut card = Card::new(card_backend); - let mut open = card.transaction()?; + let mut card: Card = backend.into(); + let mut transaction = card.transaction()?; let pin = std::fs::read(pin_file)?; - open.verify_user_for_signing(&pin)?; + transaction.verify_user_for_signing(&pin)?; - let mut sign = open.signing_card().unwrap(); + let mut sign = transaction.signing_card().unwrap(); let s = sign.signer(&|| println!("Touch confirmation needed for signing"))?; let stdout = std::io::stdout();