webadmin/pico-keys-sdk
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-keys-sdk synced 2026-06-11 21:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix with data and extended length.

Browse Source
This commit is contained in:
Pol Henarejos
2022-05-30 00:51:36 +02:00
parent acde4c54d5
commit 58e9e67ee5
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ccid/ccid2040.c
View File

@@ -234,20 +234,22 @@ static int usb_event_handle() {
if (apdu.ne == 0) if (apdu.ne == 0)
apdu.ne = 256; apdu.ne = 256;
} }
else if (ccid_header->dwLength == 7) { else if (apdu.header[4] == 0x0 && ccid_header->dwLength >= 7) {
apdu.nc = 0; if (ccid_header->dwLength == 7) {
apdu.ne = (apdu.header[5] << 8) | apdu.header[6]; apdu.ne = (apdu.header[5] << 8) | apdu.header[6];
if (apdu.ne == 0)
apdu.ne = 65536;
}
else if (apdu.header[4] == 0x0) {
apdu.nc = (apdu.header[5] << 8) | apdu.header[6];
apdu.data = apdu.header+7;
if (apdu.nc+7+2 == ccid_header->dwLength) {
apdu.ne = (apdu.header[ccid_header->dwLength-2] << 8) | apdu.header[ccid_header->dwLength-1];
if (apdu.ne == 0) if (apdu.ne == 0)
apdu.ne = 65536; apdu.ne = 65536;
} }
else {
apdu.ne = 0;
apdu.nc = (apdu.header[5] << 8) | apdu.header[6];
apdu.data = apdu.header+7;
if (apdu.nc+7+2 == ccid_header->dwLength) {
apdu.ne = (apdu.header[ccid_header->dwLength-2] << 8) | apdu.header[ccid_header->dwLength-1];
if (apdu.ne == 0)
apdu.ne = 65536;
}
}
} }
else { else {
apdu.nc = apdu.header[4]; apdu.nc = apdu.header[4];