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

3080 commits

Author SHA1 Message Date
iceman1001 b993236be2 send sync signal to clock when reset 2021-06-24 17:20:48 +02:00
iceman1001 c522de5b79 added "hf mf gview" to view contents of a magic gen3 gtu card 2021-06-24 14:59:33 +02:00
iceman1001 c8e007c9a3 text 2021-06-23 11:42:33 +02:00
rioux 8afd8fd2b6 Standalone update for lf nexwatch 2021-06-23 10:00:56 +02:00
iceman1001 5b8ddfc47e little vs big endian, forgot one 2021-06-22 07:53:43 +02:00
iceman1001 0e7e13db7d fix for client crash in lf hitag eload. Hitag simulation still now working (wip) 2021-06-20 23:02:18 +02:00
iceman1001 f6534e18be style 2021-06-20 16:36:31 +02:00
Philippe Teuwen 1f27be076b make miscchecks 2021-06-04 21:58:38 +02:00
Philippe Teuwen a330401769 change strategy for refs to linker symbols to get compatible again with old GCC (6.3), tested on GCC 11 too 2021-05-25 16:47:13 +02:00
Philippe Teuwen 701f618f97 make clean fpga_version_info.c 2021-05-23 02:37:17 +02:00
Philippe Teuwen 9a00ad0230 rename version.c into version_pm3.c to avoid clash with mbedtls and other future clashes 2021-05-21 00:15:20 +02:00
tharexde 2f17034254 fixed evaluation of eml file size 2021-05-15 16:00:33 +02:00
iceman1001 3a920f4e0c unsigned shift 2021-05-14 22:43:08 +02:00
Philippe Teuwen 13a9afa36d Uniformize source code ref and fix gcc 11.1 warning 
Using "extern char linker_symbol[]" notation
cf https://sourceware.org/binutils/docs/ld/Source-Code-Reference.html
 2021-05-13 23:12:15 +02:00
tharexde e312e5ced8 watchdog for 4x50 brute force 2021-05-13 19:23:07 +02:00
iceman1001 3b7153045f fix compiler warning on arm-none-eabi 11.1.0 2021-05-13 13:28:03 +02:00
iceman1001 19a2ce4cb3 fix compiler warning on arm-none-eabi 11.1.0 2021-05-13 13:24:54 +02:00
iceman1001 a6712295c7 textual - hw status on device side 2021-05-11 16:11:33 +02:00
iceman1001 078ed4dbd4 init header as 0xFF 2021-05-10 13:59:29 +02:00
Philippe Teuwen 75328a34b6 arraylen 2021-05-09 23:37:45 +02:00
iceman1001 3fce16b7d9 fix cppchecker warnings 2021-05-07 12:27:13 +02:00
Iceman d0f2f6622b
Merge branch 'master' into feature/iso15693-standalone 2021-05-06 00:23:33 +02:00
iceman1001 e4f55556ba style 2021-05-05 21:04:48 +02:00
Tim Mudford 4fd4256acd Added standalone mode for ISO15693 cards. 2021-05-05 19:55:58 +12:00
iceman1001 6d71b9327e ISO15693 SLIX modifications found in @g3gg0 's offical pm3 fork, looks like WIP, with more focus on a standalone mode. I took the base fcts 2021-05-04 09:40:30 +02:00
iceman1001 218dbafdff fiddling with simulating ndef messages on MFC and android 2021-05-03 21:47:12 +02:00
iceman1001 ece1f555f5 style 2021-05-03 21:31:40 +02:00
iceman1001 cd9090b6c8 hf iclass chk - now uses NG 2021-05-03 20:01:12 +02:00
iceman1001 305903c513 rework ISO15693 defines, removing duplicates 2021-05-03 09:35:38 +02:00
iceman1001 80817cea00 hf iclass chk - rework OLD -> NG. And textual 2021-05-03 09:31:51 +02:00
iceman1001 f50691e3de hf iclass eload - now uses NG 2021-05-02 18:41:43 +02:00
iceman1001 49c764de8c fix proper null-terminator in filename. Thanks to @metalauricle 2021-05-02 16:18:02 +02:00
iceman1001 788876538d convert from OLD to NG 2021-05-01 19:01:15 +02:00
iceman1001 1317c380f4 revert timings 2021-05-01 18:22:02 +02:00
iceman1001 9873c0e4e2 enable debugging of EM4x05 hid generated data 2021-04-27 19:14:13 +02:00
iceman1001 54125918b5 remove debugs statements 2021-04-25 04:06:01 +02:00
iceman1001 2119c4e7bd hf 14b got some love 2021-04-23 22:25:58 +02:00
iceman1001 b267ee8ef5 convert 14b raw to use NG 2021-04-21 18:36:21 +02:00
iceman1001 15d14f8259 clang... 2021-04-17 13:16:39 +02:00
iceman1001 dacd63f18e text 2021-04-17 12:58:34 +02:00
iceman1001 aca5458344 old-style-declaration 2021-04-17 11:44:48 +02:00
iceman1001 8ee8bb9098 oldstyle definition 2021-04-17 11:42:11 +02:00
iceman1001 2d5aaaa335 conversion fixes 2021-04-16 22:30:53 +02:00
iceman1001 8f4ba94a6e sign-conversion fixes 2021-04-16 22:14:14 +02:00
Philippe Teuwen e62dfa3bcd typos 2021-04-16 01:53:07 +02:00
iceman1001 9410cc410f text 2021-04-16 01:19:11 +02:00
iceman1001 5654e29908 text 2021-04-16 01:11:35 +02:00
Philippe Teuwen ad7a0ccf1f typos 2021-04-16 00:58:07 +02:00
Philippe Teuwen 741cdfc383 typos 2021-04-16 00:21:22 +02:00
Philippe Teuwen f63125386b typos 2021-04-16 00:13:36 +02:00
iceman1001 dea87b8c48 text 2021-04-15 22:34:31 +02:00
iceman1001 d1fe746ebf felica - select tag , only loop 10 tens 2021-04-15 21:43:48 +02:00
iceman1001 6eb02c5f8e cppchecker fixes 2021-04-13 08:17:11 +02:00
iceman1001 0ac28addcb remove one test command 2021-04-11 13:58:04 +02:00
iceman1001 27184d7f5b style 2021-04-08 10:44:31 +02:00
iceman1001 8a05a4d1d7 smart raw - now use NG.\nhf iclass config - added more support for keyrollning (WIP)\n 2021-04-08 09:34:11 +02:00
iceman1001 30a10b266b fix #1234 - cliparse allow empty line, loop now user interuptable 2021-04-06 23:37:45 +02:00
iceman1001 7e94cf39b4 missed this change 2021-04-05 08:49:15 +02:00
iceman1001 1b59b38058 fix coverity 314850, and textual changes 2021-04-05 08:47:03 +02:00
iceman1001 753d074c54 WIP 2021-04-05 08:26:46 +02:00
iceman1001 7d83f5de82 adaptations to lf hitag.. 2021-04-04 17:08:19 +02:00
iceman1001 d012a879f2 WIP - hitag sniff, eload, sim 2021-04-04 17:06:48 +02:00
iceman1001 d19da982f0 looping for smart card, inverted the silent to verbose, updated cardhelper stuff 2021-04-04 17:01:43 +02:00
iceman1001 31f7f17766 smart, loop 5 times, and shorten delay instead 2021-04-04 11:21:17 +02:00
iceman1001 2ffcdc67f6 fix cppchecker 2021-03-26 21:32:42 +01:00
iceman1001 8d18860c6a fix cppchecker 2021-03-26 21:30:25 +01:00
iceman1001 f36da8a639 fix cppchecker uninitvar 2021-03-26 21:26:29 +01:00
iceman1001 7574606080 hf felica sniff - now uses cliparser 2021-03-26 21:01:50 +01:00
iceman1001 91b47eeb1f hf felica litesim - now uses cliparser 2021-03-25 09:39:40 +01:00
iceman1001 e5181d7847 syntax 2021-03-15 15:54:15 +01:00
iceman1001 b0d16a8905 text 2021-03-15 15:53:47 +01:00
iceman1001 93ff663755 text 2021-03-15 15:53:37 +01:00
iceman1001 bb0577f978 minor 2021-03-15 01:31:36 +01:00
iceman1001 f70a49e894 lf simulate - less checks 2021-03-15 01:29:48 +01:00
iceman1001 0851f3d947 only 10bits available 2021-03-15 01:27:35 +01:00
iceman1001 bc4a5cf4de hf mf sim - testing to remove the field detection, its inside emcmd anyway 2021-03-15 01:26:55 +01:00
Anže Jenšterle 2de475bdd9
q to k 2021-03-15 01:21:30 +01:00
Anže Jenšterle 85ab3650e3
fixed as per feedback 2021-03-15 01:08:11 +01:00
Anže Jenšterle 9a33e547f3
more renaming and explaining 2021-03-15 00:58:38 +01:00
Anže Jenšterle 73dd5a23e4
fixed help for standalone 2021-03-15 00:55:25 +01:00
Anže Jenšterle fb34db5e10
Finish renaming standalone, add documentation 2021-03-15 00:36:46 +01:00
Anže Jenšterle ac36c06590
rename standalone 2021-03-15 00:33:27 +01:00
Anže Jenšterle 180577695e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into function/desfire-standalone 2021-03-13 02:16:26 +01:00
iceman1001 2bd5831f27 text 2021-03-11 09:40:02 +01:00
iceman1001 1b2091932e fix 'mem spiffs view' and bad file stats retrieval 2021-03-10 10:43:49 +01:00
iceman1001 8c16c4d95d text 2021-03-09 14:58:08 +01:00
iceman1001 ad2b0879fc added: mem spiffs view - to view a file on SPIFFS\n mem spiffs dump - now uses cliparser and NG 2021-03-09 14:38:31 +01:00
iceman1001 02aabf90d3 mem spi mount/unmount/test/check/tree/info/remove/rename/wwipe - now uses cliparser. remove/rename uses NG 2021-03-08 17:39:21 +01:00
Philippe Teuwen e5c5629cf2 Some tunings of otptear: 
- make tearoff_delay_us and tearoff_enabled globals
- use tearoff_hook and remove Dbprintf in critical tearoff timing
- move initial write from MifareU_Otp_Tearoff to CmdHF14AMfuOtpTearoff and make it optional (old behavior was writing initial 00000000 when -d was not provided)
- tearoff: compare with initial write, not with previous tearoff outcome
- rephrase some messages
- track all begin and end of erase and write phases, with quite complex logic to cover multiple cases (starting in middle of erased phase, starting with write 0, ...) and report them
- check against initial write error
- repeat same timing (up to 10x) in case of write/read errors then quit
- typos
 2021-03-07 23:48:55 +01:00
iceman1001 dff732840f mem info - now accepts input id to facility easy testing. Signature offset also triggers erase before to enable easy updates 2021-03-07 08:56:36 +01:00
Anže Jenšterle 5633768e81 desfire emulation standalone 2021-03-05 10:58:52 +01:00
iceman1001 886104e4cb cppchecker out-of-bounds, I believe it was a false positive but... 2021-03-05 10:22:35 +01:00
iceman1001 928c0e4162 cppchecker overflow integer warning 2021-03-05 10:21:25 +01:00
iceman1001 3275decfb0 cppchecker 2021-03-05 10:21:02 +01:00
iceman1001 24ee8080e1 large dma size for demod signals 2021-03-05 10:18:02 +01:00
iceman1001 7910464a85 cppchecker 2021-02-28 19:01:38 +01:00
iceman1001 1fbb838d3a cppchecker 2021-02-24 20:46:06 +01:00
iceman1001 2184b0dde8 cppchecker 2021-02-24 14:26:21 +01:00
iceman1001 bb6ea597b4 cppchecker shadow 2021-02-24 14:17:23 +01:00
iceman1001 9395f8c8ac cppchecker 2021-02-24 00:29:50 +01:00
iceman1001 b7400d109d Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-02-23 23:57:56 +01:00
Iceman e8bf717f1d
Merge pull request #1211 from tharexde/4x50_fix 
4x50 fix
 2021-02-23 23:57:41 +01:00
iceman1001 232a172ac5 rename 2021-02-23 23:54:02 +01:00
iceman1001 d9195effc7 cppchecker 2021-02-23 23:53:08 +01:00
iceman1001 4620c0b21e cppchecker fixes 2021-02-23 23:00:29 +01:00
tharexde 91cf7e3f60 Dbprintf and sprintf destroyed timing for "write password" function in standalon sim mode-> fixed 2021-02-23 22:31:35 +01:00
tharexde db679608ec initial implementation of em4x50 standalone mode (lf_tharexde) 2021-02-15 22:48:34 +01:00
tharexde a78fecad07 revert changes (PR follows) 2021-02-15 21:26:16 +01:00
tharexde 9a96157e82 initial implementation of em4x50 standalone mode 2021-02-14 12:42:47 +01:00
tharexde ac0ef23d5e Merge branch 'master' into dev_4x50_standalone 
update
 2021-02-12 23:21:49 +01:00
iceman1001 1ce9053c51 hf 14a sim - less button checks and even less dataavailable checks 2021-02-12 22:08:10 +01:00
iceman1001 46d9ed20e5 added "hf jooki sim" command. Lets see if the data_available call every 8000th times doesnt interrupt with simulation process too much. 2021-02-12 10:16:24 +01:00
iceman1001 7a653e7faf textual 2021-02-12 09:10:55 +01:00
tharexde a944ff5927 - added flash defines (RDV4) 
- modified LED signals
- cleanup
 2021-02-11 19:29:43 +01:00
tharexde b20f532282 - added missing timeout checks 
- relocated timer resets in standalone mode
 2021-02-09 23:22:46 +01:00
Anže Jenšterle cd36770c5e
make style 2021-02-09 16:56:55 +01:00
tharexde a67c82ff6d clean up 2021-02-06 20:48:21 +01:00
tharexde c5ac3c16f5 - timeout corrections 
- global parameter for password catch (used in standalone mode)
 2021-02-06 20:45:44 +01:00
tharexde ed642855d8 global parameter for standalone mode (catch pwd sent by reader) 2021-02-06 20:00:58 +01:00
iceman1001 e3aa035be7 fix: lf config set decimate or divisor to 8 is now possible 2021-02-03 16:00:33 +01:00
iceman1001 47c27d751c lf awid/hid/io/410x watch - now works with user side abort 2021-02-02 17:55:54 +01:00
iceman1001 ed3d12724b text 2021-02-02 15:33:42 +01:00
iceman1001 aad7d4c8df text 2021-02-01 23:27:26 +01:00
iceman1001 40230532f5 text 2021-02-01 23:23:34 +01:00
iceman1001 a72058243b lcd-h is renamed 2021-01-31 01:07:51 +01:00
tharexde b57a457254 Merge branch 'master' into dev_4x50_standalone 
solved merge conflicts
 2021-01-30 00:29:18 +01:00
iceman1001 33a17fcd67 cppchecker fixes 2021-01-29 16:47:02 +01:00
iceman1001 145a031922 coverity fix #308205 2021-01-29 16:16:46 +01:00
iceman1001 f65b5eb96d coverity fix #308194 2021-01-29 16:10:33 +01:00
tharexde a0c92d20bb make style + cleanup 2021-01-29 00:28:05 +01:00
tharexde 82de4c134c changed LED behavior 2021-01-28 23:32:47 +01:00
iceman1001 c0f4abb8d4 cppchecker fix 2021-01-28 12:52:10 +01:00
iceman1001 3c8cefd898 forgot to remove 2021-01-28 12:51:33 +01:00
iceman1001 a9b265ff1b cppcheck fixes call from hf_aveful with NULL 2021-01-28 12:16:02 +01:00
iceman1001 3c07e264c9 cppchecker fixes 2021-01-28 12:11:24 +01:00
iceman1001 6e0673fd02 cppchecker fixes 2021-01-28 12:05:32 +01:00
iceman1001 65c11ee0e4 litte rename 2021-01-28 11:49:25 +01:00
iceman1001 a5c40fa07b minor renaming 2021-01-27 23:30:37 +01:00
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