Rename Ccc to CccId (#287)
This commit is contained in:
committed by
GitHub
parent
42ae5fb974
commit
8e52d75992
+3
-3
@@ -78,9 +78,9 @@ impl CardId {
|
|||||||
|
|
||||||
/// Cardholder Capability Container (CCC) Identifier.
|
/// Cardholder Capability Container (CCC) Identifier.
|
||||||
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
|
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
|
||||||
pub struct Ccc(pub [u8; Self::BYTE_SIZE]);
|
pub struct CccId(pub [u8; Self::BYTE_SIZE]);
|
||||||
|
|
||||||
impl Ccc {
|
impl CccId {
|
||||||
/// CCC size in bytes
|
/// CCC size in bytes
|
||||||
pub const BYTE_SIZE: usize = 51;
|
pub const BYTE_SIZE: usize = 51;
|
||||||
|
|
||||||
@@ -115,7 +115,7 @@ impl Ccc {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Display for Ccc {
|
impl Display for CccId {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
f.write_str(str::from_utf8(&hex::encode(&self.0[..])).unwrap())
|
f.write_str(str::from_utf8(&hex::encode(&self.0[..])).unwrap())
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -158,7 +158,7 @@ mod transaction;
|
|||||||
mod yubikey;
|
mod yubikey;
|
||||||
|
|
||||||
pub use crate::{
|
pub use crate::{
|
||||||
cccid::{CardId, Ccc},
|
cccid::{CardId, CccId},
|
||||||
certificate::Certificate,
|
certificate::Certificate,
|
||||||
chuid::ChuId,
|
chuid::ChuId,
|
||||||
config::Config,
|
config::Config,
|
||||||
|
|||||||
+1
-1
@@ -75,7 +75,7 @@ pub struct Setting {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Setting {
|
impl Setting {
|
||||||
/// Get a [`SettingValue`] value by name.
|
/// Get a setting by name.
|
||||||
pub fn get(key: &str, default: bool) -> Self {
|
pub fn get(key: &str, default: bool) -> Self {
|
||||||
Self::from_file(key)
|
Self::from_file(key)
|
||||||
.or_else(|| Self::from_env(key))
|
.or_else(|| Self::from_env(key))
|
||||||
|
|||||||
+3
-3
@@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
apdu::{Apdu, Ins},
|
apdu::{Apdu, Ins},
|
||||||
cccid::Ccc,
|
cccid::CccId,
|
||||||
chuid::ChuId,
|
chuid::ChuId,
|
||||||
config::Config,
|
config::Config,
|
||||||
error::{Error, Result},
|
error::{Error, Result},
|
||||||
@@ -275,8 +275,8 @@ impl YubiKey {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Get Cardholder Capability Container (CCC) Identifier.
|
/// Get Cardholder Capability Container (CCC) Identifier.
|
||||||
pub fn cccid(&mut self) -> Result<Ccc> {
|
pub fn cccid(&mut self) -> Result<CccId> {
|
||||||
Ccc::get(self)
|
CccId::get(self)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Authenticate to the card using the provided management key (MGM).
|
/// Authenticate to the card using the provided management key (MGM).
|
||||||
|
|||||||
Reference in New Issue
Block a user