github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #2676 from Eltrick/g3-apdu-help

Browse source 
modify 'hf mf gen3blk' help to comply with the sak change
This commit is contained in:
Iceman 2024-12-03 16:19:42 +01:00 • committed by GitHub
commit dca915808c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
armsrc/mifarecmd.c
View file

@ -3482,7 +3482,7 @@ void MifareGen3Blk(uint8_t block_len, uint8_t *block) {
retval = PM3_ESOFT; retval = PM3_ESOFT;
goto OUT; goto OUT;
} }
cmd[ofs] = block_len < card_info->uidlen ? card_info->sak : cmd[ofs]; cmd[ofs] = block_len <= card_info->uidlen ? card_info->sak : cmd[ofs];
ofs++; ofs++;
cmd[ofs++] = card_info->atqa[0]; cmd[ofs++] = card_info->atqa[0];
cmd[ofs++] = card_info->atqa[1]; cmd[ofs++] = card_info->atqa[1];

3
client/src/cmdhfmf.c
View file

@ -7202,7 +7202,8 @@ static int CmdHf14AGen3Block(const char *Cmd) {
" - You can specify part of manufacturer block as\n" " - You can specify part of manufacturer block as\n"
" 4/7-bytes for UID change only\n" " 4/7-bytes for UID change only\n"
"\n" "\n"
"NOTE: BCC, SAK, ATQA will be calculated automatically" "NOTE: BCC and ATQA will be calculated automatically\n"
"SAK will be automatically set to default values if not specified"
, ,
"hf mf gen3blk --> print current data\n" "hf mf gen3blk --> print current data\n"
"hf mf gen3blk -d 01020304 --> set 4 byte uid\n" "hf mf gen3blk -d 01020304 --> set 4 byte uid\n"