From 4b7b4a2ab6aa905c817e6914ae96d7e5b9bfe9e2 Mon Sep 17 00:00:00 2001 From: Heiko Schaefer Date: Fri, 16 Jul 2021 17:24:53 +0200 Subject: [PATCH] Use ScdClient::open_scdc_by_serial() in test code. --- openpgp-card-sequoia/src/main.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/openpgp-card-sequoia/src/main.rs b/openpgp-card-sequoia/src/main.rs index 6604788..62fdd12 100644 --- a/openpgp-card-sequoia/src/main.rs +++ b/openpgp-card-sequoia/src/main.rs @@ -13,14 +13,14 @@ use openpgp_card_scdc::ScdClient; // Filename of test key and test message to use: -// const TEST_KEY_PATH: &str = "example/test4k.sec"; -// const TEST_ENC_MSG: &str = "example/encrypted_to_rsa4k.asc"; +const TEST_KEY_PATH: &str = "example/test4k.sec"; +const TEST_ENC_MSG: &str = "example/encrypted_to_rsa4k.asc"; // const TEST_KEY_PATH: &str = "example/nist521.sec"; // const TEST_ENC_MSG: &str = "example/encrypted_to_nist521.asc"; -const TEST_KEY_PATH: &str = "example/test25519.sec"; -const TEST_ENC_MSG: &str = "example/encrypted_to_25519.asc"; +// const TEST_KEY_PATH: &str = "example/test25519.sec"; +// const TEST_ENC_MSG: &str = "example/encrypted_to_25519.asc"; const SOCKET: &str = "/run/user/1000/gnupg/S.scdaemon"; @@ -30,10 +30,15 @@ fn main() -> Result<(), Box> { // Ident of the OpenPGP Card that will be used for tests. let test_card_ident = env::var("TEST_CARD_IDENT"); + // "serial" for opening a specific card through scdaemon + let test_card_serial = env::var("TEST_CARD_SERIAL")?; + if let Ok(test_card_ident) = test_card_ident { println!("** get card"); // let mut oc = CardBase::open_by_ident(&test_card_ident)?; - let mut oc = ScdClient::open_scdc(SOCKET)?; + // let mut oc = ScdClient::open_scdc(SOCKET)?; + let mut oc = + ScdClient::open_scdc_by_serial(SOCKET, &test_card_serial)?; // card metadata