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

Unified hitag naming style

Browse source
This commit is contained in:
douniwan5788 2024-08-21 16:32:30 +08:00
commit d15537bbf1
10 changed files with 52 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/src/cmdlf.c
View file

@ -247,9 +247,10 @@ int CmdLFCommandRead(const char *Cmd) {
"Modulate LF reader field to send command before read. All periods in microseconds.\n" "Modulate LF reader field to send command before read. All periods in microseconds.\n"
" - use " _YELLOW_("`lf config`") _CYAN_(" to set parameters"), " - use " _YELLOW_("`lf config`") _CYAN_(" to set parameters"),
"lf cmdread -d 50 -z 116 -o 166 -e W3000 -c W00110 --> probing for Hitag 1/S\n" "lf cmdread -d 50 -z 116 -o 166 -e W3000 -c W00110 --> probing for Hitag 1/S\n"
"lf cmdread -d 50 -z 116 -o 166 -e W3000 -c W11000 --> probing for Hitag2\n" "lf cmdread -d 50 -z 116 -o 166 -e W3000 -c W11000 --> probing for Hitag 2/S\n"
"lf cmdread -d 50 -z 116 -o 166 -e W3000 -c W11000 -s 2000 -@ --> probing for Hitag2, oscilloscope style\n" "lf cmdread -d 50 -z 116 -o 166 -e W3000 -c W11010 --> probing for Hitag S\n"
"lf cmdread -d 48 -z 112 -o 176 -e W3000 -e S240 -e E336 -c W0S00000010000E --> probing for Hitag (us)\n" "lf cmdread -d 50 -z 116 -o 166 -e W3000 -c W11000 -s 2000 -@ --> probing for Hitag 2/S, oscilloscope style\n"
"lf cmdread -d 48 -z 112 -o 176 -e W3000 -e S240 -e E336 -c W0S00000010000E --> probing for Hitag µ(micro)\n"
); );
char div_str[70] = {0}; char div_str[70] = {0};

14
tools/hitag2crack/common/hitagcrypto.c
View file

@ -166,9 +166,9 @@
length coding length coding
+ Modulation transponder -> read/write device: Strong ASK modulation, + Modulation transponder -> read/write device: Strong ASK modulation,
selectable Manchester or Biphase coding selectable Manchester or Biphase coding
+ Hitag S, Hitag u; anti-collision procedure + Hitag S, Hitag µ; anti-collision procedure
+ Fast anti-collision protocol + Fast anti-collision protocol
+ Hitag u; optional Cyclic Redundancy Check (CRC) + Hitag µ; optional Cyclic Redundancy Check (CRC)
+ Reader Talks First mode + Reader Talks First mode
+ Hitag 2 & later; Transponder Talks First (TTF) mode + Hitag 2 & later; Transponder Talks First (TTF) mode
+ Temporary switch from Transponder Talks First into Reader Talks First + Temporary switch from Transponder Talks First into Reader Talks First
@ -177,7 +177,7 @@
+ Data rates transponder to read/write device: 2 kbit/s, 4 kbit/s, 8 kbit/s + Data rates transponder to read/write device: 2 kbit/s, 4 kbit/s, 8 kbit/s
+ 32-bit password feature + 32-bit password feature
+ Hitag 2, S = 32-bit Unique Identifier + Hitag 2, S = 32-bit Unique Identifier
+ Hitag u = 48-bit Unique Identifier + Hitag µ = 48-bit Unique Identifier
+ Selectable password modes for reader / tag mutual authentication + Selectable password modes for reader / tag mutual authentication
(Hitag 1 has 2 pairs of keys, later versions have 1 pair) (Hitag 1 has 2 pairs of keys, later versions have 1 pair)
+ Hitag 2 & Hitag S; Selectable encrypted mode, 48 bit key + Hitag 2 & Hitag S; Selectable encrypted mode, 48 bit key
@ -194,10 +194,10 @@
HITAG S 256 256 bits total memory Read/Write HITAG S 256 256 bits total memory Read/Write
HITAG S 2048 2048 bits total memory Read/Write HITAG S 2048 2048 bits total memory Read/Write
HITAG u RO64 64 bits total memory Read Only HITAG µ RO64 64 bits total memory Read Only
HITAG u 128 bits total memory Read/Write HITAG µ 128 bits total memory Read/Write
HITAG u Advanced 512 bits total memory Read/Write HITAG µ Advanced 512 bits total memory Read/Write
HITAG u Advanced+ 1760 bits total memory Read/Write HITAG µ Advanced+ 1760 bits total memory Read/Write
Default 48-bit key for Hitag 2, S encryption: Default 48-bit key for Hitag 2, S encryption:
"MIKRON" = O N M I K R "MIKRON" = O N M I K R