Rename card_data -> card_do

card-functionality/src/tests.rs

@@ -12,7 +12,7 @@ use sequoia_openpgp::types::Timestamp;
 use sequoia_openpgp::Cert;
 
 use openpgp_card::algorithm::AlgoSimple;
-use openpgp_card::card_data::Sex;
+use openpgp_card::card_do::Sex;
 use openpgp_card::errors::{OcErrorStatus, OpenpgpCardError};
 use openpgp_card::{CardApp, KeyType};
 use openpgp_card_sequoia::{

openpgp-card-sequoia/src/lib.rs

@@ -32,7 +32,7 @@ use openpgp::{Cert, Packet};
 use sequoia_openpgp as openpgp;
 
 use openpgp_card::algorithm::{Algo, AlgoInfo, Curve};
-use openpgp_card::card_data::{
+use openpgp_card::card_do::{
     ApplicationId, ApplicationRelatedData, Cardholder, ExtendedCap,
     ExtendedLengthInfo, Features, Fingerprint, Historical, KeySet, PWStatus,
     Sex,

openpgp-card-sequoia/src/main.rs

@@ -8,7 +8,7 @@ use std::error::Error;
 use sequoia_openpgp::parse::Parse;
 use sequoia_openpgp::Cert;
 
-use openpgp_card::card_data::Sex;
+use openpgp_card::card_do::Sex;
 use openpgp_card::{CardApp, KeyType};
 use openpgp_card_pcsc::PcscClient;
 // use openpgp_card_scdc::ScdClient;

openpgp-card/src/card_app.rs

@@ -10,7 +10,7 @@ use anyhow::{anyhow, Result};
 
 use crate::algorithm::{Algo, AlgoInfo, AlgoSimple, RsaAttrs};
 use crate::apdu::{commands, response::Response};
-use crate::card_data::{ApplicationRelatedData, Cardholder, Sex};
+use crate::card_do::{ApplicationRelatedData, Cardholder, Sex};
 use crate::crypto_data::{
     CardUploadableKey, Cryptogram, EccType, Hash, PublicKeyMaterial,
 };

openpgp-card/src/card_do/algo_attrs.rs

@@ -10,7 +10,7 @@ use nom::combinator::map;
 use nom::{branch, bytes::complete as bytes, number::complete as number};
 
 use crate::algorithm::{Algo, Curve, EccAttrs, RsaAttrs};
-use crate::card_data::complete;
+use crate::card_do::complete;
 use crate::crypto_data::EccType;
 
 fn parse_oid_cv25519(input: &[u8]) -> nom::IResult<&[u8], Curve> {

openpgp-card/src/card_do/algo_info.rs

@@ -10,7 +10,7 @@ use nom::{branch, bytes::complete as bytes, combinator, multi, sequence};
 use std::fmt;
 
 use crate::algorithm::{Algo, AlgoInfo};
-use crate::card_data::{algo_attrs, complete};
+use crate::card_do::{algo_attrs, complete};
 use crate::KeyType;
 
 impl AlgoInfo {

openpgp-card/src/card_do/application_id.rs

@@ -5,7 +5,7 @@ use anyhow::Result;
 use nom::{bytes::complete as bytes, number::complete as number};
 use std::convert::TryFrom;
 
-use crate::card_data::{complete, ApplicationId};
+use crate::card_do::{complete, ApplicationId};
 
 fn parse(input: &[u8]) -> nom::IResult<&[u8], ApplicationId> {
     let (input, _) = bytes::tag([0xd2, 0x76, 0x0, 0x1, 0x24])(input)?;

openpgp-card/src/card_do/cardholder.rs

@@ -5,7 +5,7 @@ use std::convert::TryFrom;
 
 use anyhow::Result;
 
-use crate::card_data::{Cardholder, Sex};
+use crate::card_do::{Cardholder, Sex};
 use crate::tlv::tag::Tag;
 use crate::tlv::{Tlv, TlvEntry};
 

openpgp-card/src/card_do/extended_cap.rs

@@ -6,8 +6,8 @@ use nom::{combinator, number::complete as number, sequence};
 use std::collections::HashSet;
 use std::convert::TryFrom;
 
-use crate::card_data::complete;
+use crate::card_do::complete;
-use crate::card_data::{ExtendedCap, Features};
+use crate::card_do::{ExtendedCap, Features};
 use crate::errors::OpenpgpCardError;
 
 fn features(input: &[u8]) -> nom::IResult<&[u8], HashSet<Features>> {
@@ -77,7 +77,7 @@ impl TryFrom<&[u8]> for ExtendedCap {
 
 #[cfg(test)]
 mod test {
-    use crate::card_data::extended_cap::{ExtendedCap, Features};
+    use crate::card_do::extended_cap::{ExtendedCap, Features};
     use hex_literal::hex;
     use std::collections::HashSet;
     use std::convert::TryFrom;

openpgp-card/src/card_do/extended_length_info.rs

@@ -4,7 +4,7 @@
 use anyhow::Result;
 use nom::{bytes::complete::tag, number::complete as number, sequence};
 
-use crate::card_data::{complete, ExtendedLengthInfo};
+use crate::card_do::{complete, ExtendedLengthInfo};
 
 fn parse(input: &[u8]) -> nom::IResult<&[u8], (u16, u16)> {
     let (input, (_, cmd, _, resp)) =

openpgp-card/src/card_do/fingerprint.rs

@@ -5,7 +5,7 @@ use anyhow::anyhow;
 use nom::{bytes::complete as bytes, combinator, sequence};
 use std::fmt;
 
-use crate::card_data::{Fingerprint, KeySet};
+use crate::card_do::{Fingerprint, KeySet};
 use crate::errors::OpenpgpCardError;
 
 impl From<[u8; 20]> for Fingerprint {

openpgp-card/src/card_do/historical.rs

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Heiko Schaefer <heiko@schaefer.name>
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use crate::card_data::{CardCapabilities, CardServiceData, Historical};
+use crate::card_do::{CardCapabilities, CardServiceData, Historical};
 use crate::errors::OpenpgpCardError;
 use anyhow::{anyhow, Result};
 

openpgp-card/src/card_do/key_generation_times.rs

@@ -5,8 +5,8 @@ use anyhow::anyhow;
 use chrono::{DateTime, NaiveDateTime, Utc};
 use nom::{combinator, number::complete as number, sequence};
 
-use crate::card_data::KeyGeneration;
+use crate::card_do::KeyGeneration;
-use crate::card_data::KeySet;
+use crate::card_do::KeySet;
 use crate::errors::OpenpgpCardError;
 
 impl From<KeyGeneration> for DateTime<Utc> {

openpgp-card/src/card_do/mod.rs

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Heiko Schaefer <heiko@schaefer.name>
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-//! Data structures for OpenPGP card data
+//! OpenPGP card data objects (DO)
 
 use anyhow::{anyhow, Error, Result};
 use std::collections::HashSet;

openpgp-card/src/card_do/pw_status.rs

@@ -3,7 +3,7 @@
 
 use anyhow::anyhow;
 
-use crate::card_data::PWStatus;
+use crate::card_do::PWStatus;
 use crate::errors::OpenpgpCardError;
 
 impl PWStatus {

openpgp-card/src/lib.rs

@@ -28,7 +28,7 @@ use anyhow::Result;
 pub mod algorithm;
 mod apdu;
 mod card_app;
-pub mod card_data;
+pub mod card_do;
 pub mod crypto_data;
 pub mod errors;
 mod keys;

openpgp-card/src/tlv/mod.rs

@@ -8,7 +8,7 @@ use nom::{bytes::complete as bytes, combinator};
 pub mod length;
 pub mod tag;
 
-use crate::card_data::complete;
+use crate::card_do::complete;
 use tag::Tag;
 
 #[derive(Debug, Eq, PartialEq)]