RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-23 00:37:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
12892 commits 3 branches 14 tags 86 MiB
Commit graph

2892 commits

Author SHA1 Message Date
iceman1001 f6462137cf standalone mode LF_EM4100RWC, LF_EM4100RSWB - odd big buff static pointer usage 2021-01-27 23:18:01 +01:00
tharexde 1c3d3b350a - used WaitUS() instead of own function for reading operations 
- used GetTicks() instead of using direct timer TC0
=> standalone mode functions can be simplified significantly
 2021-01-27 01:10:57 +01:00
tharexde d53fda3d3d first working version (complete) 2021-01-27 01:03:10 +01:00
tharexde 1ca5d3c53c 4x50 standalone mode 2021-01-25 23:52:14 +01:00
Philippe Teuwen 0fee0c97cb make style 2021-01-23 22:38:07 +01:00
Marcos Del Sol Vives 8bf89436f8 Improve error messages on encrypted nonce acquisition 2021-01-22 16:06:39 +01:00
Marcos Del Sol Vives 7094994b57 Fix nonce acquisition 2021-01-22 16:05:45 +01:00
tharexde e09d8b27a2 timeout define instead of hardcoded value 2021-01-20 19:29:57 +01:00
tharexde 6b6f104d9a if no carrier clear former authentication 2021-01-20 00:58:48 +01:00
tharexde a931cea2f6 First fully functional version of 4x50 sim 2021-01-19 00:20:03 +01:00
tharexde 78d1e09595 deleted test functions, clean up 2021-01-18 00:01:22 +01:00
tharexde 473d89342b rearrangements 2021-01-17 23:35:21 +01:00
tharexde ef56bee76a Merge branch 'master' into sim_half_duplex 
update 210117
 2021-01-17 00:31:38 +01:00
tharexde 03d56596cb clean up 2021-01-17 00:27:08 +01:00
tharexde cff48f84c6 refactoring 2021-01-16 19:40:42 +01:00
tharexde c15266dfc2 added timeouts 2021-01-16 01:59:02 +01:00
Philippe Teuwen 694a48b65a text 2021-01-14 14:36:53 +01:00
tharexde 1f08512670 reduced use of timers and synchronized read actions 2021-01-12 00:22:53 +01:00
tharexde af5237e6fd changes due to desynchronization effects 2021-01-11 21:23:38 +01:00
tharexde 56efcc9d7f half duplex sim status: stop mechanism still missing 2021-01-07 23:49:59 +01:00
tharexde 12071080a6 next step (half duplex simulation): all commands seem to work 2021-01-07 01:22:46 +01:00
tharexde 560be30053 next version of half duplex simulation 2021-01-05 01:12:21 +01:00
tharexde eea63a6cb7 first draft half duplex simulation 2021-01-03 22:50:27 +01:00
Philippe Teuwen b956d4c148 hf 14a config cliparser: use string values 2020-12-31 11:39:57 +01:00
tcprst a9f4f4f804
hf 14a config - now use cliparser 2020-12-30 22:42:46 -05:00
Philippe Teuwen b0f122528d minor 2020-12-30 01:36:44 +01:00
Philippe Teuwen a0e110941a make style 2020-12-30 01:31:40 +01:00
tharexde 9b3bc55136 aa 2020-12-29 17:40:18 +01:00
gator96100 bdb384f7b7 Fix for the Makefile.platform file 2020-12-28 22:57:58 +01:00
gator96100 11567dc2e3 Added option for running with uncompressed .data section. Thanks @doegox 2020-12-28 22:48:41 +01:00
tharexde 438cada2cf commits after xcode crash 2020-12-27 22:22:44 +01:00
Philippe Teuwen 8d4acbe3a6 make style 2020-12-23 19:51:10 +01:00
Iceman efb706a84e
Merge pull request #1120 from iconsec/master 
add dump_sim_mode to Standalone HF_ICECLASS
 2020-12-18 18:14:43 +01:00
Drew db72949720 change default mode; refactor save to take name 2020-12-18 12:01:03 -05:00
Drew ba611ffb53 add dump_sim_mode to Standalone HF_ICECLASS 2020-12-18 10:18:58 -05:00
Philippe Teuwen 975034854d rework 14b apdu timeout computations 2020-12-18 02:15:42 +01:00
Philippe Teuwen 204ae46bf7 minor 2020-12-18 02:15:42 +01:00
Philippe Teuwen ffb1b662ac allowing user timeouts in 14b apdus 2020-12-18 02:15:42 +01:00
tharexde 0be10b617e
Delete lf_tharexde.c 
uploaded by mistake
 2020-12-17 21:09:02 +01:00
tharexde 50eb90bdc7 added missing static statements 2020-12-17 20:55:01 +01:00
tharexde ced056be19 deleted non existing functions in header 2020-12-17 20:54:06 +01:00
tharexde c37b74a721 Merge branch 'master' into 4x50_eview 
update 201217
 2020-12-17 20:42:41 +01:00
tharexde daaa3578ec replaced hardcoded values 2020-12-16 20:44:04 +01:00
Christian Molson 60f36b468d em4x70: Add write key convenience function. Use real values in writekey/auth help text so people with blank tags can program a test key and test authentication. 2020-12-15 12:32:30 -05:00
Christian Molson dc35f79bd2 em4x70: Add write pin convenience function to write and verify a new pin 2020-12-15 11:22:43 -05:00
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