turnkey/openpgp-card
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adjust to new ScdClient API, socket is not needed anymore.

Browse source
This commit is contained in:
Heiko Schaefer 2021-08-03 18:23:47 +02:00
parent d5b1b2daa3
commit 833cdbc238
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
openpgp-card-sequoia/src/main.rs
View file

@ -22,8 +22,6 @@ const TEST_ENC_MSG: &str = "example/encrypted_to_rsa4k.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";
fn main() -> Result<(), Box<dyn Error>> { fn main() -> Result<(), Box<dyn Error>> {
env_logger::init(); env_logger::init();
@ -36,9 +34,8 @@ fn main() -> Result<(), Box<dyn Error>> {
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 = CardBase::open_card(ScdClient::open_by_serial( let mut oc = CardBase::open_card(ScdClient::open_by_serial(
SOCKET, None,
&test_card_serial, &test_card_serial,
)?)?; )?)?;
@ -153,7 +150,7 @@ fn main() -> Result<(), Box<dyn Error>> {
// let mut oc = CardBase::open_by_ident(&test_card_ident)?; // let mut oc = CardBase::open_by_ident(&test_card_ident)?;
let mut oc = CardBase::open_card(ScdClient::open_by_serial( let mut oc = CardBase::open_card(ScdClient::open_by_serial(
SOCKET, None,
&test_card_serial, &test_card_serial,
)?)?; )?)?;
@ -197,7 +194,7 @@ fn main() -> Result<(), Box<dyn Error>> {
// ----------------------------- // -----------------------------
// let oc = CardBase::open_by_ident(&test_card_ident)?; // let oc = CardBase::open_by_ident(&test_card_ident)?;
let oc = CardBase::open_card(ScdClient::open_by_serial( let oc = CardBase::open_card(ScdClient::open_by_serial(
SOCKET, None,
&test_card_serial, &test_card_serial,
)?)?; )?)?;