kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use TryFrom to convert between APDU and CTAP status codes

Browse Source
This commit is contained in:
Kamran Khan
2020-12-07 23:32:04 -08:00
parent 4c84e94039
commit e4d160aaee
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ctap/ctap1.rs
View File

@@ -60,6 +60,24 @@ impl TryFrom<u16> for Ctap1StatusCode {
} }
} }
impl TryFrom<ApduStatusCode> for Ctap1StatusCode {
type Error = ();
fn try_from(apdu_status_code: ApduStatusCode) -> Result<Ctap1StatusCode, ()> {
match apdu_status_code {
ApduStatusCode::SW_WRONG_LENGTH => Ok(Ctap1StatusCode::SW_WRONG_LENGTH),
ApduStatusCode::SW_WRONG_DATA => Ok(Ctap1StatusCode::SW_WRONG_DATA),
ApduStatusCode::SW_CLA_INVALID => Ok(Ctap1StatusCode::SW_CLA_NOT_SUPPORTED),
ApduStatusCode::SW_INS_INVALID => Ok(Ctap1StatusCode::SW_INS_NOT_SUPPORTED),
ApduStatusCode::SW_COND_USE_NOT_SATISFIED => {
Ok(Ctap1StatusCode::SW_CONDITIONS_NOT_SATISFIED)
}
ApduStatusCode::SW_SUCCESS => Ok(Ctap1StatusCode::SW_NO_ERROR),
_ => Ok(Ctap1StatusCode::SW_COMMAND_ABORTED),
}
}
}
impl Into<u16> for Ctap1StatusCode { impl Into<u16> for Ctap1StatusCode {
fn into(self) -> u16 { fn into(self) -> u16 {
self as u16 self as u16
@@ -121,13 +139,9 @@ impl TryFrom<&[u8]> for U2fCommand {
fn try_from(message: &[u8]) -> Result<Self, Ctap1StatusCode> { fn try_from(message: &[u8]) -> Result<Self, Ctap1StatusCode> {
let apdu: APDU = match APDU::try_from(message) { let apdu: APDU = match APDU::try_from(message) {
Ok(apdu) => apdu, Ok(apdu) => apdu,
// Todo: Better conversion between ApduStatusCode and Ctap1StatusCode Err(apdu_status_code) => {
// Maybe use TryFrom? return Err(Ctap1StatusCode::try_from(apdu_status_code).unwrap())
Err(apdu_status_code) => match apdu_status_code { }
ApduStatusCode::SW_WRONG_LENGTH => return Err(Ctap1StatusCode::SW_WRONG_LENGTH),
ApduStatusCode::SW_WRONG_DATA => return Err(Ctap1StatusCode::SW_WRONG_DATA),
_ => return Err(Ctap1StatusCode::SW_COMMAND_ABORTED),
},
}; };
// ISO7816 APDU Header format. Each cell is 1 byte. Note that the CTAP flavor always // ISO7816 APDU Header format. Each cell is 1 byte. Note that the CTAP flavor always