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

Upgrade to newer tokio and sequoia-ipc versions, bump crate version to 0.2.1.

Browse source
This commit is contained in:
Heiko Schaefer 2022-03-22 14:47:43 +01:00
parent e74446cba8
commit 2f6626ed5a
No known key found for this signature in database
GPG key ID: 4A849A1904CCBD7D
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scdc/Cargo.toml
View file

@ -6,16 +6,16 @@ name = "openpgp-card-scdc"
description = "Experimental SCDaemon Client, for use with the openpgp-card crate" description = "Experimental SCDaemon Client, for use with the openpgp-card crate"
authors = ["Heiko Schaefer <heiko@schaefer.name>"] authors = ["Heiko Schaefer <heiko@schaefer.name>"]
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
version = "0.2.0" version = "0.2.1"
edition = "2018" edition = "2018"
repository = "https://gitlab.com/hkos/openpgp-card" repository = "https://gitlab.com/hkos/openpgp-card"
documentation = "https://docs.rs/crate/openpgp-card-scdc" documentation = "https://docs.rs/crate/openpgp-card-scdc"
[dependencies] [dependencies]
openpgp-card = { path = "../openpgp-card", version = "0.2" } openpgp-card = { path = "../openpgp-card", version = "0.2" }
sequoia-ipc = "0.26" sequoia-ipc = "0.27"
hex = "0.4" hex = "0.4"
futures = "0.3" futures = "0.3"
tokio = "0.2" tokio = { version = "1.13.1", features = ["rt-multi-thread"] }
lazy_static = "1.4" lazy_static = "1.4"
log = "0.4" log = "0.4"

8
scdc/src/lib.rs
View file

@ -140,7 +140,7 @@ impl ScdBackend {
/// Call "SCD SERIALNO", which causes scdaemon to be started by gpg /// Call "SCD SERIALNO", which causes scdaemon to be started by gpg
/// agent (if it's not running yet). /// agent (if it's not running yet).
fn serialno(&mut self) -> Result<(), Error> { fn serialno(&mut self) -> Result<(), Error> {
let mut rt = RT.lock().unwrap(); let rt = RT.lock().unwrap();
let send = "SCD SERIALNO"; let send = "SCD SERIALNO";
self.send2(send)?; self.send2(send)?;
@ -169,7 +169,7 @@ impl ScdBackend {
let send = format!("SCD SERIALNO --demand={}", serial); let send = format!("SCD SERIALNO --demand={}", serial);
self.send2(&send)?; self.send2(&send)?;
let mut rt = RT.lock().unwrap(); let rt = RT.lock().unwrap();
while let Some(response) = rt.block_on(self.agent.next()) { while let Some(response) = rt.block_on(self.agent.next()) {
log::trace!("select res: {:x?}", response); log::trace!("select res: {:x?}", response);
@ -198,7 +198,7 @@ impl ScdBackend {
fn send(&mut self, cmd: &str) -> Result<(), Error> { fn send(&mut self, cmd: &str) -> Result<(), Error> {
self.send2(cmd)?; self.send2(cmd)?;
let mut rt = RT.lock().unwrap(); let rt = RT.lock().unwrap();
while let Some(response) = rt.block_on(self.agent.next()) { while let Some(response) = rt.block_on(self.agent.next()) {
log::trace!("select res: {:x?}", response); log::trace!("select res: {:x?}", response);
@ -262,7 +262,7 @@ impl CardTransaction for ScdTransaction<'_> {
self.scd.send2(&send)?; self.scd.send2(&send)?;
let mut rt = RT.lock().unwrap(); let rt = RT.lock().unwrap();
while let Some(response) = rt.block_on(self.scd.agent.next()) { while let Some(response) = rt.block_on(self.scd.agent.next()) {
log::trace!("res: {:x?}", response); log::trace!("res: {:x?}", response);