Use ScdClient::open_scdc_by_serial() in test code.
This commit is contained in:
parent
e34285dc68
commit
4b7b4a2ab6
1 changed files with 10 additions and 5 deletions
|
@ -13,14 +13,14 @@ use openpgp_card_scdc::ScdClient;
|
||||||
|
|
||||||
// Filename of test key and test message to use:
|
// Filename of test key and test message to use:
|
||||||
|
|
||||||
// const TEST_KEY_PATH: &str = "example/test4k.sec";
|
const TEST_KEY_PATH: &str = "example/test4k.sec";
|
||||||
// const TEST_ENC_MSG: &str = "example/encrypted_to_rsa4k.asc";
|
const TEST_ENC_MSG: &str = "example/encrypted_to_rsa4k.asc";
|
||||||
|
|
||||||
// const TEST_KEY_PATH: &str = "example/nist521.sec";
|
// const TEST_KEY_PATH: &str = "example/nist521.sec";
|
||||||
// const TEST_ENC_MSG: &str = "example/encrypted_to_nist521.asc";
|
// const TEST_ENC_MSG: &str = "example/encrypted_to_nist521.asc";
|
||||||
|
|
||||||
const TEST_KEY_PATH: &str = "example/test25519.sec";
|
// const TEST_KEY_PATH: &str = "example/test25519.sec";
|
||||||
const TEST_ENC_MSG: &str = "example/encrypted_to_25519.asc";
|
// const TEST_ENC_MSG: &str = "example/encrypted_to_25519.asc";
|
||||||
|
|
||||||
const SOCKET: &str = "/run/user/1000/gnupg/S.scdaemon";
|
const SOCKET: &str = "/run/user/1000/gnupg/S.scdaemon";
|
||||||
|
|
||||||
|
@ -30,10 +30,15 @@ fn main() -> Result<(), Box<dyn Error>> {
|
||||||
// Ident of the OpenPGP Card that will be used for tests.
|
// Ident of the OpenPGP Card that will be used for tests.
|
||||||
let test_card_ident = env::var("TEST_CARD_IDENT");
|
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 {
|
if let Ok(test_card_ident) = test_card_ident {
|
||||||
println!("** get card");
|
println!("** get card");
|
||||||
// let mut oc = CardBase::open_by_ident(&test_card_ident)?;
|
// 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
|
// card metadata
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue