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

Merge branch 'master' into dev_4x50_standalone

Browse source 
solved merge conflicts
This commit is contained in:
tharexde 2021-01-30 00:29:18 +01:00
commit b57a457254
67 changed files with 943 additions and 683 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/pm3_cmd.h
View file

@ -593,7 +593,6 @@ typedef struct {
#define CMD_HF_ICLASS_READBL 0x0396
#define CMD_HF_ICLASS_WRITEBL 0x0397
#define CMD_HF_ICLASS_EML_MEMSET 0x0398
#define CMD_HF_ICLASS_AUTH 0x0399
#define CMD_HF_ICLASS_CHKKEYS 0x039A
#define CMD_HF_ICLASS_RESTORE 0x039B