From fd441dbd147bdfbad4ff945a1e1ad950fa731882 Mon Sep 17 00:00:00 2001
From: Heiko Schaefer <heiko@schaefer.name>
Date: Fri, 28 Oct 2022 18:32:24 +0200
Subject: [PATCH] adjust to changed openpgp-card-sequoia API

---
 card-functionality/src/list-cards.rs             | 2 +-
 card-functionality/src/tests.rs                  | 7 ++++---
 openpgp-card-examples/src/bin/decrypt.rs         | 2 +-
 openpgp-card-examples/src/bin/detach-sign.rs     | 2 +-
 tools/src/bin/opgpcard/commands/admin.rs         | 4 ++--
 tools/src/bin/opgpcard/commands/attestation.rs   | 2 +-
 tools/src/bin/opgpcard/commands/decrypt.rs       | 2 +-
 tools/src/bin/opgpcard/commands/factory_reset.rs | 2 +-
 tools/src/bin/opgpcard/commands/info.rs          | 2 +-
 tools/src/bin/opgpcard/commands/pin.rs           | 2 +-
 tools/src/bin/opgpcard/commands/pubkey.rs        | 8 ++++----
 tools/src/bin/opgpcard/commands/set_identity.rs  | 2 +-
 tools/src/bin/opgpcard/commands/sign.rs          | 2 +-
 tools/src/bin/opgpcard/commands/ssh.rs           | 4 ++--
 tools/src/bin/opgpcard/commands/status.rs        | 8 ++++----
 tools/src/bin/opgpcard/main.rs                   | 2 +-
 tools/src/bin/opgpcard/util.rs                   | 3 ++-
 17 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/card-functionality/src/list-cards.rs b/card-functionality/src/list-cards.rs
index 9af379d..627a95d 100644
--- a/card-functionality/src/list-cards.rs
+++ b/card-functionality/src/list-cards.rs
@@ -4,7 +4,7 @@
 use anyhow::Result;
 
 use openpgp_card_pcsc::PcscBackend;
-use openpgp_card_sequoia::card::{Card, Open};
+use openpgp_card_sequoia::{state::Open, Card};
 
 fn main() -> Result<()> {
     println!("The following OpenPGP cards are connected to your system:");
diff --git a/card-functionality/src/tests.rs b/card-functionality/src/tests.rs
index d713706..b445007 100644
--- a/card-functionality/src/tests.rs
+++ b/card-functionality/src/tests.rs
@@ -16,10 +16,11 @@ use sequoia_openpgp::Cert;
 use openpgp_card::algorithm::AlgoSimple;
 use openpgp_card::card_do::{KeyGenerationTime, Sex};
 use openpgp_card::{Error, KeyType, OpenPgp, OpenPgpTransaction, StatusBytes};
-use openpgp_card_sequoia::card::{Card, Transaction};
+use openpgp_card_sequoia::sq_util;
 use openpgp_card_sequoia::util::{
     make_cert, public_key_material_and_fp_to_key, public_key_material_to_key,
 };
+use openpgp_card_sequoia::{state::Transaction, Card};
 
 use crate::cards::TestCardData;
 use crate::util;
@@ -72,7 +73,7 @@ pub fn test_decrypt(pgp: &mut OpenPgp, param: &[&str]) -> Result<TestOutput, Tes
     let mut user = transaction.user_card().unwrap();
     let d = user.decryptor(&|| {})?;
 
-    let res = openpgp_card_sequoia::util::decrypt(d, msg.into_bytes(), &p)?;
+    let res = sq_util::decrypt(d, msg.into_bytes(), &p)?;
     let plain = String::from_utf8_lossy(&res);
 
     assert_eq!(plain, "Hello world!\n");
@@ -96,7 +97,7 @@ pub fn test_sign(pgp: &mut OpenPgp, param: &[&str]) -> Result<TestOutput, TestEr
     let s = sign.signer(&|| {})?;
 
     let msg = "Hello world, I am signed.";
-    let sig = openpgp_card_sequoia::util::sign(s, &mut msg.as_bytes())?;
+    let sig = sq_util::sign(s, &mut msg.as_bytes())?;
 
     // validate sig
     assert!(util::verify_sig(&cert, msg.as_bytes(), sig.as_bytes())?);
diff --git a/openpgp-card-examples/src/bin/decrypt.rs b/openpgp-card-examples/src/bin/decrypt.rs
index fd276d6..ee90d7c 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, Open};
+use openpgp_card_sequoia::{state::Open, Card};
 
 use openpgp::parse::{stream::DecryptorBuilder, Parse};
 use openpgp::policy::StandardPolicy;
diff --git a/openpgp-card-examples/src/bin/detach-sign.rs b/openpgp-card-examples/src/bin/detach-sign.rs
index fc64101..fa72315 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, Open};
+use openpgp_card_sequoia::{state::Open, Card};
 
 use openpgp::serialize::stream::{Armorer, Message, Signer};
 use sequoia_openpgp as openpgp;
diff --git a/tools/src/bin/opgpcard/commands/admin.rs b/tools/src/bin/opgpcard/commands/admin.rs
index 7315900..a6f19b0 100644
--- a/tools/src/bin/opgpcard/commands/admin.rs
+++ b/tools/src/bin/opgpcard/commands/admin.rs
@@ -5,7 +5,7 @@
 
 use anyhow::{anyhow, Result};
 use clap::{Parser, ValueEnum};
-use openpgp_card_sequoia::card::{Admin, Open, Transaction};
+use openpgp_card_sequoia::state::{Admin, Open, Transaction};
 use openpgp_card_sequoia::util::public_key_material_to_key;
 use sequoia_openpgp::types::{HashAlgorithm, SymmetricAlgorithm};
 
@@ -23,7 +23,7 @@ use sequoia_openpgp::serialize::SerializeInto;
 use sequoia_openpgp::Cert;
 
 use openpgp_card_sequoia::types::AlgoSimple;
-use openpgp_card_sequoia::{card::Card, types::KeyType};
+use openpgp_card_sequoia::{types::KeyType, Card};
 
 use crate::versioned_output::{OutputBuilder, OutputFormat, OutputVersion};
 use crate::{output, util, ENTER_ADMIN_PIN, ENTER_USER_PIN};
diff --git a/tools/src/bin/opgpcard/commands/attestation.rs b/tools/src/bin/opgpcard/commands/attestation.rs
index 02801bd..357a044 100644
--- a/tools/src/bin/opgpcard/commands/attestation.rs
+++ b/tools/src/bin/opgpcard/commands/attestation.rs
@@ -7,7 +7,7 @@ use std::path::PathBuf;
 
 use anyhow::Result;
 use clap::{Parser, ValueEnum};
-use openpgp_card_sequoia::card::{Card, Open};
+use openpgp_card_sequoia::{state::Open, Card};
 
 use openpgp_card_sequoia::types::KeyType;
 
diff --git a/tools/src/bin/opgpcard/commands/decrypt.rs b/tools/src/bin/opgpcard/commands/decrypt.rs
index ffdb98b..9fe6bc6 100644
--- a/tools/src/bin/opgpcard/commands/decrypt.rs
+++ b/tools/src/bin/opgpcard/commands/decrypt.rs
@@ -7,7 +7,7 @@ use clap::Parser;
 
 use std::path::PathBuf;
 
-use openpgp_card_sequoia::card::{Card, Open};
+use openpgp_card_sequoia::{state::Open, Card};
 use sequoia_openpgp::{
     parse::{stream::DecryptorBuilder, Parse},
     policy::StandardPolicy,
diff --git a/tools/src/bin/opgpcard/commands/factory_reset.rs b/tools/src/bin/opgpcard/commands/factory_reset.rs
index dcff395..9379d3b 100644
--- a/tools/src/bin/opgpcard/commands/factory_reset.rs
+++ b/tools/src/bin/opgpcard/commands/factory_reset.rs
@@ -4,7 +4,7 @@
 
 use anyhow::{anyhow, Result};
 use clap::Parser;
-use openpgp_card_sequoia::card::{Card, Open};
+use openpgp_card_sequoia::{state::Open, Card};
 
 use crate::util;
 
diff --git a/tools/src/bin/opgpcard/commands/info.rs b/tools/src/bin/opgpcard/commands/info.rs
index 6bcbbd4..278da5c 100644
--- a/tools/src/bin/opgpcard/commands/info.rs
+++ b/tools/src/bin/opgpcard/commands/info.rs
@@ -5,7 +5,7 @@
 
 use anyhow::Result;
 use clap::Parser;
-use openpgp_card_sequoia::card::{Card, Open};
+use openpgp_card_sequoia::{state::Open, Card};
 
 use crate::output;
 use crate::pick_card_for_reading;
diff --git a/tools/src/bin/opgpcard/commands/pin.rs b/tools/src/bin/opgpcard/commands/pin.rs
index 650f662..4e12f2f 100644
--- a/tools/src/bin/opgpcard/commands/pin.rs
+++ b/tools/src/bin/opgpcard/commands/pin.rs
@@ -7,7 +7,7 @@ use std::path::PathBuf;
 use anyhow::Result;
 use clap::Parser;
 
-use openpgp_card_sequoia::card::{Card, Open, Transaction};
+use openpgp_card_sequoia::{state::Open, state::Transaction, Card};
 
 use crate::util;
 use crate::util::{load_pin, print_gnuk_note};
diff --git a/tools/src/bin/opgpcard/commands/pubkey.rs b/tools/src/bin/opgpcard/commands/pubkey.rs
index c8f7708..ba09100 100644
--- a/tools/src/bin/opgpcard/commands/pubkey.rs
+++ b/tools/src/bin/opgpcard/commands/pubkey.rs
@@ -8,7 +8,7 @@ use clap::Parser;
 
 use std::path::PathBuf;
 
-use openpgp_card_sequoia::card::{Card, Open};
+use openpgp_card_sequoia::{state::Open, Card};
 use sequoia_openpgp::serialize::SerializeInto;
 
 use openpgp_card_sequoia::types::KeyType;
@@ -58,7 +58,7 @@ pub fn print_pubkey(
 
     let user_pin = util::get_pin(&mut card, command.user_pin, crate::ENTER_USER_PIN)?;
 
-    let pkm = card.public_key(KeyType::Signing)?;
+    let pkm = card.public_key_material(KeyType::Signing)?;
     let times = card.key_generation_times()?;
     let fps = card.fingerprints()?;
 
@@ -70,7 +70,7 @@ pub fn print_pubkey(
     )?;
 
     let mut key_dec = None;
-    if let Ok(pkm) = card.public_key(KeyType::Decryption) {
+    if let Ok(pkm) = card.public_key_material(KeyType::Decryption) {
         if let Some(ts) = times.decryption() {
             key_dec = Some(public_key_material_and_fp_to_key(
                 &pkm,
@@ -82,7 +82,7 @@ pub fn print_pubkey(
     }
 
     let mut key_aut = None;
-    if let Ok(pkm) = card.public_key(KeyType::Authentication) {
+    if let Ok(pkm) = card.public_key_material(KeyType::Authentication) {
         if let Some(ts) = times.authentication() {
             key_aut = Some(public_key_material_and_fp_to_key(
                 &pkm,
diff --git a/tools/src/bin/opgpcard/commands/set_identity.rs b/tools/src/bin/opgpcard/commands/set_identity.rs
index 6fc61b0..95f6544 100644
--- a/tools/src/bin/opgpcard/commands/set_identity.rs
+++ b/tools/src/bin/opgpcard/commands/set_identity.rs
@@ -4,7 +4,7 @@
 
 use anyhow::Result;
 use clap::{Parser, ValueEnum};
-use openpgp_card_sequoia::card::{Card, Open};
+use openpgp_card_sequoia::{state::Open, Card};
 
 use crate::util;
 
diff --git a/tools/src/bin/opgpcard/commands/sign.rs b/tools/src/bin/opgpcard/commands/sign.rs
index 901cf0f..469e4d3 100644
--- a/tools/src/bin/opgpcard/commands/sign.rs
+++ b/tools/src/bin/opgpcard/commands/sign.rs
@@ -7,7 +7,7 @@ use clap::Parser;
 
 use std::path::{Path, PathBuf};
 
-use openpgp_card_sequoia::card::{Card, Open};
+use openpgp_card_sequoia::{state::Open, Card};
 use sequoia_openpgp::serialize::stream::{Armorer, Message, Signer};
 
 use crate::util;
diff --git a/tools/src/bin/opgpcard/commands/ssh.rs b/tools/src/bin/opgpcard/commands/ssh.rs
index a974a32..fa97f12 100644
--- a/tools/src/bin/opgpcard/commands/ssh.rs
+++ b/tools/src/bin/opgpcard/commands/ssh.rs
@@ -5,7 +5,7 @@
 
 use anyhow::Result;
 use clap::Parser;
-use openpgp_card_sequoia::card::{Card, Open};
+use openpgp_card_sequoia::{state::Open, Card};
 
 use openpgp_card_sequoia::types::KeyType;
 
@@ -49,7 +49,7 @@ pub fn print_ssh(
     }
 
     // Show authentication subkey as openssh public key string
-    if let Ok(pkm) = card.public_key(KeyType::Authentication) {
+    if let Ok(pkm) = card.public_key_material(KeyType::Authentication) {
         if let Ok(ssh) = util::get_ssh_pubkey_string(&pkm, ident) {
             output.ssh_public_key(ssh);
         }
diff --git a/tools/src/bin/opgpcard/commands/status.rs b/tools/src/bin/opgpcard/commands/status.rs
index 823aa15..599b447 100644
--- a/tools/src/bin/opgpcard/commands/status.rs
+++ b/tools/src/bin/opgpcard/commands/status.rs
@@ -5,7 +5,7 @@
 
 use anyhow::Result;
 use clap::Parser;
-use openpgp_card_sequoia::card::{Card, Open};
+use openpgp_card_sequoia::{state::Open, Card};
 
 use openpgp_card_sequoia::types::KeyType;
 
@@ -101,7 +101,7 @@ pub fn print_status(
     }
 
     if command.pkm {
-        if let Ok(pkm) = card.public_key(KeyType::Signing) {
+        if let Ok(pkm) = card.public_key_material(KeyType::Signing) {
             signature_key.public_key_material(pkm.to_string());
         }
     }
@@ -130,7 +130,7 @@ pub fn print_status(
         decryption_key.status(format!("{}", ks));
     }
     if command.pkm {
-        if let Ok(pkm) = card.public_key(KeyType::Decryption) {
+        if let Ok(pkm) = card.public_key_material(KeyType::Decryption) {
             decryption_key.public_key_material(pkm.to_string());
         }
     }
@@ -155,7 +155,7 @@ pub fn print_status(
         authentication_key.status(format!("{}", ks));
     }
     if command.pkm {
-        if let Ok(pkm) = card.public_key(KeyType::Authentication) {
+        if let Ok(pkm) = card.public_key_material(KeyType::Authentication) {
             authentication_key.public_key_material(pkm.to_string());
         }
     }
diff --git a/tools/src/bin/opgpcard/main.rs b/tools/src/bin/opgpcard/main.rs
index 742da7d..219b9cc 100644
--- a/tools/src/bin/opgpcard/main.rs
+++ b/tools/src/bin/opgpcard/main.rs
@@ -8,10 +8,10 @@ use clap::Parser;
 
 use sequoia_openpgp::Cert;
 
-use openpgp_card_sequoia::card::{Card, Open, Transaction};
 use openpgp_card_sequoia::types::CardBackend;
 use openpgp_card_sequoia::util::make_cert;
 use openpgp_card_sequoia::PublicKey;
+use openpgp_card_sequoia::{state::Open, state::Transaction, Card};
 
 mod cli;
 mod commands;
diff --git a/tools/src/bin/opgpcard/util.rs b/tools/src/bin/opgpcard/util.rs
index 1e3b302..4ce0cce 100644
--- a/tools/src/bin/opgpcard/util.rs
+++ b/tools/src/bin/opgpcard/util.rs
@@ -5,10 +5,11 @@ use anyhow::{anyhow, Context, Result};
 use std::path::{Path, PathBuf};
 
 use openpgp_card_pcsc::PcscBackend;
-use openpgp_card_sequoia::card::{Admin, Card, Sign, Transaction, User};
+use openpgp_card_sequoia::state::{Admin, Sign, Transaction, User};
 use openpgp_card_sequoia::types::{
     Algo, CardBackend, Curve, EccType, Error, PublicKeyMaterial, StatusBytes,
 };
+use openpgp_card_sequoia::Card;
 
 pub(crate) fn cards() -> Result<Vec<Box<dyn CardBackend + Send + Sync>>, Error> {
     PcscBackend::cards(None).map(|cards| cards.into_iter().map(|c| c.into()).collect())