RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-22 15:16:19 +08:00
Code Issues Projects Releases Packages Wiki Activity
14816 commits 3 branches 15 tags 87 MiB
Commit graph

9364 commits

Author SHA1 Message Date
Matt Moran
caebfdca62 Update license from LGPL to GPL 2022-01-05 23:54:18 +13:00
Matt Moran
8ecfc4af34 Make variables & function names snake_case 2022-01-05 23:53:03 +13:00
Matt Moran
fad30294aa Format styles 2022-01-05 23:08:10 +13:00
Joshua Wright
859b55933d Add --no-auth support for hf mfdes createapp 2022-01-04 15:55:26 -05:00
Matt Moran
81da8a1317 Add hf gallagher delete command 2022-01-05 00:22:34 +13:00
Matt Moran
28437f018b Check if facility already exists in CAD 
Disallow duplicate credentials for the same facility (because readers won't handle it properly - I assume they'll just use the first entry?)
 2022-01-04 22:38:30 +13:00
Matt Moran
d7989caad0 Automatically choose an new valid Gallagher AID 2022-01-04 22:15:00 +13:00
Matt Moran
d3da798517 Move GallagherDiversifyKey to top of file 2022-01-04 21:14:18 +13:00
iceman1001
5ddfedbad0 cppcheck fix const 2022-01-04 07:32:58 +01:00
iceman1001
a7f3a42aff cppcheck fix const 2022-01-04 07:32:21 +01:00
iceman1001
ed10409bfd cppcheck fix uninitvar 2022-01-04 07:31:10 +01:00
iceman1001
cd825bfac8 cppcheck fixes 2022-01-04 07:28:20 +01:00
Matt Moran
28844756d9 Add default MIFARE Site Key 2022-01-04 18:19:42 +13:00
Matt Moran
e129bee161 Fix print level should be ERR, was FAILED 2022-01-04 18:06:20 +13:00
Matt Moran
f395b28643 Extract cadAidUintToByte and cadAidByteToUint 2022-01-04 18:06:02 +13:00
Matt Moran
21b080e49a Extract selectAid and authenticate commands 2022-01-04 17:42:05 +13:00
Matt Moran
1e3ed42f54 Extract CAD_AID to a constant 2022-01-04 17:04:05 +13:00
Matt Moran
863cf16015 Add comments and logging 2022-01-04 16:59:59 +13:00
Philippe Teuwen
0f9315391a Changed drastically Hitag S ARM code to remove state machines and ease way to build new commands, Fixed Hitag S crypto mode with key or NrAr, fixed lf hitag cc, fixed pwd dump in hitagS dump with LKP 2022-01-03 22:43:58 +01:00
iceman1001
3491157345 cppcheck fixes and other minor stuff 2022-01-03 22:17:40 +01:00
iceman1001
7b61c35948 textual change to trace list -h 2022-01-03 22:12:30 +01:00
iceman1001
0a4c9f83ac fixes to hf iclass configcard mem setup, textual output, MIX->NG convertion 2022-01-03 22:08:55 +01:00
Matt Moran
aed687cb96 Add basic cloning support 2022-01-03 17:02:56 +13:00
Matt Moran
7b0a85a0af Fix incorrect types in encodeCardholderCredentials 2022-01-03 16:39:18 +13:00
Philippe Teuwen
89554501bb trace list: check protocol exists and allows to run without arg 2022-01-02 00:13:20 +01:00
iceman1001
0bad12fcac cppcheck 2022-01-01 17:45:43 +01:00
iceman1001
89becb8d9f cppcheck 2022-01-01 17:43:12 +01:00
iceman1001
4919d14c13 cppcheck fix 2022-01-01 16:29:51 +01:00
iceman1001
9a746db6f9 cppcheck fixes 2022-01-01 15:59:02 +01:00
iceman1001
a85fa6dfb7 mem leak fix 2022-01-01 15:46:41 +01:00
iceman1001
ea7f2e03d3 cppcheck fixes 2022-01-01 15:38:57 +01:00
Matt Moran
13ff8d50cf Add hf gallagher reader command 2022-01-01 22:22:57 +13:00
iceman1001
03282f0fd0 maur keys 2022-01-01 09:54:38 +01:00
iceman1001
77f49c8efc text - unified 2022-01-01 09:39:05 +01:00
iceman1001
debf2796cc text - unified 2022-01-01 09:25:53 +01:00
Matt Moran
491c93e715 Add CardholderCredentials struct 2022-01-01 17:34:53 +13:00
Philippe Teuwen
7a5786b9e4 fix a number of strx usages 2022-01-01 02:39:10 +01:00
iceman1001
cb5cd18ff2 make even more obvious 2021-12-31 16:14:11 +01:00
Philippe Teuwen
f81b772577 gview: fix parsing and desc 2021-12-31 12:54:58 +01:00
Philippe Teuwen
23b4a47e94 make style 2021-12-31 12:45:21 +01:00
iceman1001
7265b2708b text 2021-12-31 11:11:56 +01:00
iceman1001
f9ac27c223 text 2021-12-31 09:27:26 +01:00
iceman1001
9c2b5118df hf mf gview now support user supplied password 2021-12-31 09:24:10 +01:00
iceman1001
0cb1cfee6b text 2021-12-30 22:06:43 +01:00
Philippe Teuwen
eb3c48cd25 make style 2021-12-30 12:41:23 +01:00
Philippe Teuwen
02f2318326 option --force to hf mfu rdb/wrbl and document how to set version & sig on ultimate card 2021-12-30 12:11:22 +01:00
Philippe Teuwen
85def31a8d hitag1/S trace: add crc check 
Example:

[usb] pm3 --> trace load -f traces/lf_HitagS256_dump.trace
[+] loaded 272 bytes from binary file traces/lf_HitagS256_dump.trace
[+] Recorded Activity (TraceLen = 272 bytes)
[?] try `trace list -1 -t ...` to view trace.  Remember the `-1` param
[usb] pm3 --> trace list -t hitags -c
[=] downloading tracelog data from device
[+] Recorded activity (trace len = 272 bytes)
[=] start = start of start frame end = end of frame. src = source of transfer
[=] Hitag1 / Hitag2 / HitagS - Timings in ETU (8us)

      Start |        End | Src | Data (! denotes parity error)                                           | CRC | Annotation
------------+------------+-----+-------------------------------------------------------------------------+-----+--------------------
          0 |          0 | Rdr |18(5)                                                                    |     |
        117 |        117 | Tag |21  a5  b4 [73]                                                          | !crc|
          0 |          0 | Rdr |00(5) 21  a5  b4  73 [8c]                                                |  ok |
        117 |        117 | Tag |c9  00  00  aa [75]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 00 [ab]                                                            |  ok |
        117 |        117 | Tag |21  a5  b4  73 [53]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 01 [b6]                                                            |  ok |
        117 |        117 | Tag |c9  00  00  aa [75]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 02 [91]                                                            |  ok |
        117 |        117 | Tag |48  54  4f  4e [2c]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 03 [8c]                                                            |  ok |
        117 |        117 | Tag |4d  49  4b  52 [1e]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 04 [df]                                                            |  ok |
        117 |        117 | Tag |00  00  00  00 [a6]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 05 [c2]                                                            |  ok |
        117 |        117 | Tag |00  00  00  00 [a6]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 06 [e5]                                                            |  ok |
        118 |        118 | Tag |00  00  00  00 [a6]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 07 [f8]                                                            |  ok |
        118 |        118 | Tag |57  5f  4f  4b [88]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 08 [43]                                                            |  ok |
 2021-12-30 01:46:41 +01:00
Philippe Teuwen
8a85702662 hitags: don't record SOF in trace and demodulate AC frame 2021-12-30 01:11:12 +01:00
Philippe Teuwen
323f70ff7a Add partial byte annotation in Hitag traces 
Example:
[usb] pm3 --> trace load -f traces/lf_HitagS256_dump.trace
[+] loaded 287 bytes from binary file traces/lf_HitagS256_dump.trace
[+] Recorded Activity (TraceLen = 287 bytes)
[?] try `trace list -1 -t ...` to view trace.  Remember the `-1` param
[usb] pm3 --> trace list -1 -t hitags -c
[+] Recorded activity (trace len = 287 bytes)
[=] start = start of start frame end = end of frame. src = source of transfer
[=] Hitag1 / Hitag2 / HitagS - Timings in ETU (8us)

      Start |        End | Src | Data (! denotes parity error)
------------+------------+-----+-----------------------------------------
          0 |          0 | Rdr |18(5)
        117 |        117 | Tag |0f(4) 2c  ab  cc  b3  cf  32  bf [2f]
          0 |          0 | Rdr |00(5) 21  a5  b4  73 [8c]
        117 |        117 | Tag |0f(4) c9  00  00  aa [75]
          0 |          0 | Rdr |0c(4) 00 [ab]
        117 |        117 | Tag |0f(4) 21  a5  b4  73 [53]
          0 |          0 | Rdr |0c(4) 01 [b6]
        117 |        117 | Tag |0f(4) c9  00  00  aa [75]
          0 |          0 | Rdr |0c(4) 02 [91]
        117 |        117 | Tag |0f(4) 48  54  4f  4e [2c]
          0 |          0 | Rdr |0c(4) 03 [8c]
        117 |        117 | Tag |0f(4) 4d  49  4b  52 [1e]
          0 |          0 | Rdr |0c(4) 04 [df]
        117 |        117 | Tag |0f(4) 00  00  00  00 [a6]
          0 |          0 | Rdr |0c(4) 05 [c2]
        117 |        117 | Tag |0f(4) 00  00  00  00 [a6]
          0 |          0 | Rdr |0c(4) 06 [e5]
        117 |        117 | Tag |0f(4) 00  00  00  00 [a6]
          0 |          0 | Rdr |0c(4) 07 [f8]
        117 |        117 | Tag |0f(4) 57  5f  4f  4b [88]
          0 |          0 | Rdr |0c(4) 08 [43]
 2021-12-29 23:48:16 +01:00
Philippe Teuwen
62a9f5dcc2 make style 2021-12-29 16:28:50 +01:00
Philippe Teuwen
11884de016 hf mf rdbl: fix example 2021-12-29 16:27:58 +01:00
Matt Moran
a1db683673 Add basic structure for hf gallagher 2021-12-29 23:42:06 +13:00
Matt Moran
f0b82c6311 Extract gallagher encoding/decoding 
Change input parameters to be `arg_u640` so that we can check they are the right lengths (and not have them silently truncated)
 2021-12-29 23:10:48 +13:00
Matt Moran
ac216b6cbd Add comments for common AIDs 2021-12-29 14:43:54 +13:00
iceman1001
cf7b1d2c17 maur keys 2021-12-28 07:38:40 +01:00
iceman1001
0d38da5de2 make style 2021-12-27 19:36:42 +01:00
iceman1001
e37a1a81ec remove arpa.inet dependency 2021-12-27 19:24:52 +01:00
iceman1001
ff1d66da61 remake style and output 2021-12-27 18:27:38 +01:00
Iceman
2a2f9275cd
Merge pull request #1549 from toucan12/ksx6924 
For testing KS X 6924 (South Korea's T-money card)
 2021-12-27 17:44:02 +01:00
iceman1001
6653bdc2be zx adaptations 2021-12-27 17:42:33 +01:00
Geonyeob Kim
b80097282b
for windows build test 2021-12-27 11:49:52 +09:00
Geonyeob Kim
182973a2ab
fix the translation 2021-12-27 09:51:24 +09:00
Geonyeob Kim
be594d8312
update changelog and cmakelists file 2021-12-27 09:30:49 +09:00
Geonyeob Kim
cfc8670909
code-style 2021-12-27 01:28:26 +09:00
Geonyeob Kim
b19117b6ab
KS X 6924 - Implement the initialize card function 2021-12-27 00:40:01 +09:00
Geonyeob Kim
18258af4f2
Supports KS X 6924 2021-12-27 00:37:26 +09:00
iceman1001
1b00c89115 fixing hf 15 dump 2021-12-25 18:51:23 +01:00
Oleg Moiseenko
7da4a34d7c
Merge pull request #1547 from merlokk/desf_buffer 
Desfire dynamic buffer allocation
 2021-12-24 20:56:13 +02:00
merlokk
b3f2a18ec4 top level read command dynamic memory allocation 2021-12-24 19:14:48 +02:00
iceman1001
d7291aac29 add some capabilities 2021-12-24 15:09:19 +01:00
iceman1001
4ff7514232 fixs 2021-12-24 15:06:38 +01:00
iceman1001
69ea599fee skeleton for ZX8211 2021-12-24 13:32:28 +01:00
iceman1001
7668d99300 maur.. 2021-12-24 13:16:36 +01:00
merlokk
74fc0a236c dynamic mem encoders/decoders 2021-12-24 12:27:01 +02:00
merlokk
02316e5fc3 DesfireExchangeEx dyn memory 2021-12-24 11:51:23 +02:00
merlokk
f827b85cda low level dynamic memory 2021-12-24 11:46:16 +02:00
merlokk
a622cc5879 fix mifate plus exchange bug 2021-12-23 19:33:44 +02:00
iceman1001
dca606fa0f adapt script to use current md5 impl etc 2021-12-22 21:51:01 +01:00
iceman1001
a18db22477 renamed for consistency 2021-12-22 21:49:34 +01:00
iceman1001
73579b5217 renamed for consistency 2021-12-22 21:48:25 +01:00
iceman1001
b1fe8c83ee renamed 2021-12-22 21:47:59 +01:00
iceman1001
c909a9c576 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-12-22 21:44:38 +01:00
Iceman
f97ab5f871
Merge pull request #1544 from keldnorman/patch-1 
Create ntag_bruteforce.lua
 2021-12-22 21:44:10 +01:00
iceman1001
dd08c69f7e cleaner 2021-12-22 21:09:28 +01:00
Philippe Teuwen
2389d899b1 lf cmdread: change --crc to --crc-ht 2021-12-18 14:39:54 +01:00
Philippe Teuwen
b7ad0c450f lf cmdread: add --crc to add Hitag/ZX8211 CRC 2021-12-18 01:34:14 +01:00
Philippe Teuwen
c3864a0ce5 lf cmdread: add -k to keep field on 2021-12-18 00:43:11 +01:00
Philippe Teuwen
628766391e add mfValidateAccessConditions to warn when dealing with invalid MFC ACL 2021-12-17 21:29:09 +01:00
iceman1001
9123eeac2d added hf mf acl to decode and print MIFARE ACLs. Thanks for the idea @mwalker33! I know you did implement one but you never pushed it ;) 2021-12-17 03:08:35 +01:00
iceman1001
3e7abffe09 maur keys 2021-12-17 02:21:51 +01:00
Keld Norman
5d3d1c7e48
Create ntag_bruteforce.lua 2021-12-14 02:38:27 +01:00
iceman1001
6173259a03 removing unused cmds 2021-12-13 18:45:40 +01:00
iceman1001
712ee2b10e strndup fixes for mingw 2021-12-13 18:44:46 +01:00
Philippe Teuwen
bad5b92ec9
Merge pull request #1542 from GhostJumper/master 
fixed some spelling
 2021-12-13 17:39:35 +01:00
Unrea1
ff71c1630d fixed spelling 2021-12-13 17:26:52 +01:00
Philippe Teuwen
4b936bc20c safer logic when touching locally g_printAndLog 2021-12-13 03:16:57 +01:00
Philippe Teuwen
2722655658 fulltext: fix bug triggering session log 2021-12-13 02:58:03 +01:00
Philippe Teuwen
b68a0ee082 readline autocomplete: fix rl_attempted_completion_over in script 2021-12-13 02:32:16 +01:00
Philippe Teuwen
6597d3e5a5 readline autocomplete: complete up to next space, so complete one single word at once 2021-12-13 02:29:32 +01:00
Philippe Teuwen
a5d491d67a Missing src in cmake files 2021-12-13 02:07:44 +01:00