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

2761 commits

Author SHA1 Message Date
tharexde
b0b0d4b3f3 Merge branch 'master' into update_4x50 
fixed conflict
 2020-11-30 23:42:39 +01:00
Iceman
1cfc69bd0d
Merge pull request #1079 from cyberpunk-re/MFU_SIM_maxReads 
MFU emulation now supports automatic exit after <num> blocks read.
 2020-11-30 23:14:00 +01:00
tharexde
98fbd89fb5 restored unintentionally deleted parts 2020-11-30 22:28:06 +01:00
tharexde
9d52801259 Merge branch 'master' into update_4x50 
update 201130 2
 2020-11-30 21:18:03 +01:00
cyberpunk-re
5486bdd18c Added 'mf mfu sim t 7 n <numreads>' - MFU emulation now supports automatic exit after <num> blocks read. 2020-11-30 20:07:51 +00:00
iceman1001
1bccb77654 lf hid clone - prepped for EM. Disabled it for viking / hid clone until further testing 2020-11-30 21:06:37 +01:00
tharexde
efd6c04b7e Merge branch 'master' into update_4x50 
update 201130
 2020-11-30 20:38:25 +01:00
tharexde
f03fac540a delated watch function (em4x50) 2020-11-30 00:03:22 +01:00
tharexde
e6eb6af9e3 - replaced return value BUTTON_SINGLE_CLICK by PM3_EOPABORTED 
- changed 4x50_stdread to 4x50_reader
 2020-11-30 00:01:08 +01:00
tharexde
96cceab10a changed 4x50_stdread to 4x50_reader 2020-11-29 23:58:10 +01:00
tharexde
fdd2890272 changed 4x50_stdread to 4x50_reader 2020-11-29 23:57:55 +01:00
iceman1001
2fcd46f278 lf ti write - now uses NG, cliparser (untested) 2020-11-29 14:00:51 +01:00
tharexde
427577fee6 deleted em4x50 standalone mode 2020-11-29 01:09:54 +01:00
tharexde
beed73b095 deleted em4x50 standalone mode 2020-11-29 01:09:30 +01:00
tharexde
72b21f018e Merge branch 'master' into allin 
update 201129
 2020-11-29 00:22:09 +01:00
tharexde
7bc372633f - changed return values from Boolean to "pm3" 
- added LED signals
 2020-11-29 00:19:42 +01:00
iceman1001
93bdc9f75b hf mf sim - minor short times... 2020-11-29 00:16:22 +01:00
iceman1001
7593fa20b8 textual (thanks @ave_!) 2020-11-28 22:21:21 +01:00
tharexde
35404eb207 added LED signals (A -> signal_properties, B -> listening windows, C -> reading) 
stabilized noise detection by ignoring first samples
 2020-11-27 22:21:45 +01:00
tharexde
b18ded915a Merge branch 'master' into allin 
update 201127
 2020-11-27 21:24:33 +01:00
tcprst
db083034d6
make style 2020-11-26 00:44:26 -05:00
tcprst
f4b100b068
show both decimal and hex for iclass blocks 2020-11-25 18:42:22 -05:00
tcprst
88b7efe69a
hf iclass restore - now use cliparser 2020-11-25 18:00:32 -05:00
iceman1001
b7c0d6aa5e lf viking clone - now supports clone to EM4305/4469 (untested) 2020-11-25 15:13:32 +01:00
tcprst
1afb335478
make style 2020-11-22 19:39:54 -05:00
tharexde
86b9d2c620 cosmetics 2020-11-20 22:03:19 +01:00
tharexde
e642c05e5c Merge branch 'master' into allin 
update 201119
 2020-11-19 23:21:19 +01:00
tharexde
56efc8adec rearrangements 2020-11-19 23:18:04 +01:00
tharexde
0bca672fbd deleted button test in wait_timer function 2020-11-16 00:33:36 +01:00
tharexde
333fb5cbd4 clean up 2020-11-15 21:59:25 +01:00
tharexde
f6e37d868e switched to PM3 status/error codes as return codes (if possible/sensible) 2020-11-15 19:54:51 +01:00
Ave
7c5e3a29de
Fix old UID display on hf mf csetuid 2020-11-15 20:14:08 +03:00
tharexde
7aebe20dd6 - enhanced reliability of manual interruption 
- switched to PM3 error/status codes for reset function
 2020-11-15 17:15:18 +01:00
tharexde
79e1159eaf Merge branch 'master' into allin 
update 201114
 2020-11-14 19:56:02 +01:00
Philippe Teuwen
2f6261badb ReaderIso14443a: save/restore timeout 2020-11-13 22:34:04 +01:00
tharexde
b91792f1d7 deleted uneccessary includes 2020-11-13 20:27:57 +01:00
tharexde
dcfd7f4a01 - wait function can now be left with pm3 button -> e.g. no inf. loop in 4x50_wath 
- merged function get_pwd(...) into 4x50_chk
 2020-11-12 01:23:51 +01:00
tharexde
5d34efc6e6 Relocated write requests of function „4x50_wipe" from device to client 2020-11-11 22:36:24 +01:00
tharexde
3d14dbfbd0 pressing the pm3 button now stops 4x50_chk function 2020-11-11 01:37:54 +01:00
tharexde
ae96cd869a relocated "pwd block management" from device to client 2020-11-11 01:11:09 +01:00
tharexde
8a1558757c Merge branch 'master' into allin 
update 201110
 2020-11-10 00:47:13 +01:00
tharexde
8682d48419 - switched from emulator memory to flash memory for various functions 
- completed 4x50_chk functions -> segmented password list if size is > max size of emulator memory
- various corrections/modifications
 2020-11-10 00:43:08 +01:00
iceman1001
a41e71d03d fix #946, unsecured card use crc16, secured MAC 2020-11-09 09:36:27 +01:00
Philippe Teuwen
f63cf02178 make style 2020-11-07 01:32:43 +01:00
Philippe Teuwen
a8b92f48a7 reorganize few global vars & fcts 2020-11-05 23:05:52 +01:00
Philippe Teuwen
bae2f5f04e disable more code with SKIP_ISO14443* 2020-11-05 22:27:01 +01:00
iceman1001
60aed2c865 for a gentle kiwi 2020-11-05 12:14:09 +01:00
iceman1001
928a4f789e fiddling with mfu 2020-11-05 12:06:12 +01:00
iceman1001
7f6e3a7cfc textual 2020-11-05 12:02:54 +01:00
Philippe Teuwen
e750481d12 Fix multiple issues with reported flash memory usage: 
- Remove unused next_free_memory=BigBuf_get_addr()
- Fix size retrieval of compressed data section
  by chance the corrupted value was > than correct value so
  decompression was taking place, but was returning an error
  instead of the decompressed size
- Fix reporting of compressed size into common_area
  returned value of LZ4_decompress_safe is the decompressed size
  while we needed to report the compressed size
- Fix common_area late initialization
  common_area was initialized (and zeroed) after
  uncompress_data_section() had reported the compressed size
  in common_area, so compressed size was erased

Compressed size is used in the computation of the used and available
flash memory, which is now correct
(it was wrongly telling about 6kb were free while they weren't).
 2020-11-05 00:59:32 +01:00
Philippe Teuwen
f9452ee19a Group 14a sim response indexes in header 2020-11-03 02:32:41 +01:00
Philippe Teuwen
c03daf233c Add support for 10b UID in hf 14a sim 2020-11-03 02:32:41 +01:00
iceman1001
cd20b208d0 bigbuf calloc ftc where the memory is set to zero before 2020-11-02 19:07:03 +01:00
Iceman
03bd9e00b2
Merge pull request #1046 from tcprst/iclass_cliparser2 
hf iclass eload, loclass - now use cliparser
 2020-11-02 08:03:58 +01:00
iceman1001
7884c4bcb4 zero out uid 2020-11-02 07:50:07 +01:00
tcprst
4c333ff02f
Update references to hf iclass loclass 2020-11-01 21:02:51 -05:00
Philippe Teuwen
777cb5a8ce make style 2020-11-02 01:46:47 +01:00
tharexde
0896ae2bf4 Merge branch 'master' into allin 
update
 2020-11-02 00:03:30 +01:00
tcprst
4c69b02823 reorder Makefile alphabetical 2020-11-01 23:58:44 +01:00
tcprst
e44ae18d5c Create hf_tcprst standalone mode - IKEA Rothult 2020-11-01 23:58:44 +01:00
tharexde
f2dad2f566 added possibility for manual interruption of 4x50_watch 2020-11-01 23:37:42 +01:00
tharexde
836ca5da40 Merge branch 'master' into allin 
update 201101
 2020-11-01 22:57:07 +01:00
tharexde
65a591119b - added first version of 4x50_chk 
- renamed 4x50_write_password to 4x50_writepwd
- added check regarding valid data in emulation memory for 4x50_sim
 2020-11-01 22:47:00 +01:00
tharexde
3ddd9f8a91 - added first version of 4x50_chk 
- renamed 4x50_write_password to 4x50_writepwd
 2020-11-01 22:44:16 +01:00
iceman1001
1902c36394 fix 2020-11-01 01:42:23 +01:00
iceman1001
5f411bdc3e miller decoding, in odd cases should return 2020-11-01 01:10:54 +01:00
tharexde
d977902fd8 Merge branch 'master' into allin 
update 201031
 2020-10-31 14:56:23 +01:00
tharexde
098ca87c81 renamed std_read -> stdread 2020-10-31 14:53:52 +01:00
tharexde
033155e358 sing emulator memory for sim and restore 2020-10-31 01:50:24 +01:00
tharexde
f412b20fc1 sing emulator memory for sim and restore 2020-10-31 01:50:03 +01:00
tharexde
902b52ab02 using emulator memory for sim and restore 2020-10-31 01:49:46 +01:00
Philippe Teuwen
1d018b9ccb hf 14a info: add msgs when forced RATS config 2020-10-30 09:23:22 +01:00
iceman1001
fd6dda5e36 cident - verify rats has size and empty buffers before 2020-10-29 12:26:43 +01:00
iceman1001
e52b7c2139 fix: bad identification of some gen2 2020-10-29 10:53:34 +01:00
tharexde
140037d9f0 Adaptation of the implementation of read function to that currently used in master branch 2020-10-27 19:16:54 +01:00
iceman1001
89f305b842 forgot header file 2020-10-27 18:52:11 +01:00
iceman1001
52164a4fd1 hf 14b sriread -> hf 14b rdbl, renamed and refactored it to read a block. use dump, to dump whole tag 2020-10-27 18:26:14 +01:00
tharexde
ce5181bdc9 added std_read command for em4x50 2020-10-27 18:18:02 +01:00
tharexde
e63a40e5b6 added file upload for sim function 2020-10-27 00:53:50 +01:00
tharexde
d6471f2231 Merge branch 'master' into allin 
update
 2020-10-26 22:20:32 +01:00
tharexde
d034d640fc added simple sim functionality for em4x50 (+ some minor corrections) 2020-10-26 22:13:07 +01:00
tharexde
96e05d49df added simple sim function for em4x50 2020-10-26 22:10:48 +01:00
iceman1001
57f226c922 smart upgrade - now uses NG, added crc for each transfer to verify data integrity before flashing 2020-10-26 00:38:13 +01:00
tharexde
3ce365ee2b Merge branch 'master' into allin 
update
 2020-10-26 00:31:27 +01:00
tharexde
b3b6f827e8 no comment necessary 2020-10-26 00:12:52 +01:00
tharexde
0b034321ac added new function 4x50_restore 2020-10-25 16:40:39 +01:00
tharexde
ea5fc5cc46 added new function 4x50_restore 2020-10-25 16:40:02 +01:00
tharexde
4c6651b3c8 added new function 4x50_restore 2020-10-25 16:39:40 +01:00
Philippe Teuwen
4ff8c44d85 Add warning if using 14a Transmit without setting HF field 2020-10-25 11:23:56 +01:00
iceman1001
bc48941951 fix smart card 2020-10-25 01:12:20 +02:00
Philippe Teuwen
21bc3b8822 typos 2020-10-24 01:18:51 +02:00
iceman1001
34148b0383 fix https://github.com/RfidResearchGroup/proxmark3/issues/1029 2020-10-23 10:00:47 +02:00
tharexde
243e6934de added "tearoff" 2020-10-22 15:07:05 +02:00
tharexde
069018e72a Merge branch 'master' into allin 
update
 2020-10-22 01:01:59 +02:00
tharexde
d6b90bbe6b deleted debug output 2020-10-22 00:55:29 +02:00
tharexde
a04002ab1b redesign 2020-10-22 00:42:18 +02:00
Philippe Teuwen
50c0d93951 Change EM4x05 reader timings 
Closer to the spec and better results, more robust to tag position
 2020-10-20 23:49:26 +02:00
Philippe Teuwen
47cfc778e3 typos 2020-10-20 20:22:54 +02:00
iceman1001
d8294a958b hf 14a antifuzz - now uses NG 2020-10-20 17:36:01 +02:00
iceman1001
2e27a493e8 revert to precision clock 2020-10-20 17:34:42 +02:00