RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-24 17:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
14854 commits 3 branches 14 tags 85 MiB
Commit graph

3047 commits

Author SHA1 Message Date
Christian Molson ff762027d9 em4x70: Update receive function with expected bits to receive. 2020-12-15 08:57:11 -05:00
Christian Molson afbef5ba73 em4x70: clean up check_ack function 2020-12-15 08:34:14 -05:00
Christian Molson a2c21f1d07 em4x70: fix function names 2020-12-15 08:33:57 -05:00
Christian Molson f87aa869c6 em4x70: clean up edge detection code 2020-12-15 08:15:18 -05:00
Christian Molson 40654b8ac6 em4x70: Clean up conversion of RF periods to ticks 2020-12-14 19:44:07 -05:00
Christian Molson 334000d444 em4x70: Used fixed threshold for high/low. Since we measure only pulse lengths (high+low) we just need to make sure the value is higher than noise threshold 2020-12-14 16:17:29 -05:00
Christian Molson 701914430f em4x70 makestyle 2020-12-12 10:02:43 -05:00
Christian Molson 13268df9c3 Merge remote-tracking branch 'upstream/master' into em4x70-auth 2020-12-12 10:00:22 -05:00
Christian Molson a6024a8622 EM4x70 Authentication support 2020-12-12 09:59:30 -05:00
Philippe Teuwen 7cd80611d3 #makestyleday 2020-12-12 14:46:40 +01:00
Christian Molson ed8c63a4f4 EM4x70 Unlock support. Send pin code to unlock tag. 2020-12-12 01:20:26 -05:00
Christian Molson 4c52fac9e1 EM4x70 write support 2020-12-11 23:26:17 -05:00
Christian Molson e48d343c5c Fix issue with command parity, adding too many bits to command 2020-12-09 16:22:38 -05:00
Christian Molson 011b585b0d Merge remote-tracking branch 'upstream/master' into em4x70_support 2020-12-09 10:00:42 -05:00
Christian Molson 97a27c0156 Remove debug code 2020-12-09 09:57:17 -05:00
iceman1001 01b2c14616 adapt and fix memoryleaks in Em4x50 2020-12-09 12:18:01 +01:00
tharexde d63d359c14 fixed initialization (memset instead of memcpy) 2020-12-07 20:31:27 +01:00
Christian Molson b0ff0ed526 Fix bug with manchester receive function. Using suggested algorithm from em4x70 datasheet 2020-12-07 11:18:00 -05:00
tharexde 0ba4394532 cleanup 2020-12-06 23:08:43 +01:00
tharexde 1a173f69f9 cleanup 2020-12-06 20:13:51 +01:00
tharexde ce83a1cb5f textual 2020-12-06 12:27:01 +01:00
tharexde f513582967 removed debug output 2020-12-06 01:58:07 +01:00
tharexde 314450b738 transferring data of dump file to device via 
- em4x50_eload or
	- file option "-f <filename>":
		- via spiffs if flash memory is available
		- via emulator memory if flash memory is not available
 2020-12-06 01:53:43 +01:00
tharexde d5347ced4e filename in spiffs is now a parameter of em4x50_sim 2020-12-06 01:48:41 +01:00
Christian Molson 614ab55809 Initial commit for em4x70 support. 
Initially I only have an em4x70 variant used for car transponders.
Also known as the ID48.
 2020-12-05 17:47:03 -05:00
tharexde 8fde0ba047 relocated FpgaDownloadAndGo from em4x50_chk to appmain 2020-12-05 23:44:18 +01:00
tharexde 952845722c use piffs instead of direct writing to flash memory 2020-12-04 22:38:48 +01:00
tharexde e50f386ad2 changed parameter in parameter list of em4x50_chk 2020-12-04 22:37:47 +01:00
tharexde 6876ff2f04 Relocated write requests in function 4x50_restore from device to client 2020-12-03 22:00:52 +01:00
tharexde d546936f5c Merge branch 'master' into update_4x50 
merge 20120merge 2012033
 2020-12-03 21:17:46 +01:00
tharexde 6448ade0f2 deleted client call of reset function 2020-12-03 20:47:01 +01:00
tharexde e41e8555a3 restore function now stops if password is wrong 2020-12-03 20:42:46 +01:00
cyberpunk-re a03d725a7f Comments 2020-12-01 22:56:08 +00:00
cyberpunk-re d792ff822b Proper identation and CHANGELOG entry 2020-12-01 21:42:22 +00:00
cyberpunk-re c76836880a Fix iso 15693 sim. Provide basic functionality for reader to detect ID 2020-12-01 21:28:37 +00:00
iceman1001 2613284dfc fix lf search - cotag exiting on deviceside 2020-12-01 17:06:49 +01:00
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
Philippe Teuwen a6beff18a5 fix em 4x05 bf 2020-10-20 15:46:44 +02:00
Philippe Teuwen 3b83e8e703 EM 4x05 login bf 2020-10-20 13:21:40 +02:00
Philippe Teuwen 29f1147aad make style 2020-10-20 01:00:23 +02:00
Philippe Teuwen ae1b4b62b6 EM4x05 login & read: don't use threshold for acquisition 2020-10-19 00:52:21 +02:00
Philippe Teuwen a8ca19bec5 EM 4x05: acquire more samples for Login 2020-10-19 00:15:01 +02:00
Philippe Teuwen 95bf65cda9 Add EM 4x05 Login 2020-10-18 23:46:36 +02:00
iceman1001 63603cc422 fix coverity 2020-10-16 17:13:14 +02:00
tharexde a84074686b removed global structure/variable for saving tag information 2020-10-14 20:01:15 +02:00
iceman1001 53c7e47e75 fix: hf iclass restore - now uses NG and better reporting and works :) 2020-10-14 17:41:34 +02:00
iceman1001 3868b0b4e6 hf iclass write, hf 15 raw, write, etc supports tear off trigger 2020-10-13 22:43:28 +02:00
iceman1001 6e6c8cbd6b hf 14b raw - added tearoff 2020-10-13 16:09:17 +02:00
iceman1001 d8b2dc2ebf enable tearoff for LF EM 4x50_WRITE & EM_WRITE_PASSWORD 2020-10-13 14:00:03 +02:00
iceman1001 597e069c50 remove HF ICLASS REPLAY, use HF ICLASS RDBL or HF ICLASS DUMP instead with option "n" 2020-10-13 11:54:38 +02:00
Philippe Teuwen a575827c99 add tearoff to hf 14a raw 2020-10-12 21:40:47 +02:00
iceman1001 7cfbdcbae9 WIP - hf mfu countertear ... 2020-10-12 19:08:29 +02:00
Philippe Teuwen 55fa5e7c35 make style 2020-10-11 22:40:05 +02:00
tharexde b4a8409349 clean up 2020-10-11 20:06:03 +02:00
iceman1001 bc9545d493 hf mfu otptear - textual, changing order on initial write device 2020-10-11 18:03:29 +02:00
iceman1001 863eaf1c8f fix 2020-10-11 11:20:07 +02:00
iceman1001 43f4bba432 hf mfu otptear - use high precision clock instead 2020-10-11 10:59:57 +02:00
iceman1001 ec679385b9 hf mfu otptear - textual 2020-10-11 09:51:56 +02:00
Philippe Teuwen 07023657f2 generic tearoff: make use of new @iceman SpinDelayUsPrecision :) 2020-10-09 14:55:17 +02:00
iceman1001 0c54d13c47 added a precision timer ( 0.6ns for 43ms) 2020-10-09 14:30:34 +02:00
Philippe Teuwen 7f8a4b4182 Add generic tear-off hook 2020-10-09 01:52:56 +02:00
iceman1001 f3a3a94fea hf 14a config - text / colours 2020-10-08 22:11:29 +02:00
iceman1001 9162a9d5f0 lf hic clone - now use cliparse and support FC,CN and RAW 2020-10-08 20:26:46 +02:00
Philippe Teuwen f4feaa6a03 EM4x05: capture tag 'error preamble' answer as well 2020-10-07 22:55:43 +02:00
Philippe Teuwen 9962b8769a EM4x05: add support for Protect command 2020-10-07 18:38:47 +02:00
Philippe Teuwen 491adacb94 get rid of tabs 2020-10-06 20:45:13 +02:00
Philippe Teuwen 3f9ddf9b29 make style 2020-10-06 18:41:15 +02:00
tcprst fbc7f05ad1
rebase on master, fix merge conflict 2020-10-06 09:33:02 -04:00
Philippe Teuwen f43ad0a239 HF_YOUNG: turn leds off when quitting mode 2020-10-06 01:26:36 +02:00
Philippe Teuwen 1610bf7e23 HF_YOUNG: HF field off and sleep between polls 2020-10-06 01:26:14 +02:00
Philippe Teuwen b081684f22 HF_MATTYRUN: turn leds off when quitting mode 2020-10-06 01:17:40 +02:00
Philippe Teuwen cdd39f3ac3 HF_COLIN: HF field off and sleep between polls 2020-10-06 01:05:26 +02:00
Philippe Teuwen 6540b4561c HF_AVEFUL: allow to exit mode with long press 2020-10-06 00:52:11 +02:00
Philippe Teuwen 7b599c7f67 HF_AVEFUL: HF field off and sleep between polls 2020-10-06 00:51:52 +02:00
Philippe Teuwen fb90c078ff HF_MFSDSAL: turn HF field off 2020-10-06 00:38:30 +02:00
tharexde 68db54028c added function 4x50_watch 2020-10-05 22:59:08 +02:00
iceman1001 ad20dcb30a 14a - less wake up wait 2020-10-05 10:03:19 +02:00
iceman1001 8baeaa58e2 14b -add option for cleatrace, empty card struct, and adapt the padding of bits 2020-10-05 10:02:32 +02:00
iceman1001 77f4371cd1 plot 2020-10-04 19:39:22 +02:00
iceman1001 dd970ea562 text 2020-10-04 02:09:58 +02:00
tharexde b0cfb28d40 Merge branch 'master' into allin 
update
 2020-10-03 23:34:23 +02:00
tharexde a9ec622d97 added standalone mode "brute force" 2020-10-03 22:59:21 +02:00
Philippe Teuwen e5f746e018 fix 14b apdu 2020-10-03 19:08:34 +02:00
iceman1001 01af87e6d7 hf 14b sniff, sim, info, - now uses cliparser 2020-10-02 18:06:21 +02:00
iceman1001 31f5502171 remade ASK C-ticket select to deviceside 2020-10-02 14:31:52 +02:00
Philippe Teuwen b1c1433e45 14b: safer handling of corrupted signals 2020-10-02 00:58:41 +02:00
Philippe Teuwen f56cbc82f5 Add support for 14b' aka Innovatron in armsrc/iso14443b.c 2020-10-01 23:26:55 +02:00
iceman1001 5e91f35cd6 make sure tosend is not contain spurious bits from before 2020-10-01 00:37:37 +02:00
iceman1001 9e05faabff unify buffers 2020-09-30 19:20:40 +02:00
iceman1001 f221d127a1 wrong flag 2020-09-30 18:19:51 +02:00
iceman1001 181bb3bc74 added: hf 14b apdu 2020-09-30 17:06:19 +02:00
Philippe Teuwen c3c59e35cb make style 2020-09-30 14:27:19 +02:00
iceman1001 566d6dc4b7 boundry check for tosend buffer 2020-09-28 17:46:12 +02:00
iceman1001 c8aee45aca adapt hitag2 write 2020-09-28 15:44:44 +02:00
iceman1001 64c13c3aa1 style 2020-09-28 08:23:49 +02:00
tharexde c20ab4ca20 added function reset 2020-09-27 23:39:04 +02:00
tharexde 2e5cf12d7d added login function 2020-09-27 23:22:51 +02:00
tharexde ab8b5814b0 Merge branch 'dev-bruteforce_em4x50' into allin 
merge
 2020-09-27 19:55:42 +02:00
tharexde 037234bbbe Merge branch 'master' into dev-bruteforce_em4x50 
update
 2020-09-27 15:03:27 +02:00
tharexde 2dee47fe28 Merge branch 'master' into allin 
update
 2020-09-27 15:02:51 +02:00
tharexde c2d3b89325 very small corrections 2020-09-27 14:59:53 +02:00
tharexde fc3638a5f4 changed function name 2020-09-27 13:42:27 +02:00
tharexde ab5e4405fe changed function name + column order (output "lsb"/msb") 2020-09-27 13:42:13 +02:00
tharexde 2308cc7175 new entry for function em4x50_bruteforce 2020-09-27 12:59:04 +02:00
tharexde 38f88c1e4f new function 4x50_bruteforce 2020-09-27 12:55:59 +02:00
tharexde 1e75ddfff8 new entry for function 4x50_bruteforce 2020-09-27 12:54:54 +02:00
iceman1001 b4728157fb fix return codes for 14b, sorting out status checks in client 2020-09-26 09:33:36 +02:00
tharexde 5665de56e9 styling 2020-09-23 23:45:43 +02:00
tharexde 45a1a83752 make style 2020-09-23 23:44:42 +02:00
tharexde 59483e8c3b Merge branch 'master' into allin 
update 23.9.2020
 2020-09-23 23:20:18 +02:00
tharexde eaefd78c64 corrected stupid error (&->&&) 2020-09-23 23:16:39 +02:00
tharexde 7b62035bc4 adopted log file name, renamed functions 2020-09-23 23:09:12 +02:00
tharexde a7a86edf51 deleted inactive parts, corrected timeout handling 2020-09-23 23:08:24 +02:00
tharexde 252b8236cf renamed function names 2020-09-23 23:06:12 +02:00
Philippe Teuwen 7d4c6e8faa Fix Gen3 detection bug against MFUL 2020-09-23 12:25:30 +02:00
Philippe Teuwen 3909053cee Rename data_readpwdmem.lua -> mem_readpwd.lua and data_readpwdmem-spiffs.lua -> mem_spiffs_readpwd.lua 2020-09-23 00:46:57 +02:00
tharexde 72ab7177ae removed double declaration of variable "sample" 2020-09-23 00:12:57 +02:00
Philippe Teuwen 610b456a97 fix lau scripts renaming 2020-09-23 00:11:11 +02:00
tharexde 51651a1e0a Merge branch 'dev_standalone' into malsehn_standalone 2020-09-23 00:07:34 +02:00
tharexde b96b92249f div errors 2020-09-22 23:55:46 +02:00
tharexde 48495bf272 added missing "endif" 2020-09-22 23:34:23 +02:00
tharexde 732d903b52 simulate/read 2020-09-22 23:31:11 +02:00
Philippe Teuwen 1e19a7216a Avoid first spurious samples in LF sniff modes, prevents false triggering 2020-09-20 12:59:30 +02:00
Philippe Teuwen 35e276f8ed Add options to 'lf sniff' for repeated acquisitions 2020-09-20 11:37:51 +02:00
Ave fe22eafcf1
hf_aveful: Pull proper counter and tearing, bugfixes 2020-09-20 02:07:21 +03:00
Ave 4cd1c512b9
hf_aveful: Add Ultralight EV1 support, clean code, dynamically determine 
block size
 2020-09-20 01:00:57 +03:00
iceman1001 a32fbd21bd redundant declaration 2020-09-18 19:51:20 +02:00
Philippe Teuwen 426c08e221 ht2: avoid sending spurious command after command is finished 2020-09-18 17:04:54 +02:00
Philippe Teuwen 59976aa588 fix ht2 initial command timing 2020-09-18 17:04:54 +02:00
iceman1001 cedfea8149 continue testing next sector 2020-09-18 12:07:34 +02:00
iceman1001 8f2b9b9d66 less field timeup before first transmit 2020-09-17 22:17:16 +02:00
Philippe Teuwen 8dd803cd6b hitag: avoid warning about unaligned pointer in packed struct 2020-09-17 19:40:56 +02:00
Philippe Teuwen 4ec7bca270 Add option to define extra symbols for 'lf cmdread', required e.g. for Hitag Micro and for talking to HT2 in emulation mode 2020-09-17 17:18:14 +02:00
Philippe Teuwen c994323105 Unify 'lf read' and 'lf cmdread options', add options to cmdread 2020-09-16 12:59:42 +02:00
iceman1001 edebf17be5 keep WDT happy 2020-09-15 17:26:24 +02:00
Philippe Teuwen 172f3163e6 update magic cards doc 2020-09-13 15:19:35 +02:00
Philippe Teuwen 812d9cc46a style 2020-09-12 00:31:17 +02:00
Philippe Teuwen ecbcba18dd identify gen3 2020-09-11 18:17:58 +02:00
iceman1001 5b695153b6 improved staticnonce tristate processing 2020-09-11 16:15:58 +02:00
Philippe Teuwen e488ef306c Fix MFC static nonce detection on some cards and do it before prng det 2020-09-11 14:09:38 +02:00
Philippe Teuwen 55e800e4ce text 2020-09-11 13:36:57 +02:00
iceman1001 866f4b6313 hf 14a info - ntag21x identification 2020-09-10 20:40:12 +02:00
iceman1001 5689546ae0 fix super 2020-09-10 01:40:50 +02:00
iceman1001 eb353056dc fix super 2020-09-10 01:34:29 +02:00
iceman1001 9ced99a853 cident super card 2020-09-10 01:31:54 +02:00
iceman1001 2514ec740c uid 7 or 4 for desfire 2020-09-10 00:33:46 +02:00
iceman1001 014a3a4998 desfire supports 7 and 4 bytes 2020-09-10 00:24:56 +02:00
iceman1001 420b29c7bf hf 14a sim t 10 - possibility to simulate IKEA rothult locks 2020-09-10 00:05:50 +02:00
Philippe Teuwen 9778b272a8 Add ATS of NTAG Gen2 2020-09-09 02:01:36 +02:00
Philippe Teuwen 9f33e52ae0 Add ATS of other MFUL Gen2 2020-09-09 01:16:29 +02:00
Philippe Teuwen 22938f15dd Add ATS of other MFUL Gen2 2020-09-09 01:09:44 +02:00
Iceman 2990dba14f
Merge pull request #949 from aveao/mfucompatwrite 
Introduce compatible write support to hf mfu wrbl
 2020-09-08 23:27:41 +02:00
Eloff 589b0142e0 Fix: magic gen 3 card response check 2020-09-08 23:01:39 +03:00
Ave c06e5d0ac7
Remove old commented MifareUWriteBlockCompat 2020-09-07 22:44:01 +03:00
Ave f1146d360f
Introduce compatible write support to hf mfu wrbl 2020-09-07 22:34:44 +03:00
Philippe Teuwen a06f1c8858 hf mf eclr: cleaner end cond, even if it doesn't change behavior 2020-09-07 15:43:34 +02:00
Philippe Teuwen 974e9d8bb1 Fix hf mf eclr trailer sectors on 4K 2020-09-07 15:37:19 +02:00
Philippe Teuwen e3b8e868ea hf 14a config: force RATS 2020-09-07 15:09:24 +02:00
iceman1001 5d357a6039 style 2020-09-07 10:39:15 +02:00
iceman1001 0be35a8e7e style 2020-09-07 10:35:09 +02:00
Philippe Teuwen 2fc36d73c9 hf 14a config: better options 2020-09-07 10:24:12 +02:00
iceman1001 289f1c234c make sure magic wipe cmd gets 2000ms timeout 2020-09-07 10:21:29 +02:00
Philippe Teuwen b751354ea2 hf 14a: add config loopholes to deal with badly configured cards: invalid ATQA, invalid BCC, invalid SAK 2020-09-07 00:50:27 +02:00
iceman1001 007fc0893d some gen2 identification (@mceloff) 2020-09-06 21:56:20 +02:00
iceman1001 53831a4a3c adapt standalone 2020-09-06 21:42:50 +02:00
iceman1001 718e6d2ce8 hf legic sim -> text, use NG, report back 2020-09-06 21:41:04 +02:00
iceman1001 9d86185287 textual 2020-09-06 21:40:19 +02:00
iceman1001 a928fade9c textual 2020-09-06 21:40:06 +02:00
iceman1001 ae7fc5006e mergehell, piwi's legic changes 2020-09-06 20:06:24 +02:00
iceman1001 47f1bd2d6c lfsampling adaptations 2020-09-06 18:32:23 +02:00
Philippe Teuwen 8ae5fef830 less messages in t55xx, arm side 2020-09-06 17:21:16 +02:00
iceman1001 f8f5d87844 fix "hf mfu dump" bb malloc 2020-09-06 16:15:12 +02:00
Iceman 4437148a49
Merge pull request #945 from McEloff/hf_mf_magic_gen3 
Magic gen 3 cards support
 2020-09-06 00:47:34 +02:00
iceman1001 424f2810c5 adapt timeout for 4x05 2020-09-06 00:08:20 +02:00
iceman1001 744649136d change struct 2020-09-05 23:58:42 +02:00
iceman1001 70ba690c06 adapt timeout 2020-09-05 23:58:21 +02:00
Eloff 70be7ef4d8 Magic gen 3 cards support 2020-09-05 22:32:11 +03:00
tharexde c49e2d7ba9 solved 2020-09-05 13:25:57 +02:00
iceman1001 7904d962aa timeout in waiting loops 4x50 2020-09-05 12:50:30 +02:00
iceman1001 643a53c592 skip all zeros response that "hf mf sim" might answer.. (wrongly) 2020-09-05 08:32:26 +02:00
iceman1001 65e6af8aef dont set empty any longer 2020-09-05 08:04:46 +02:00
iceman1001 4a254a13ce Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-09-05 07:41:19 +02:00
iceman1001 6aa65b735b timeout in listening window EM4x50 2020-09-05 07:40:56 +02:00
Ave befb5f1c01
hf_aveful: Move Makefile.hal entry to be alphabetic 2020-09-04 00:13:41 +03:00
Ave 2687d9f3ec
hf_aveful: last minute code formatting 2020-09-03 18:44:30 +03:00
Ave 6c92b9d1ed
hf_aveful: rename from hf_aveul to hf_aveful 2020-09-03 18:38:58 +03:00
Ave c4e01ce81e
hf_aveul: Use defines to make the code easier to configure for other card types 2020-09-03 18:29:18 +03:00
Ave 51360c4d1a
hf_aveul: Extend comments 2020-09-03 17:43:47 +03:00
Ave ec877e04ea
Add hf_aveul standalone mode 2020-09-03 17:33:36 +03:00
iceman1001 d6548d1c80 use array instead 2020-09-03 12:31:31 +02:00
iceman1001 c0c580bc66 ecfill - dont break of a bad read, fill w zeros and report back partial dump 2020-09-03 10:31:50 +02:00
iceman1001 c9f853de2f added references to youtube videos 2020-09-03 10:29:25 +02:00
iceman1001 d98ffd43aa textual 2020-09-03 10:22:59 +02:00
iceman1001 71fc3e18d9 fixing return codes for Autopwn, added staticnested to autopwn 2020-09-02 12:16:11 +02:00
iceman1001 441bf920fc check all keys... 2020-08-31 03:04:32 +02:00
iceman1001 b356a2e18c debug textual 2020-08-31 01:41:11 +02:00
iceman1001 6b6e038d1c debug textual 2020-08-31 01:40:02 +02:00
iceman1001 7f14ebc84b take care of type when shifting 2020-08-31 01:19:06 +02:00
iceman1001 bd3047f316 less checks for dataavailable 2020-08-31 01:16:13 +02:00
iceman1001 9639ee8e81 less checks for dataavailable 2020-08-31 01:15:49 +02:00
iceman1001 d6e3366c43 mix->ng 2020-08-26 14:37:39 +02:00
iceman1001 32c614db7b fix cotag memory bugs. was off-by-one 2020-08-25 15:34:10 +02:00
iceman1001 4dcc15fb95 style 2020-08-21 19:30:15 +02:00
iceman1001 41375a1d09 cleaner banner 2020-08-21 17:58:07 +02:00
iceman1001 dc6e4ea4ea lf t55xx chk m - tweaking the algo 2020-08-21 17:46:29 +02:00
iceman1001 832bdf7a66 guarding the OUT 2020-08-21 15:47:19 +02:00
iceman1001 0641ada091 since t55xx chkpwd uses EM for pwd storage 2020-08-21 14:50:14 +02:00
iceman1001 e3767a3e28 lf t55 chk m (works again!). lf t55 config (prints correct pwd if used) 2020-08-21 14:10:32 +02:00
iceman1001 33b2b1e8b9 test: reverse the "check reader mac" in iclass sim3 2020-08-19 22:37:37 +02:00
iceman1001 9cbf6c441e fix - running esave after fchk gave empty accessrights 2020-08-19 16:41:28 +02:00
iceman1001 b273a6c831 reverse length check 2020-08-19 16:26:26 +02:00
iceman1001 815e004b8d log zero length responses again... sof.. 2020-08-19 16:22:56 +02:00
iceman1001 ea86edc723 reverse a check change 2020-08-19 16:11:44 +02:00
iceman1001 7d6401ce49 adapt start time end time 2020-08-17 22:07:50 +02:00
iceman1001 6b8c5e0d24 adapting epa cnonces 2020-08-17 22:06:54 +02:00
iceman1001 730a233149 clear bigbuff also should reset tracelen 2020-08-17 09:12:28 +02:00
iceman1001 2be85939f7 fix: hf 15 cetsuid. hf 15 sim 2020-08-17 08:52:24 +02:00
iceman1001 65f174ad9f no inline 2020-08-16 22:47:58 +02:00
iceman1001 8ebeebe7c2 u16 2020-08-16 22:47:45 +02:00
iceman1001 641349f6be true.. 2020-08-16 22:47:07 +02:00
iceman1001 8ff8ccb9a7 adapt 14b mergehell 2020-08-16 21:13:10 +02:00
iceman1001 762381237d no inline 2020-08-15 11:01:26 +02:00
iceman1001 cd26b29898 style 2020-08-15 11:00:49 +02:00
iceman1001 49f49288a6 no inline 2020-08-15 11:00:27 +02:00
iceman1001 8b25c952f4 14b sniff works better. Still missing tag response amplitude demodulation code 2020-08-14 14:58:27 +02:00
iceman1001 07af67c6e0 iso15 device side got some love 2020-08-14 14:56:20 +02:00
iceman1001 1ca66ddf47 remove debug stuff 2020-08-14 14:55:26 +02:00
Philippe Teuwen 4ed57c7c4d make style 2020-08-13 12:25:04 +02:00
iceman1001 339e598039 readermac 2020-08-13 10:13:16 +02:00
iceman1001 f13fbe32e8 hf iclass replay 2020-08-12 13:00:30 +02:00
iceman1001 94ce1a9ec9 textual 2020-08-12 11:27:41 +02:00
iceman1001 483fed90fe hf iclass replay works. A bit bad in not reading AA2. Assumes a KD mac 2020-08-11 23:46:11 +02:00
iceman1001 24177efdf6 iclass sniff now works 2020-08-11 21:40:22 +02:00
iceman1001 c1a5f93dab send arguments to standalone mode 2020-08-08 23:45:09 +02:00
iceman1001 8dd9c92beb simlper select 2020-08-08 22:26:05 +02:00
iceman1001 dd2e04814e textual 2020-08-08 19:44:28 +02:00
iceman1001 66d18eb00f iceclass reader attack mode to save unique files 2020-08-08 17:45:07 +02:00
iceman1001 ccbfdf9e88 add: mem spiffs wipe 2020-08-08 12:33:12 +02:00
iceman1001 93fc114dd3 iclass sniff, still too slow 2020-08-08 11:41:26 +02:00
iceman1001 44227efc67 fix the config trigger 2020-08-08 11:40:06 +02:00
iceman1001 9376846958 remove some extras 2020-08-08 07:56:28 +02:00
iceman1001 e309c8c7ab pm3other compilation error mplicit declaration of function "Csprintf" 2020-08-06 20:40:46 +02:00
iceman1001 7450ad6573 style and trying a long timeout 2020-08-06 16:20:29 +02:00
iceman1001 18247e892d less retries 3->2 since its so good now. read_block start /eof time in call, sanity checks, textual, save if not exist, also if current file is less than new data 2020-08-06 16:19:42 +02:00
iceman1001 bc692c2ad2 remove debugstuff 2020-08-06 16:17:08 +02:00
iceman1001 9dca01d1bc mem spiffs tree - textual 2020-08-06 16:16:24 +02:00
iceman1001 9f39ea9f9b obey lock bits and correct size 2020-08-06 08:13:29 +02:00
iceman1001 dca17c3791 make sure we get aia 2020-08-06 08:12:07 +02:00
iceman1001 62d9b403b4 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 into fpga 2020-08-03 21:22:13 +02:00
iceman1001 d93364bc22 textual chk, loopup. Sim working on reva,b,c readers 2020-08-03 17:42:05 +02:00
iceman1001 5725eed2cd to log or not to log 2020-08-03 17:38:18 +02:00