diff --git a/openpgp-card-examples/Cargo.toml b/openpgp-card-examples/Cargo.toml index 670fc31..4b53124 100644 --- a/openpgp-card-examples/Cargo.toml +++ b/openpgp-card-examples/Cargo.toml @@ -16,6 +16,7 @@ sequoia-openpgp = "1.3" nettle = "7" openpgp-card = { path = "../openpgp-card", version = "0.1" } openpgp-card-pcsc = { path = "../pcsc", version = "0.1" } +pcsc="2" openpgp-card-sequoia = { path = "../openpgp-card-sequoia", version = "0.0.7" } chrono = "0.4" anyhow = "1" diff --git a/openpgp-card-examples/src/bin/decrypt.rs b/openpgp-card-examples/src/bin/decrypt.rs index 006f529..f130daf 100644 --- a/openpgp-card-examples/src/bin/decrypt.rs +++ b/openpgp-card-examples/src/bin/decrypt.rs @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2021 Wiktor Kwapisiewicz // SPDX-License-Identifier: MIT OR Apache-2.0 -use openpgp_card_pcsc::PcscCard; +use openpgp_card_pcsc::{get_txc, PcscCard, TxClient}; use openpgp_card_sequoia::card::Open; @@ -22,8 +22,10 @@ fn main() -> Result<(), Box> { let pin_file = &args[1]; let cert_file = &args[2]; - let mut ca = PcscCard::open_by_ident(card_ident)?; - let mut open = Open::new(&mut ca)?; + let mut card = PcscCard::open_by_ident(card_ident)?; + let mut txc = get_txc!(card)?; + + let mut open = Open::new(&mut txc)?; 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 cb01ef4..17cf994 100644 --- a/openpgp-card-examples/src/bin/detach-sign.rs +++ b/openpgp-card-examples/src/bin/detach-sign.rs @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2021 Wiktor Kwapisiewicz // SPDX-License-Identifier: MIT OR Apache-2.0 -use openpgp_card_pcsc::PcscCard; +use openpgp_card_pcsc::{get_txc, PcscCard, TxClient}; use openpgp_card_sequoia::card::Open; @@ -22,8 +22,10 @@ fn main() -> Result<(), Box> { let pin_file = &args[1]; let cert_file = &args[2]; - let mut ca = PcscCard::open_by_ident(card_ident)?; - let mut open = Open::new(&mut ca)?; + let mut card = PcscCard::open_by_ident(card_ident)?; + let mut txc = get_txc!(card)?; + + let mut open = Open::new(&mut txc)?; let pin = std::fs::read_to_string(pin_file)?;