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

Prevent int overflow by casting before addition

Browse Source
This commit is contained in:
Kamran Khan
2020-12-02 23:32:25 -08:00
parent 1d8c103d9b
commit 524ebe3fce
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ctap/apdu.rs
View File

@@ -151,7 +151,7 @@ impl TryFrom<&[u8]> for APDU {
case_type: ApduType::Short(Case::Le1), case_type: ApduType::Short(Case::Le1),
}); });
} }
if payload.len() == (1 + byte_0) as usize && byte_0 != 0 { if payload.len() == 1 + (byte_0 as usize) && byte_0 != 0 {
// Lc is one-byte long and since the size specified by Lc covers the rest of the // Lc is one-byte long and since the size specified by Lc covers the rest of the
// payload there's no Le at the end // payload there's no Le at the end
return Ok(APDU { return Ok(APDU {
@@ -162,7 +162,7 @@ impl TryFrom<&[u8]> for APDU {
le: 0, le: 0,
}); });
} }
if payload.len() == (1 + byte_0 + 1) as usize && byte_0 != 0 { if payload.len() == 2 + (byte_0 as usize) && byte_0 != 0 {
// Lc is one-byte long and since the size specified by Lc covers the rest of the // Lc is one-byte long and since the size specified by Lc covers the rest of the
// payload with ONE additional byte that byte must be Le // payload with ONE additional byte that byte must be Le
let last_byte: u32 = (*payload.last().unwrap()).into(); let last_byte: u32 = (*payload.last().unwrap()).into();