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

openpgp-card: move commands out of the apdu module

Browse source
This commit is contained in:
Heiko Schaefer 2023-08-30 14:05:57 +02:00
parent 2b0111b923
commit 5440fdeb1e
No known key found for this signature in database
GPG key ID: 4A849A1904CCBD7D
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
openpgp-card/src/apdu.rs
View file

@ -5,15 +5,15 @@
//! Commands and responses to commands //! Commands and responses to commands
pub(crate) mod command; pub(crate) mod command;
pub(crate) mod commands;
pub mod response; pub mod response;
use std::convert::TryFrom; use std::convert::TryFrom;
use card_backend::{CardCaps, CardTransaction}; use card_backend::{CardCaps, CardTransaction};
use crate::apdu::command::Expect; use crate::apdu::command::{Command, Expect};
use crate::apdu::{command::Command, response::RawResponse}; use crate::apdu::response::RawResponse;
use crate::commands;
use crate::{Error, StatusBytes}; use crate::{Error, StatusBytes};
/// "Maximum amount of bytes in a short APDU command or response" (from pcsc) /// "Maximum amount of bytes in a short APDU command or response" (from pcsc)

0
openpgp-card/src/apdu/commands.rs → openpgp-card/src/commands.rs
View file

2
openpgp-card/src/keys.rs
View file

@ -10,8 +10,8 @@ use crate::algorithm::{
AlgorithmAttributes, AlgorithmInformation, Curve, EccAttributes, RsaAttributes, AlgorithmAttributes, AlgorithmInformation, Curve, EccAttributes, RsaAttributes,
}; };
use crate::apdu::command::Command; use crate::apdu::command::Command;
use crate::apdu::commands;
use crate::card_do::{Fingerprint, KeyGenerationTime}; use crate::card_do::{Fingerprint, KeyGenerationTime};
use crate::commands;
use crate::crypto_data::{ use crate::crypto_data::{
CardUploadableKey, EccKey, EccPub, EccType, PrivateKeyMaterial, PublicKeyMaterial, RSAKey, CardUploadableKey, EccKey, EccPub, EccType, PrivateKeyMaterial, PublicKeyMaterial, RSAKey,
RSAPub, RSAPub,

2
openpgp-card/src/lib.rs
View file

@ -31,6 +31,7 @@ extern crate core;
pub mod algorithm; pub mod algorithm;
pub(crate) mod apdu; pub(crate) mod apdu;
pub mod card_do; pub mod card_do;
mod commands;
pub mod crypto_data; pub mod crypto_data;
mod errors; mod errors;
pub(crate) mod keys; pub(crate) mod keys;
@ -45,7 +46,6 @@ use tags::{ShortTag, Tags};
use crate::algorithm::{AlgoSimple, AlgorithmAttributes, AlgorithmInformation}; use crate::algorithm::{AlgoSimple, AlgorithmAttributes, AlgorithmInformation};
use crate::apdu::command::Command; use crate::apdu::command::Command;
use crate::apdu::commands;
use crate::apdu::response::RawResponse; use crate::apdu::response::RawResponse;
use crate::card_do::{ use crate::card_do::{
ApplicationRelatedData, CardholderRelatedData, Fingerprint, KeyGenerationTime, Lang, ApplicationRelatedData, CardholderRelatedData, Fingerprint, KeyGenerationTime, Lang,