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

2568 commits

Author SHA1 Message Date
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
iceman1001 85f5f670b6 check if we have AA2 2020-08-03 17:37:41 +02:00
iceman1001 3b90f5389a larger 2020-08-03 17:36:39 +02:00
iceman1001 98a5a5b9c4 full sim of non-secure pagemode dumps 2020-07-29 15:29:30 +02:00
iceman1001 e147bdc71b renamed readtagfile to view\nrenamed clone to restore\nrefactored reader, info, dump, rdbl, wrbl to be on device side. Commands now also seamless works with NON_SECURE_MPAGE 2020-07-29 11:02:30 +02:00
iceman1001 acb598756c optional log 2020-07-29 11:00:06 +02:00
iceman1001 5ca50cf1b8 textual 2020-07-29 10:59:33 +02:00
iceman1001 b0ffc90c16 device side mac 2020-07-29 10:52:39 +02:00
iceman1001 c51565fd7c iso15 sim, make decoders dynamic bigbuff malloc 2020-07-21 10:51:48 +02:00
iceman1001 42f21e8d65 adapt iclass sim 2020-07-21 10:50:23 +02:00
iceman1001 df404a652a duration isnt 15bits, its 16. length is 15bits. 2020-07-21 10:49:29 +02:00
iceman1001 9eb479fc7f iceclass calc diversified key if not present 2020-07-20 00:16:16 +02:00
iceman1001 a1529b44ca fix auth and 2020-07-19 20:45:47 +02:00
iceman1001 3354f0d9d3 unified static dma buffer as bigbuf_malloc, less pressure on stack size 2020-07-15 15:16:35 +02:00
iceman1001 a59aa7a570 rename fct 2020-07-15 11:35:27 +02:00
iceman1001 8d5315b6af fixes to mode 2020-07-15 11:34:14 +02:00
iceman1001 ce0a2744cb hf_iceclass 2020-07-15 01:31:13 +02:00
iceman1001 1a1ebcc330 adapt for external auth calls 2020-07-14 23:12:28 +02:00
iceman1001 99e61f82c0 rework 2020-07-14 15:57:21 +02:00
iceman1001 49192ca4c4 add: new standalone mode. hf_iceclass 2020-07-14 15:47:47 +02:00
iceman1001 a95f4b3745 chg: check buttonpress 2020-07-14 15:46:32 +02:00
iceman1001 ce981d9124 fpga 14b merge p.N 2020-07-14 15:46:05 +02:00
iceman1001 d2a66cecba style 2020-07-14 15:44:38 +02:00
iceman1001 4dabccf9db style 2020-07-14 15:44:23 +02:00
iceman1001 bac126530c prep for stand mode 2020-07-14 15:43:54 +02:00
iceman1001 4b14f21c77 fix iclass simulation 2020-07-13 23:27:16 +02:00
iceman1001 dd7a3c208c init arrays... 2020-07-13 22:06:15 +02:00
iceman1001 f00c0eb5cf prep for timings 2020-07-13 22:05:38 +02:00
iceman1001 830ecd6e13 debugs 2020-07-13 22:05:11 +02:00
iceman1001 e476e7f504 coding style 2020-07-13 20:13:56 +02:00
iceman1001 d6f65f8578 tosend into bigbuff 2020-07-13 18:14:34 +02:00
iceman1001 a6c240fe3b tosend into bigbuff 2020-07-13 17:56:19 +02:00
Philippe Teuwen 3a39a9b64e rev temporarily -fno-common as we can't have shorter BigBuf. Mem allocs will need to be sorted out. 2020-07-13 16:21:29 +02:00
iceman1001 e19e01a6a6 make sure uninitialized vars doesnt end up on COMMON_section 2020-07-13 15:41:56 +02:00
Philippe Teuwen ac29f16529 Revert "fix tracelog problem with making sure uninitialized vars dont get inside _COMMON_ section" 
This reverts commit b18a9c017a.
 2020-07-13 15:41:39 +02:00
iceman1001 b18a9c017a fix tracelog problem with making sure uninitialized vars dont get inside _COMMON_ section 2020-07-13 14:30:07 +02:00
iceman1001 a87ec6bd52 style 2020-07-13 12:28:01 +02:00
iceman1001 e7127514db change debug 2020-07-13 12:26:26 +02:00
iceman1001 713301226d fgpa merge hell p.N 2020-07-13 12:21:42 +02:00
iceman1001 77aa5c6142 style 2020-07-13 12:20:35 +02:00
iceman1001 27c4d994ac remove some debugstatments, use hdr.frame instead 2020-07-13 12:20:12 +02:00
iceman1001 1f8ab9c2fb better logtext for debug, iclass dump -> NG 2020-07-13 12:19:06 +02:00
iceman1001 86538912a8 make sure uninitialized vars doesnt end up on COMMON_section 2020-07-13 12:18:26 +02:00
iceman1001 ebb7eb9f3e fix coverity 294113 2020-07-11 20:53:07 +02:00
Philippe Teuwen eb61524923 Merge branch 'master' into fpga 
* master: (27 commits)
  fix a bug in demodParadox()
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  fix #833  - missing some configblocks and spelling
  remove verichip.
  chg 'lf t55xx info' - detection of t55x7 configuration blocks
  remove
  disable verichip stuff.  should be inside FDX already
  textual
  lf t55 configblock detection updated
  textual
  fix: missing define on some mingw
  chg: hf mf decrypt - helptext (thanks @AdamLaurie)
  Update bt_manual_v10.md
  textual
  ...
 2020-07-11 15:25:20 +02:00
iceman1001 a25a5322dd fpga: added iCLASS on deviceside 2020-07-10 16:37:56 +02:00
iceman1001 a0d23f586e fpga 2020-07-09 19:42:04 +02:00
iceman1001 57d1ff9316 fpga 2020-07-09 19:41:57 +02:00
iceman1001 05299373fa fpga 2020-07-09 19:41:52 +02:00
iceman1001 ed5471a895 fpga 2020-07-09 19:40:54 +02:00
tharexde 241e2b7c7e added new command "4x50_wipe" 2020-07-09 01:59:29 +02:00
tharexde 8dd302907c added new command "4x50_wipe" 2020-07-09 01:59:09 +02:00
tharexde 76d0ecf8cf added new command "4x50_wipe" 2020-07-09 01:59:01 +02:00
iceman1001 a76679f7e6 hf iclass reader 2020-07-09 00:20:52 +02:00
iceman1001 246144df2a amiboo default pack 2020-07-08 23:11:50 +02:00
iceman1001 7ee811bb9e felica fixes 2020-07-08 23:11:29 +02:00
iceman1001 2a30f3b165 fgpa felica 2020-07-08 11:05:54 +02:00
iceman1001 ce24e6acbb fpga merge hell, all compiles 2020-07-08 09:45:49 +02:00
iceman1001 b775b68e4e fpga iclass 2020-07-07 13:18:53 +02:00
iceman1001 2502d4581b iclass merges 2020-07-07 12:32:56 +02:00
iceman1001 7c15e4b7ff fpga more iclass 2020-07-06 22:43:11 +02:00
iceman1001 6948ccff3a fpga iclass... 2020-07-06 22:33:38 +02:00
iceman1001 d83a45f0cb fpga merge changes 2020-07-06 15:16:00 +02:00
iceman1001 7d1a278197 merge hell p.x 2020-07-03 21:33:17 +02:00
iceman1001 8189809f48 chg: adapt to fpga changes 2020-07-02 12:38:38 +02:00
iceman1001 80cda059b1 chg: adapt to fpga changes 2020-07-02 12:37:07 +02:00
iceman1001 fce4c1d13f chg: adapt to fpga changes 2020-07-02 12:36:49 +02:00
iceman1001 837efdf5c4 chg: adapt to fpga changes 2020-07-02 12:36:24 +02:00
iceman1001 4043832c62 adapt to fpga changes. And bug hunting COTAG functionality that doesnt work 2020-07-02 12:35:54 +02:00
iceman1001 ecdd91392b adapt to fpga changes. And bug hunting COTAG functionality that doesnt work 2020-07-02 12:35:33 +02:00
iceman1001 ee69987210 chg: third fpga image for felica 2020-07-02 12:35:24 +02:00
iceman1001 85053d106f adapt to fpga changes. And bug hunting COTAG functionality that doesnt work 2020-07-02 12:34:48 +02:00
iceman1001 9130474818 adaptations to new code 2020-07-02 12:33:53 +02:00
iceman1001 2f4335d31e chg: ssp clock changes 2020-07-02 12:33:23 +02:00
iceman1001 e144c793f0 chg: scc frames 16 or 8 bit wide 2020-07-02 12:32:55 +02:00
tharexde c2d9234581 speed up "lf search" process 2020-07-01 00:45:46 +02:00
tharexde a1f7602592 fixed: if tag status = NAK -> following detection of double listen window took too long 2020-06-30 01:50:31 +02:00
tharexde 3f70f1154b updated conditions for stopping the detection of a double listen window 2020-06-29 00:01:19 +02:00
tharexde 8854c7b688 - changed termination condition in "listen window detection" (old one didn't work) 
- decreased debug sensitivity
 2020-06-28 23:33:01 +02:00
tharexde 1cf51410f4 renamed 'lread' to 'read' 2020-06-28 21:37:53 +02:00
tharexde b6359def47 renamed 'sread" to 'read' 2020-06-28 21:32:52 +02:00
tharexde 9ce9a82803 defined stop condition for reading processes, otherwise pm 'crashes' if there's no tag on device 2020-06-28 21:31:39 +02:00
tharexde 81cd478883 Merge branch 'master' into dev-em4x50_sread 
update
 2020-06-27 00:37:32 +02:00
tharexde 86eaac46dc formal adjustments 2020-06-27 00:20:56 +02:00
iceman1001 1a490470c9 chg: 15693 use bigbuf malloc to keep tracelog 2020-06-26 21:53:19 +02:00
tharexde 0136c0f9c9 added 4x50_sread 2020-06-26 14:20:08 +02:00
tharexde e7531ac6fa added 4x50_sread 2020-06-26 14:19:54 +02:00
tharexde 1fd3afa002 added 4x50_sread 2020-06-26 14:19:41 +02:00
iceman1001 b545109800 fix more lf standalone 2020-06-23 12:14:41 +02:00
iceman1001 e3c9f46425 fix lf standalones 2020-06-23 12:13:48 +02:00
iceman1001 34769f6945 fix: lf_em4100rwx 2020-06-23 12:10:09 +02:00
iceman1001 d9f606d70b more debugstatements 2020-06-23 11:21:17 +02:00
iceman1001 1c7de4a8c3 fix: "lf search" / "lf hitag" - no more stack overflow in hitag reader 2020-06-23 11:13:49 +02:00
Monster 5e277caa0b
Merge branch 'master' into master 2020-06-23 10:51:52 +03:00
Monster c551800b0f
build fix after changes for lf_em4100rswb 
build fix after changes for lf_em4100rswb
 2020-06-23 10:34:00 +03:00
tharexde cdb57c9c2b Merge branch 'master' into dev_em4x50_info_write 
merge conflict
 2020-06-22 21:04:48 +02:00
Philippe Teuwen bc00b29a64 Deadloop in case of stackoverflow, better than flooding console 2020-06-22 20:02:19 +02:00
iceman1001 b59131d349 chg: 'lf em/hid/io/awid watch' - colors, unified, NG 2020-06-22 14:56:13 +02:00
iceman1001 683954316a chg: 'lf em 410x_watch' - now uses NG and on deviceside only 2020-06-22 13:24:33 +02:00
iceman1001 ba6bc0ecef chg: 'lf io watch' - uses NG and reports back to client 2020-06-22 12:57:28 +02:00
iceman1001 b0c5ade65a adapt standalone to dynamic stack 2020-06-22 12:22:52 +02:00
iceman1001 37359df25a textual 2020-06-21 18:14:30 +02:00
iceman1001 18da534554 chg: 'hf sniff' - now malloc and is interupable 2020-06-21 18:13:14 +02:00
tharexde 1a9ca5a1e3 former hardcoded signal properties (high, low) are now set dynamically by functionalists get_signalproperties(...) 2020-06-21 01:09:47 +02:00
tharexde de20270532 replaced reply_mix(...) by reply_ng(...) 2020-06-20 14:32:57 +02:00
Philippe Teuwen f69739da79 make style 2020-06-19 18:34:47 +02:00
tharexde 73dfe44c6f fixed return value bsuccess, which was true although function calls failed 2020-06-19 01:39:12 +02:00
tharexde 274996da1f corrected comments 2020-06-19 01:24:57 +02:00
tharexde 0840c0d5d1 changed bits[8] to *bits 2020-06-18 19:28:44 +02:00
iceman1001 da00cc0405 chg: print stack fct and hfsniff 2020-06-18 11:55:27 +02:00
iceman1001 e1f0f89240 chg: 'hf sniff' - remake to mallc and report back size, also use NG 2020-06-18 11:54:19 +02:00
tharexde 9393ecc823 added debug level for error messages 2020-06-18 00:07:40 +02:00
tharexde 601da777ad replaced function msb2lsb(...) by already existing function reflect8(...) 2020-06-17 23:38:49 +02:00
tharexde 8e29bb7a56 deleted german comment 2020-06-17 23:08:02 +02:00
tharexde 5cb732d620 simplified functions for byte sending 2020-06-17 23:06:57 +02:00
tharexde bf85108f2f added write and write_password functions 2020-06-16 23:25:07 +02:00
tharexde f930e78650 added write and write_password functions 2020-06-16 23:24:44 +02:00
tharexde b1b6f0d8b7 added write and write_password functions 2020-06-16 23:24:35 +02:00
tharexde ef9ccde512 added EM4x50 info function 2020-06-15 14:32:51 +02:00
tharexde f5ff2c12eb added EM4x50 info function 2020-06-15 14:32:44 +02:00
tharexde 1fe83eaf25 added EM4x50 info function 2020-06-15 14:32:34 +02:00
tharexde ffec9d5a18 added EM4x50 info function 2020-06-15 14:32:23 +02:00
iceman1001 62ce1cdf13 chg: increase stack size - hf mfu simlation needs it 2020-06-14 12:16:27 +02:00
iceman1001 88a42c6108 chg: ntag215/amiibo, empty header, use hardcoded values 2020-06-14 07:41:21 +02:00
iceman1001 e71e70bd9d minor 2020-06-12 17:50:11 +02:00
iceman1001 3832cf26fd color 2020-06-11 19:20:59 +02:00
Philippe Teuwen 54cbaf5b87 textual 2020-06-11 13:24:55 +02:00
slurdge 05ed3f7018 Second try to fix appveyor 2020-06-11 12:12:20 +02:00
slurdge 53c5456f7a Fix ptr arithmetic hopefully 2020-06-11 11:35:15 +02:00
slurdge 35857f535d Compute the max usage 2020-06-11 11:14:53 +02:00
slurdge c11c7ab545 Add support for client getting bigbufsize 2020-06-10 23:03:03 +02:00
slurdge df4bdc89ea Fix BIGBUF_SIZE used in #WITH_FLASH 2020-06-10 19:06:40 +02:00
slurdge c89fc81fcf Make BigBuf take dynamically the available space with a fixed (4K) stack 2020-06-10 12:41:18 +02:00
iceman1001 ea73746d32 text 2020-06-10 09:02:58 +02:00
iceman1001 9d1cbaddf9 text 2020-06-10 08:56:45 +02:00
Philippe Teuwen e3e33a6501 Use SumAdc also in ListenReaderField 2020-06-10 01:09:58 +02:00
Philippe Teuwen 0ce3be2f34 Reintroduce AvgAdv, avoid *64 as it could easily overflow 
This reverts partly commit 9189dc8563.
 2020-06-10 00:10:39 +02:00
iceman1001 9189dc8563 applied theremin patch, adc values are summed, remember to divide when read 2020-06-09 23:37:56 +02:00
Philippe Teuwen 224cb2ffd7 make style 2020-06-08 03:15:10 +02:00
Iceman fc1f137f0c
Merge pull request #759 from slurdge/lz4_new 
[WIP] Zlib->LZ4 change
 2020-06-07 18:43:44 +02:00
slurdge 33781b1fd8 Move most of libs to thumb mode. 2020-06-07 17:29:25 +02:00
iceman1001 4e29909cc2 chg: pointer casting to sort out array out of bonds 2020-06-07 15:59:06 +02:00
iceman1001 09548ecf51 cleaning some code 2020-06-07 13:56:21 +02:00
Philippe Teuwen 381b47f64e lz4: add memmove to arm string.c 2020-06-07 12:46:34 +02:00
Philippe Teuwen d48fcbf5eb lz4stream info to int: use memcpy 2020-06-07 12:46:05 +02:00
slurdge 1a8eff5d42 add lz4 to arm side 2020-06-05 16:24:05 +02:00
Philippe Teuwen 6980429bd4 ARM: remove contradictory flag -fno-strict-aliasing as we have -fstrict-aliasing in Makefile.common 2020-06-02 14:12:28 +02:00
iceman1001 89f43c1221 cppchecker 2020-06-02 12:58:37 +02:00
iceman1001 e67c515451 fix cppchecker 2020-06-02 12:49:18 +02:00
iceman1001 3d67bde0d9 old->mix 2020-05-27 17:58:34 +02:00
Philippe Teuwen f30ccd0f51 Makefile: fix cp version for armsrc 2020-05-22 13:43:57 +02:00
Philippe Teuwen 8e12285f66 introduce CROSS_*FLAGS for cross-compilation 2020-05-21 19:28:42 +02:00
Philippe Teuwen e2a20631c7 remove section version_information for client 2020-05-20 21:11:45 +02:00
Philippe Teuwen 577380ae48 color ARM/FPGA version sections 2020-05-20 21:11:45 +02:00
Philippe Teuwen 0172b0638b Makefile: wrap sh and perl calls 2020-05-20 21:11:45 +02:00
Philippe Teuwen ef586c2a41 version info also for client, still cmake to do 2020-05-20 21:11:45 +02:00
iceman1001 35886fab91 chg: must have a default return value 2020-05-20 18:30:41 +02:00
iceman1001 30be05ec3f chg: removed debugstatements, the code doesnt use them 2020-05-20 18:28:43 +02:00
iceman1001 b22ea6f846 fix: matty_run eloadcard 2020-05-20 18:28:10 +02:00
Philippe Teuwen be42995f8a Less fantasy in the LogTrace usages regarding timestamps 2020-05-19 20:19:44 +02:00
Philippe Teuwen 37ae102e38 LogTrace error msg 2020-05-19 19:09:25 +02:00
Philippe Teuwen cb8d589fc4 armsrc: clarify static vars vs global vars, part 3 2020-05-19 18:12:40 +02:00
Philippe Teuwen b556810776 armsrc: clarify static vars vs global vars, part 2 2020-05-19 17:25:58 +02:00
iceman1001 4d355192bf remove inline 2020-05-19 17:16:23 +02:00
iceman1001 47634f5550 change: remove inline directive in armsrc, since we are optimizing for size 2020-05-19 17:15:07 +02:00
Philippe Teuwen 3e7512a5d5 armsrc: clarify static vars vs global vars 2020-05-19 17:05:43 +02:00
Philippe Teuwen fbaf634779 legicrf & gcc 10: Remove inline warning 2020-05-19 16:34:00 +02:00
Philippe Teuwen 23d754c85f fix max duration in LogTrace 2020-05-19 02:48:03 +02:00
Philippe Teuwen a999243a45 use tracelog struct in arm too 2020-05-19 02:39:39 +02:00
Philippe Teuwen 4dac94c772 clarify BUTTON macro usages 2020-05-15 00:00:42 +02:00
Philippe Teuwen 3f71be870b cppcheck on hf_mattyrun 2020-05-14 23:26:41 +02:00
Philippe Teuwen 3c44ef39f7 fix REV macros & hitagS 2020-05-14 17:52:09 +02:00
Philippe Teuwen 98a254ba65 hitagS, untested 2020-05-14 17:17:23 +02:00
iceman1001 12e942febc coverity - remove bad shift, (untested) 2020-05-14 09:59:06 +02:00
iceman1001 ed11e4a093 cppcheck fix, assign a value 2020-05-14 09:18:51 +02:00
Philippe Teuwen ffdd338dea make style 2020-05-14 01:04:26 +02:00
Philippe Teuwen 1c8c1d82ea fix coverity 267211 & 267206 logically dead code 2020-05-14 01:01:48 +02:00
Philippe Teuwen c43b9085f9 fix coverity 274112 unintended sign extension 2020-05-14 00:31:22 +02:00
iceman1001 b4cc7a9ad3 coverity fix, stricter checks for available memory when checking mifare keys 2020-05-13 13:40:52 +02:00
iceman1001 6e7a8e1bfc chg: enforce stricter limit checks for available pwds in flash mem 2020-05-13 13:26:02 +02:00