liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calculate picopass CRC dynamically (#1389)

Browse Source 
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Eric Betts 2022-07-16 23:01:19 -07:00 committed by GitHub
parent 6ac1ed2aaa
commit c29ab50016
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ST25RFAL002/include/rfal_picopass.h
View File

@ -9,6 +9,7 @@
*/ */
#include "platform.h" #include "platform.h"
#include "rfal_rf.h" #include "rfal_rf.h"
#include "rfal_crc.h"
#include "st_errno.h" #include "st_errno.h"
#define RFAL_PICOPASS_UID_LEN 8 #define RFAL_PICOPASS_UID_LEN 8

20
lib/ST25RFAL002/source/rfal_picopass.c
View File

@ -138,22 +138,12 @@ ReturnCode rfalPicoPassPollerCheck(uint8_t* mac, rfalPicoPassCheckRes* chkRes) {
ReturnCode rfalPicoPassPollerReadBlock(uint8_t blockNum, rfalPicoPassReadBlockRes* readRes) { ReturnCode rfalPicoPassPollerReadBlock(uint8_t blockNum, rfalPicoPassReadBlockRes* readRes) {
ReturnCode ret; ReturnCode ret;
/*
* ./reveng -w 16 -s 0c07cc47 0c064556 0c083bbf 0c09b2ae
width=16 poly=0x1021 init=0xd924 refin=true refout=true xorout=0x0000 check=0x1329 residue=0x0000 name=(none)
0c 06 45 56
0c 07 cc 47
0c 08 3b bf
0c 09 b2 ae
*/
uint8_t readCmds[4][4] = { uint8_t txBuf[4] = {RFAL_PICOPASS_CMD_READ, 0, 0, 0};
{RFAL_PICOPASS_CMD_READ, 6, 0x45, 0x56}, txBuf[1] = blockNum;
{RFAL_PICOPASS_CMD_READ, 7, 0xcc, 0x47}, uint16_t crc = rfalCrcCalculateCcitt(0xE012, txBuf + 1, 1);
{RFAL_PICOPASS_CMD_READ, 8, 0x3b, 0xbf}, memcpy(txBuf + 2, &crc, sizeof(uint16_t));
{RFAL_PICOPASS_CMD_READ, 9, 0xb2, 0xae}};
uint8_t* txBuf = readCmds[blockNum - 6];
uint16_t recvLen = 0; uint16_t recvLen = 0;
uint32_t flags = RFAL_PICOPASS_TXRX_FLAGS; uint32_t flags = RFAL_PICOPASS_TXRX_FLAGS;
uint32_t fwt = rfalConvMsTo1fc(20); uint32_t fwt = rfalConvMsTo1fc(20);
@ -166,7 +156,5 @@ ReturnCode rfalPicoPassPollerReadBlock(uint8_t blockNum, rfalPicoPassReadBlockRe
&recvLen, &recvLen,
flags, flags,
fwt); fwt);
// printf("check rx: %d %s\n", recvLen, hex2Str(readRes->data, RFAL_PICOPASS_MAX_BLOCK_LEN));
return ret; return ret;
} }