openpgp-card-sequoia: adjust example

This commit is contained in:
Heiko Schaefer 2023-08-26 16:58:30 +02:00
parent 15646bc50b
commit 7de74d702e
No known key found for this signature in database
GPG key ID: 4A849A1904CCBD7D
2 changed files with 123 additions and 120 deletions

View file

@ -4,7 +4,7 @@
[workspace]
members = [
"openpgp-card",
# "openpgp-card-sequoia",
"openpgp-card-sequoia",
"card-backend",
"pcsc",
"scdc",

View file

@ -1,13 +1,13 @@
// SPDX-FileCopyrightText: 2021-2022 Heiko Schaefer <heiko@schaefer.name>
// SPDX-FileCopyrightText: 2021-2023 Heiko Schaefer <heiko@schaefer.name>
// SPDX-License-Identifier: MIT OR Apache-2.0
use std::env;
use std::error::Error;
use anyhow::Result;
use card_backend_pcsc::PcscBackend;
use openpgp_card::card_do::Sex;
use openpgp_card::KeyType;
use openpgp_card_pcsc::PcscBackend;
use openpgp_card_sequoia::sq_util;
use openpgp_card_sequoia::{state::Open, Card};
use sequoia_openpgp::parse::Parse;
@ -33,9 +33,10 @@ fn main() -> Result<(), Box<dyn Error>> {
let test_card_ident = env::var("TEST_CARD_IDENT");
if let Ok(test_card_ident) = test_card_ident {
let backend = PcscBackend::open_by_ident(&test_card_ident, None)?;
let cards = PcscBackend::card_backends(None)?;
let mut card = Card::<Open>::open_by_ident(cards, &test_card_ident)?;
let mut card: Card<Open> = backend.into();
{
let mut transaction = card.transaction()?;
// card metadata
@ -132,15 +133,16 @@ fn main() -> Result<(), Box<dyn Error>> {
println!("Upload auth key");
admin.upload_key(vka, KeyType::Authentication, None)?;
}
}
println!();
// -----------------------------
// Open fresh Card for decrypt
// -----------------------------
let backend = PcscBackend::open_by_ident(&test_card_ident, None)?;
let cards = PcscBackend::card_backends(None)?;
let mut card = Card::<Open>::open_by_ident(cards, &test_card_ident)?;
let mut card: Card<Open> = backend.into();
{
let mut transaction = card.transaction()?;
// Check that we're still using the expected card
@ -174,13 +176,14 @@ fn main() -> Result<(), Box<dyn Error>> {
println!("Decrypted plaintext: {plain}");
assert_eq!(plain, "Hello world!\n");
}
// -----------------------------
// Open fresh Card for signing
// -----------------------------
let backend = PcscBackend::open_by_ident(&test_card_ident, None)?;
let cards = PcscBackend::card_backends(None)?;
let mut card = Card::<Open>::open_by_ident(cards, &test_card_ident)?;
let mut card: Card<Open> = backend.into();
let mut transaction = card.transaction()?;
// Sign
@ -211,7 +214,7 @@ fn main() -> Result<(), Box<dyn Error>> {
println!("The following OpenPGP cards are connected to your system:");
for backend in PcscBackend::cards(None)? {
let mut card: Card<Open> = backend.into();
let mut card: Card<Open> = Card::<Open>::new(backend?)?;
let open = card.transaction()?;
println!(" {}", open.application_identifier()?.ident());