diff --git a/card-functionality/src/util.rs b/card-functionality/src/util.rs index ca720c0..e9209c3 100644 --- a/card-functionality/src/util.rs +++ b/card-functionality/src/util.rs @@ -17,7 +17,7 @@ use sequoia_openpgp::serialize::stream::{ use sequoia_openpgp::Cert; use openpgp_card::card_do::KeyGenerationTime; -use openpgp_card::{CardApp, CardClient, KeyType}; +use openpgp_card::{CardClient, KeyType}; use openpgp_card_sequoia::sq_util; use openpgp_card_sequoia::util::vka_as_uploadable_key; diff --git a/openpgp-card-sequoia/src/card.rs b/openpgp-card-sequoia/src/card.rs index bfd259d..a3a2d06 100644 --- a/openpgp-card-sequoia/src/card.rs +++ b/openpgp-card-sequoia/src/card.rs @@ -16,7 +16,7 @@ use openpgp_card::card_do::{ ExtendedCapabilities, ExtendedLengthInfo, Fingerprint, HistoricalBytes, KeyGenerationTime, PWStatusBytes, SecuritySupportTemplate, Sex, }; -use openpgp_card::{CardApp, CardClient, Error, KeySet, KeyType, Response}; +use openpgp_card::{CardClient, Error, KeySet, KeyType, Response}; use crate::decryptor::CardDecryptor; use crate::signer::CardSigner; diff --git a/openpgp-card-sequoia/src/decryptor.rs b/openpgp-card-sequoia/src/decryptor.rs index 5085fbf..54ef097 100644 --- a/openpgp-card-sequoia/src/decryptor.rs +++ b/openpgp-card-sequoia/src/decryptor.rs @@ -15,7 +15,7 @@ use openpgp::Cert; use sequoia_openpgp as openpgp; use openpgp_card::crypto_data::Cryptogram; -use openpgp_card::{CardApp, CardClient, Error}; +use openpgp_card::{CardClient, Error}; use crate::sq_util; use crate::PublicKey; diff --git a/openpgp-card-sequoia/src/signer.rs b/openpgp-card-sequoia/src/signer.rs index 92ca700..2dca650 100644 --- a/openpgp-card-sequoia/src/signer.rs +++ b/openpgp-card-sequoia/src/signer.rs @@ -11,7 +11,7 @@ use openpgp::types::{Curve, PublicKeyAlgorithm}; use sequoia_openpgp as openpgp; use openpgp_card::crypto_data::Hash; -use openpgp_card::{CardApp, CardClient, Error}; +use openpgp_card::{CardClient, Error}; use crate::sq_util; use crate::PublicKey; diff --git a/pcsc/src/lib.rs b/pcsc/src/lib.rs index 2c538d5..05f295e 100644 --- a/pcsc/src/lib.rs +++ b/pcsc/src/lib.rs @@ -20,9 +20,8 @@ const FEATURE_MODIFY_PIN_DIRECT: u8 = 0x07; #[macro_export] macro_rules! start_tx { ($card:expr, $reselect:expr) => {{ - use anyhow::anyhow; use openpgp_card::{Error, SmartcardError}; - use pcsc::{Disposition, Protocols, ShareMode, Transaction}; + use pcsc::{Disposition, Protocols, ShareMode}; use std::collections::HashMap; let mut was_reset = false;