RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-10-02 21:26:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
11663 commits 3 branches 14 tags 87 MiB
Commit graph

7239 commits

Author SHA1 Message Date
mwalker33 f109915ebd T55xx Save and Restore 2019-10-11 20:29:20 +11:00
iceman1001 9c82f84fa7 analyze demodbuff - fill demodbuffer with binary from client 2019-10-11 11:26:14 +02:00
martinbeier baffd45d5a
fixed indala FC decoding 2019-10-10 16:01:54 +02:00
iceman1001 d61a7b4a0f textual 2019-10-10 15:10:22 +02:00
mwalker33 67b575c728
Merge pull request #18 from RfidResearchGroup/master 
Update from RRG
 2019-10-10 23:40:04 +11:00
martinbeier 1262270924
added indala 26bit decoding 2019-10-10 14:25:41 +02:00
mwalker33 f0ae164fdf Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into RfidResearchGroup-master 2019-10-10 23:13:20 +11:00
iceman1001 ed4cdc8b75 coverity 226411 2019-10-10 13:11:29 +02:00
mwalker33 18520a5dfd Update cmdlft55xx.c 2019-10-10 22:07:57 +11:00
iceman1001 f6c1e73378 coverity 263230 2019-10-10 12:34:11 +02:00
mwalker33 1181a9792e Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-10-10 21:29:57 +11:00
mwalker33 e435d8a6ff t55x7 save and restore eml/bin 2019-10-10 21:27:48 +11:00
Philippe Teuwen c2b448de0f elite_crack: static include else we get issue with gcov 2019-10-10 12:02:01 +02:00
iceman1001 9be5627537 should unify authors messages, remove from individual functions that was done for awhile 2019-10-10 11:37:36 +02:00
iceman1001 371a0e3ee0 coverity 226308 2019-10-10 11:13:14 +02:00
iceman1001 b62e4dfa36 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-10-10 10:24:21 +02:00
iceman1001 762075f34a textual 2019-10-10 07:56:39 +02:00
Philippe Teuwen 904f0fe2fd coverity 226229 2019-10-10 00:08:30 +02:00
Philippe Teuwen 755ac62ab8 coverity 226422 2019-10-09 23:38:41 +02:00
Philippe Teuwen b6c683bd02 coverity 226304 2019-10-09 23:34:19 +02:00
Philippe Teuwen f4ec8463a4 coverity 226367 - strange indala code 2019-10-09 23:31:22 +02:00
Philippe Teuwen 209fa45107 coverity 226215 2019-10-09 22:44:25 +02:00
Philippe Teuwen d3efe5342c misspelled fct 2019-10-09 22:32:38 +02:00
Philippe Teuwen 7b482c64b1 coverity 226188 2019-10-09 22:29:42 +02:00
Philippe Teuwen b7d543888c coverity 226272 2019-10-09 22:24:54 +02:00
Philippe Teuwen 31cf435045 coverity 226359 2019-10-09 21:55:01 +02:00
Philippe Teuwen 54585089a3 coverity 226339 2019-10-09 21:36:29 +02:00
Philippe Teuwen 31efbf9a59 coverity 226275 2019-10-09 21:17:27 +02:00
Philippe Teuwen 30168d1e20 coverity 226247 2019-10-09 21:14:55 +02:00
Philippe Teuwen e3b267112f coverity 226372 - leak 2019-10-09 21:07:33 +02:00
Philippe Teuwen 5017e33b6d coverity 226232 - tainted input 2019-10-09 19:44:06 +02:00
Philippe Teuwen 8b99cd0303 Add SKIPQT makefile var 2019-10-09 19:28:37 +02:00
David Lam 906193981f textual changes 2019-10-09 12:48:45 -04:00
Philippe Teuwen d588b04537 fix more printf api warnings/bugs 2019-10-09 18:03:56 +02:00
iceman1001 69274a1184 fix 2019-10-09 15:23:58 +02:00
iceman1001 d8dba632be coverity 226322 - resourceleak 2019-10-09 15:06:22 +02:00
iceman1001 0556c83570 fixes 2019-10-09 14:30:50 +02:00
iceman1001 9b0e70ca27 fixes 2019-10-09 14:28:52 +02:00
iceman1001 55c33e75ef coverity 226254... - printf 2019-10-09 14:25:13 +02:00
iceman1001 16f1866943 coverity 226410 - printf 2019-10-09 14:22:35 +02:00
iceman1001 f1b15d8e07 coverity 226425 - printf 2019-10-09 14:21:09 +02:00
iceman1001 be51e98d7c coverity 226361 - printf 2019-10-09 14:19:10 +02:00
iceman1001 3ba529612e coverity 226321 - printf 2019-10-09 14:17:28 +02:00
iceman1001 26c8f680fc coverity 226289 - printf 2019-10-09 14:14:27 +02:00
iceman1001 81e7e34a24 revert tainted 2019-10-09 13:44:51 +02:00
iceman1001 ab222a06b9 ..revert 2019-10-09 13:19:47 +02:00
iceman1001 3361715121 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-10-09 13:11:26 +02:00
iceman1001 8842421422 coverity 71844 - fix untrusted value. fgets could have nulled the pointer. 2019-10-09 13:11:22 +02:00
Philippe Teuwen 86a47a3282 dangerous stuff... 2019-10-09 13:03:23 +02:00
iceman1001 2b50ccbef8 coverity 226404 - fix ignoring number.. 2019-10-09 13:00:22 +02:00
iceman1001 201817d7e4 coverity 226430 - printf args 2019-10-09 12:56:11 +02:00
iceman1001 b9c020a1dd coverity 227802 - fix uninitialized 2019-10-09 12:46:01 +02:00
iceman1001 0aa88aecf5 coverity - fix tainted 2019-10-09 12:45:12 +02:00
iceman1001 6d3adf71b6 coverity 226370 - fix resource leak 2019-10-09 12:44:17 +02:00
iceman1001 b993819b92 coverity 226268 - fix resource leak 2019-10-09 11:52:38 +02:00
iceman1001 08e62afc59 coverity 226277 - fix resource leak 2019-10-09 11:50:55 +02:00
iceman1001 cd0a47308d coverity 226337 - fix resource leak 2019-10-09 11:47:56 +02:00
iceman1001 84f5f0352f coverity 226350 - fix resource leak 2019-10-09 11:46:11 +02:00
iceman1001 6835cfd76a textual 2019-10-09 11:21:53 +02:00
iceman1001 b463f2ab5a coverity 226340, make sure its not null 2019-10-09 10:48:20 +02:00
iceman1001 abb011c179 fix: wrong key copied 2019-10-09 10:41:59 +02:00
iceman1001 ba461b8e1b fix: wrong size when going to calloc 2019-10-09 10:39:36 +02:00
iceman1001 0a50d8f845 adjustments 2019-10-08 22:02:02 +02:00
iceman1001 10a4361ccc Add: 'lf gallagher *' support. Unknown how to decode to printed number yet. 2019-10-08 21:45:40 +02:00
iceman1001 7affb00e76 textual 2019-10-08 19:55:01 +02:00
iceman1001 3a63b72741 Chg: 'hf mf autopwn' - skip extra checks if all keys found on first check 2019-10-08 19:49:34 +02:00
David Lam 96bc4438e9 remove extra spaces 2019-10-08 12:42:51 -04:00
iceman1001 3586cad12f freMerge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-10-08 16:13:46 +02:00
Philippe Teuwen e7a632292d fix t55 comments 2019-10-08 16:13:36 +02:00
iceman1001 85f5498163 yes 
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
 2019-10-08 16:13:05 +02:00
iceman1001 6d1e109c82 filechecks.. could fail stat call and directory could be symlinked 2019-10-08 16:11:01 +02:00
Philippe Teuwen 813f1e228c fix nedap examples 2019-10-08 16:10:50 +02:00
iceman1001 c4249ecbb8 WiP - 'lf t55xx restore' - read a dump file and restore it to a t55xx card 2019-10-08 15:24:06 +02:00
iceman1001 9cbfe5481b chg: lf t55xx brute / lf t55xx chk / lf t55xx recoverpwd - now shows help when called without params 2019-10-08 14:16:46 +02:00
Philippe Teuwen caf1ce4a43
Merge branch 'master' into master 2019-10-08 14:03:32 +02:00
mwalker33 275c628da5 lf t55xx detect and help 
Added lf t55xx detect to try without password first and try password if still not detected.
Added password status to detected output.

Updated lf t55xx help to show current default downlink mode.

typo fixed in win10 color help
 2019-10-08 21:46:36 +11:00
iceman1001 810a70d8a8 tweak? 2019-10-08 11:50:43 +02:00
iceman1001 1baf51b862 t5577-M3 ATMEL info, thanks @doegox 2019-10-08 11:49:23 +02:00
David Lam b2592a2f1c display high bit for Kastle HID to allow for lf hid clone 2019-10-07 14:56:20 -04:00
iceman1001 9a74122079 fix: 'lf indala clone' - now write long id again 2019-10-07 17:18:56 +02:00
Iceman 13cdba28f3
Merge pull request #422 from bruno-/fix_script_typos 
Fix Legic_clone.lua script typos
 2019-10-07 15:20:26 +02:00
Bruno Sutic bf14b91a85
Fix Legic_clone.lua script typos 2019-10-07 14:57:53 +02:00
Iceman 27ae47b38e
Merge pull request #420 from mwalker33/master 
Color on windows 10
 2019-10-06 20:00:59 +02:00
Philippe Teuwen 1f364106ce fix few mem leaks 2019-10-06 01:18:04 +02:00
Philippe Teuwen 78c153fe74 fix wrong fix 2019-10-06 00:17:32 +02:00
Philippe Teuwen 4ae8a3d86b fix few printf arg types 2019-10-05 23:56:19 +02:00
iceman1001 7d009a9ea7 emphase warnings 2019-10-05 12:07:28 +02:00
mwalker33 098e0a183f client win10 color support 2019-10-05 14:09:46 +10:00
iceman1001 8c9ff2e54a t5555 textual 2019-10-04 21:28:34 +02:00
iceman1001 b8776b593e fix: sneaky bug in magic detection where bigbuf wasnt emptied before next run 2019-10-04 14:21:04 +02:00
iceman1001 3d6d83726e textual 2019-10-04 10:14:38 +02:00
Philippe Teuwen 8a7274ec34 offline: avoid spurious "Sending bytes to proxmark failed" on exit 2019-10-04 09:30:36 +02:00
Philippe Teuwen 42cb2a32e8 lf config alone shows current config 2019-10-03 22:11:16 +02:00
Philippe Teuwen 159b90c002 no fct call in macro, thanks @iceman1001 2019-10-03 21:56:42 +02:00
Philippe Teuwen 156c3a81e8 no fct call in macro, thanks @iceman1001 2019-10-03 21:54:45 +02:00
Philippe Teuwen f8cd168498 add f (freq) to lf tune & lf config 2019-10-03 21:46:06 +02:00
Philippe Teuwen df08e7970c fix divisor<>freq computations, add q to lf tune 2019-10-03 21:18:37 +02:00
Philippe Teuwen f29ad0fba2 macros for divisors and fix lf optimal freq display 2019-10-03 18:32:27 +02:00
Philippe Teuwen 6df9eea950 voltage config divisor printing 2019-10-03 17:45:43 +02:00
iceman1001 37ce43cb8b chg: dont log helpout 2019-10-03 16:17:25 +02:00
iceman1001 38673a10aa textual 2019-10-03 16:16:49 +02:00
iceman1001 5d3eb444fb chg 'hf mf nested' - uses NG. chg 'hw tune' - now also prints the 'lf config q' divisor voltage. 2019-10-03 16:15:47 +02:00
Philippe Teuwen eccf0d3bbc Avoid client CPU busy loop when waiting pm3 (e.g. when simulating tag) 2019-10-01 23:00:51 +02:00
iceman1001 5def918e02 textual 2019-10-01 15:03:39 +02:00
iceman1001 af56fa8242 started to extract VeriChip demod/clone 2019-10-01 14:30:30 +02:00
iceman1001 2439f9d33c new files 2019-10-01 14:29:37 +02:00
iceman1001 f142ad139b chg 'lf cmdread' - clientside checks, less wait times on device 2019-09-30 23:18:48 +02:00
iceman1001 d40341d962 Add 'data scale h' - helptext 2019-09-30 23:17:19 +02:00
iceman1001 fd88d7448e fix 'lf t55xx resetread' - NG and better fault handling 2019-09-30 19:47:36 +02:00
iceman1001 aeab10d67f fix 'lf cmdread' - better messaging 2019-09-30 19:39:34 +02:00
iceman1001 0efbf2b9ad yes 2019-09-30 18:07:28 +02:00
iceman1001 97600ee656 iir available 2019-09-30 13:38:50 +02:00
Iceman 76b9be1a16
Merge pull request #416 from mwalker33/master 
lf config s <samples to skip> option added
 2019-09-30 13:23:29 +02:00
mwalker33 f5d7963780 lf config s update 2019-09-30 19:41:25 +10:00
mwalker33 40b1d3bea7 samples to skip (unint32_t) 
Use unit32_t for all samples to skip
 2019-09-30 19:22:26 +10:00
mwalker33 cf0d72e172 lf sniff offset 
Added samples to skip to lf config
 2019-09-29 10:43:01 +10:00
Iceman f3910ef78f
Merge pull request #415 from mwalker33/master 
lf em4x05 wipe
 2019-09-28 12:03:49 +02:00
mwalker33 b41013ca8f Update cmdlfem4x.c 
em 4x05 wipe
 2019-09-28 14:01:28 +10:00
mwalker33 5748000afc Update cmdlfem4x.c 
em4x05 wipe
 2019-09-28 13:53:24 +10:00
iceman1001 0973d30796 rework clone 2019-09-26 21:47:48 +02:00
iceman1001 3ea2851fe6 reworked clone 2019-09-26 21:44:27 +02:00
iceman1001 8bcb219131 rework clone 2019-09-26 21:24:38 +02:00
iceman1001 ecca9fc563 rework clone 2019-09-26 21:21:13 +02:00
iceman1001 4e166cfd15 add 'lf nexwatch clone' - uses raw hex to clone to t55x7 2019-09-26 21:15:38 +02:00
iceman1001 0a967f7733 chg clone 2019-09-26 21:06:18 +02:00
iceman1001 e370d60171 add 'lf pac clone' - use raw hex to clone to t55x7 2019-09-26 20:56:18 +02:00
iceman1001 40e793eb1a chg rework t55x7 clone.. 2019-09-26 20:42:00 +02:00
iceman1001 563f6bee47 chg rework tx55 clone 2019-09-26 20:36:13 +02:00
iceman1001 4ed295b730 chg reworked t55x7 clone function 2019-09-26 20:32:33 +02:00
iceman1001 2dd77330b1 add 'lf securakey clone' - take raw hew and clone to t55x7 2019-09-26 20:31:54 +02:00
iceman1001 cfe8810407 add 'lf paradox clone' - take raw hex and clone to t55x7 2019-09-26 20:31:02 +02:00
iceman1001 0cdc2c446a less output when on NON-RDV4 platform 2019-09-26 16:39:02 +02:00
iceman1001 fa2031c97a whitespace 2019-09-26 16:30:29 +02:00
iceman1001 5d503fc5d3 textual 2019-09-26 16:29:23 +02:00
iceman1001 300014d3b7 more keys 2019-09-26 11:29:20 +02:00
iceman1001 7c2231974d clean up, explain, lesser tests for buttonpress 2019-09-26 09:54:43 +02:00
iceman1001 a6a260b422 yesMerge branch 'master' of https://github.com/RfidResearchGroup/proxmark 2019-09-26 09:02:53 +02:00
iceman1001 7e15e0612a remove debug 2019-09-25 22:13:56 +02:00
iceman1001 30d565f76c free some stack 2019-09-25 22:10:59 +02:00
iceman1001 86994cdc69 textual 2019-09-25 22:06:47 +02:00
iceman1001 048a08ec34 free up some stack 2019-09-25 22:01:51 +02:00
iceman1001 36676aac23 yes 2019-09-25 10:24:39 +02:00
iceman1001 3e22d99b03 hf mf darkside uses NG. checkbutton more seldom, shoulded interfere with syncing the prng so much 2019-09-25 10:24:34 +02:00
iceman1001 e793e90803 textual 2019-09-24 21:01:44 +02:00
Philippe Teuwen 878e394cde lf tune: remove 16b mask (thanks @iceman1001) 2019-09-24 15:44:44 +02:00
iceman1001 6ffae0e156 fix - parites needs to be reset between iterations, and resuse standard functions for clock 2019-09-24 15:27:20 +02:00
Philippe Teuwen 891a079989 textual 2019-09-24 14:59:05 +02:00
Iceman 93b242a6e5
Merge pull request #410 from mwalker33/master 
lf em 4x05_dump - print output for each block read
 2019-09-24 14:09:14 +02:00
mwalker33 bf395a6c4f Update cmdlfem4x.c 
Add lck flags and f for filename
 2019-09-24 21:42:31 +10:00
iceman1001 45318e4346 conside less than 26, to be 26bit wiegand 2019-09-24 13:08:49 +02:00
iceman1001 4707355431 textual 2019-09-24 13:07:35 +02:00
iceman1001 b2c24c8010 add - continuously measure LF antenna 2019-09-24 13:06:43 +02:00
mwalker33 87a6316f44 Update cmdlfem4x.c 
Dump print and save to .eml and .bin
 2019-09-24 19:59:54 +10:00
iceman1001 7870dd6fc0 less arrays on stack. To counter OS which has ulimit ... 2019-09-23 19:10:29 +02:00
iceman1001 f42f7c2250 'hf search' new line for 2019-09-23 18:59:45 +02:00
iceman1001 c36baab3c0 releasing pressure on stack 2019-09-23 17:10:43 +02:00
mwalker33 361136f06d Update cmdlfem4x.c 
dump display and save to file
 2019-09-23 21:04:33 +10:00
iceman1001 f30511f1a2 more.. 2019-09-22 13:04:46 +02:00
iceman1001 9cdc26207f add 'lf hid watch' , 'lf awid watch', 'lf io watch' 2019-09-22 13:04:28 +02:00
mwalker33 0ea501372b Update cmdlfem4x.c 
Added print Ascii to em 4x05_dump
 2019-09-22 19:41:45 +10:00
mwalker33 3a9087d2a1 Update cmdlfem4x.c 
em 4x05_dump did not output data
 2019-09-22 15:27:00 +10:00
Philippe Teuwen 11dcc4787d mfc magic: add some defines 2019-09-21 23:50:32 +02:00
Philippe Teuwen d46edd9a53 change is_* return to bool 2019-09-21 20:22:17 +02:00
Philippe Teuwen 782feb934a split slow tests 2019-09-21 18:32:07 +02:00
iceman1001 e7d67fc2b0 fix for checking directory 2019-09-21 16:31:45 +02:00
iceman1001 862bf1b793 fix for ps3.2 compilation 2019-09-21 11:48:55 +02:00
iceman1001 f7510dc6aa better detection of directory (@doegox) 2019-09-21 11:12:36 +02:00
iceman1001 93915858ea fix data load now not crashing client when entering a folder path without filename 2019-09-21 08:47:12 +02:00
iceman1001 e5ffcfd513 chg: 'lf hid brute' - use new wiegand formats. see helptext for more details 2019-09-19 13:46:38 +02:00
iceman1001 a3161ae9a2 fix 'lf em 4x50_read - now checks if have enough data in Graphbuffer 2019-09-19 13:12:48 +02:00
iceman1001 aa2f80795d mem spibaud uses NG. And a simplification of tuning 2019-09-19 12:13:39 +02:00
iceman1001 a604f641b3 style 2019-09-19 10:55:34 +02:00
iceman1001 21a7de38b8 style 2019-09-19 10:54:34 +02:00
iceman1001 ffd03dadaa style 2019-09-19 10:48:32 +02:00
iceman1001 895410aec0 style 2019-09-19 10:47:12 +02:00
iceman1001 bb051df683 ..memset 2019-09-18 20:15:29 +02:00
iceman1001 2626c31d3d links 2019-09-18 19:43:55 +02:00
iceman1001 fa36018bef also compile... 2019-09-18 19:42:59 +02:00
iceman1001 7abc10c63a add: 'wiegand commands' - wiegand manipulation like encoding / decoding of credentials. From offical repo (@grauerfuchs) 
Adapted and converted to fit this repo.
 2019-09-18 19:20:07 +02:00
iceman1001 d3651cc075 chg 'hw status' - reply NG.... thanks @cjbrigato 2019-09-17 19:13:00 +02:00
merlokk c5ea6b54ce add ignoring results of some tests 2019-09-16 17:37:18 +03:00
Oleg Moiseenko f7ae7f44ca
Merge pull request #404 from merlokk/fido_ca 
additional fido CA
 2019-09-16 14:20:18 +03:00
iceman1001 412f016b94 chg: 'lf t55xx config' - can set config based on a block0, offset and Q5 
lf t55xx config c 000880E0 o 10     - sets a T55x7 w offset 10
lf t55xx config c 000880E0 o 6 Q5   - sets a Q5/T5555 w offset 6
 2019-09-16 12:36:04 +02:00
Philippe Teuwen 88cbf789a1
Merge pull request #403 from mwalker33/master 
Quick Typo Fix - T55xx Config Print
 2019-09-16 12:03:25 +02:00
iceman1001 e5c31886eb chg: 'lf io clone' - refactored, uses NG 2019-09-16 11:41:34 +02:00
iceman1001 4c08477ef7 chg: 'lf indala clone' - refactored , uses NG 2019-09-16 11:33:05 +02:00
iceman1001 3726df62a4 chg: enhanced verify t55xx write. 
We set config to the cloned block0,  whats left is to identify the offset,  which we try to do.
 2019-09-16 11:11:54 +02:00
mwalker33 e8ef0fe263 Update cmdlft55xx.c 2019-09-16 19:01:40 +10:00
iceman1001 8ba2f5b06c encourage 2019-09-15 21:00:38 +02:00
iceman1001 75f4a08f53 chg 'lf noralsy clone' - uses verifywrite 2019-09-15 20:56:43 +02:00
iceman1001 c2f3e4b2f3 encourage.. 2019-09-15 20:51:23 +02:00
iceman1001 19bdfd2577 chg some printing of blocks 2019-09-15 20:46:21 +02:00
iceman1001 a933eb4f9e adjusting beahavior for auto detection 2019-09-15 20:30:05 +02:00
iceman1001 44cb67c49b adjusting write validation to only print when successful in validating. Otherwise like old times. silence. 2019-09-15 20:27:50 +02:00
Philippe Teuwen 59e66ce5fd lf hid sim: add support for long ID 2019-09-15 02:00:42 +02:00
Philippe Teuwen 9275304640 lf hid clone: fix some stuff related to long ID, still clone doesn't seem to work 2019-09-15 01:36:38 +02:00
iceman1001 06809babbb chg: 'lf pyramid clone' - add verification 2019-09-15 01:33:54 +02:00
iceman1001 47724d0a1b textual 2019-09-15 01:13:52 +02:00
iceman1001 2bec009778 chg: 'lf viking clone' - now uses NG 2019-09-14 19:58:17 +02:00
iceman1001 cd28641d96 chg: 'lf visa2000 clone' - now verify successful write of blocks. 2019-09-14 19:31:00 +02:00
iceman1001 d5d273fedb fix. 2019-09-14 19:11:39 +02:00
iceman1001 54ea65bf34 Messy messy. I probably lost my commit texts now... 
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
 2019-09-14 19:02:13 +02:00
iceman1001 da197e1999 CHG: 'lf t55xx wipe c' - now accepts user provided configuration block to configure a wiped tag with. 
ADD: 'lf t55xx protect' -  Sets password and enables password protection in configuration block.   It tries to validate its writes aswell.

Samples:
lf t55xx protect n 11223344            - set pwd to 11223344
lf t55xx protect n 01020304 p 11223344 - change a password protected tag from 11223344 to 01020304

To remove the password protection, you need to remember the password :)
lf t55xx wipe p 11223344               - wipes whole tag, removes password protection bits.
 2019-09-14 18:27:58 +02:00
Ludovic Rousseau f961c1c551 Fix typos 
Thanks to Debian lintian for the reports:
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf dont don't
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf succesful successful
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf Uknown Unknown
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf requestes requests
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf unkown unknown
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf ambigous ambiguous
 2019-09-14 17:53:24 +02:00
Ludovic Rousseau a1852eaa4b Fix typos 
Thanks to Debian lintian for the reports:
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 formated formatted
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 succesfully successfully
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Skiped Skipped
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 standart standard
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 supress suppress
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 successfull successful
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Succeded Succeeded
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Overriden Overridden
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 aquire acquire
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 occured occurred
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 delimeter delimiter
 2019-09-14 17:44:58 +02:00
mwalker33 c3756f1903 T55xx DLMode Update 2019-09-14 14:13:55 +10:00
iceman1001 250be16876 chg: 'lf t55 write v' - validation of data. After a write, the command tries to read the block and see if it matches the data entered. 
This can fail because of password,  not correct configuration settings before. Also validating a block0 write is harder, some modulations are not that perfect.
This is however a nice step forward.
 2019-09-13 21:25:39 +02:00
iceman1001 af02ee871d chg: 'lf t55xx info c' - renamed from "d" to "c", takes a block0 and print info. 
chg: 'lf t55xx config c'  - now takes a block0 and use as configuration.

usage:
lf t55xx config c 000880E8
lf t55xx info c 000880E8
 2019-09-13 20:50:00 +02:00
iceman1001 f1307e703c style 2019-09-13 16:32:37 +02:00
iceman1001 2b25d86392 style 2019-09-13 16:31:17 +02:00
iceman1001 8d6bde0d63 chg: 'lf em 4x50_demod' - seems the read 4x50 didnt read, it demodulated only.. 2019-09-13 15:13:18 +02:00
iceman1001 270d0821b5 chg: 'data print i' - new param I, inverts the demod buffer 2019-09-13 12:11:56 +02:00
iceman1001 f1b36c0b5a fix paradox sim compilation... 2019-09-13 07:30:03 +02:00
Philippe Teuwen 5e4243e5a1 Disable lf paradox sim, which needs non-existing GetParadoxBits 2019-09-13 00:51:18 +02:00
Philippe Teuwen 05e9ac97ae fix lf awid sim doc: must be digits 2019-09-13 00:39:19 +02:00
iceman1001 5d24d7a85b Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-09-12 21:20:51 +02:00
iceman1001 3821a03a40 chg: 'lf t55xx wipe p' - now takes a password for wipe 
chg: 'lf t55xx wakeup' - uses NG
 2019-09-12 21:20:40 +02:00
Philippe Teuwen ed5fed8fac Attempt to fallback to current directory if no HOME in env 2019-09-12 20:16:52 +02:00
Philippe Teuwen 46574ae0f5 add get_my_user_directory() to centralize HOME processing 2019-09-12 20:13:01 +02:00
iceman1001 77a10ceb08 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-09-12 17:35:06 +02:00
iceman1001 c3a0d7d88a chg: 'lf t55xx info p' - got some more love, now can read with password :) 
chg: 'lf t55xx dump p' - less outputs and now can read with password :)
chg: 'lf t55xx trace 1' - can now decode trace from a saved trace. However you must have correct configuration set in order to work.
chg: 'lf t55xx wipe p' - now can use a password to write to configblock first.
 2019-09-12 17:34:55 +02:00
merlokk 9c61ac1375 additional fido CA 2019-09-12 16:13:36 +03:00
3ldidi94 ef281465ae
Add keys found on hardenest Mifare Classic Card 
Add keys found on hardenest Mifare Classic Card of an Hotel in Berlin (DE)
 2019-09-12 11:38:53 +02:00
Philippe Teuwen 22ead8ca0b printdemodbuffer: add option to strip leading zeroes 2019-09-12 01:24:20 +02:00
iceman1001 1ad66c917f fixin... 2019-09-11 22:51:13 +02:00
iceman1001 f57a6195de turning off field on failure 2019-09-11 16:56:08 +02:00
iceman1001 f189c5c3f8 a 
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
 2019-09-11 16:37:13 +02:00
iceman1001 312e4b358c fix: 'hf iclass reader 1' - now turns off 2019-09-11 16:36:41 +02:00
iceman1001 9f0db0bbdc textual 2019-09-11 16:23:06 +02:00
iceman1001 a623e6a246 chg: 'hf iclass list' - no parity on responses 2019-09-11 16:22:37 +02:00
merlokk 08c345e560 added yubikey link 2019-09-11 17:21:27 +03:00
Philippe Teuwen 4540b31d67 thinfilm: textual 2019-09-11 15:58:03 +02:00
iceman1001 387dd82895 chg 'hf iclass list' - fix parity checks 2019-09-11 14:03:14 +02:00
Iceman 341703d9a7 chg: 'hf iclass sim' - better iClass protocol implementation 2019-09-11 13:09:08 +02:00
Philippe Teuwen 843f554503 prevent lua bombs 2019-09-10 12:32:01 +02:00
Philippe Teuwen 608e0ba27c fix plot strange values 2019-09-10 00:06:16 +02:00
Philippe Teuwen d08f03058b add support for (nested) cmd scripts in script list/run 2019-09-09 23:46:38 +02:00
Philippe Teuwen e10085bfe8 log interactive commands as well 2019-09-09 21:30:25 +02:00
Philippe Teuwen ba47ac36cb Do not log to history with -h/-t/-m 2019-09-09 21:01:43 +02:00
Philippe Teuwen d5d2c64d50 allow to set debugmode from cli options 2019-09-09 20:45:10 +02:00
Philippe Teuwen 6385ee960f searchFile for firmwares 2019-09-09 19:55:27 +02:00
iceman1001 f7624a7767 textual 2019-09-09 17:33:44 +02:00
iceman1001 7b773c571b chg: 'lf t55xx dump p 11223344' - less verbose output. 2019-09-09 15:19:00 +02:00
Iceman c918e0ab80 chg: 'hf search' - feedback text (@wvzlad) 2019-09-09 13:15:55 +02:00
Philippe Teuwen afe891647f merge flasher in client 2019-09-09 01:35:15 +02:00
iceman1001 ca606bb211 stupid... 2019-09-08 23:23:06 +02:00
iceman1001 9a2a0116e4 fix: 'hf iclass clone' - last block write fails, see (https://github.com/RfidResearchGroup/proxmark3/issues/183) 
chg: 'hf iclass clone' - now tries ten times,  behavies better, obey verbose nicer, drop field constant. Uses NG.
chg: 'hf iclass dump' - now tries ten times,
in general nice outputs..
 2019-09-08 23:19:06 +02:00
iceman1001 d8217a13d9 chg: 'hf iclass rdbl' 
'hf iclass wrbl'  - both commands now tries tens times. Both honor verbose param,  both has gotten some love with regards to timing on device side,  and they also turn off the field more consistent.
 2019-09-08 21:21:30 +02:00
iceman1001 305c54f3cf chg: 'hf iclass rdbl' - now retries 10 ten times and uses NG 2019-09-08 17:37:14 +02:00
RFID Research Group a037766e26
Update cmdhfmf.c 
chg: hf mf brute - commented out.
 2019-09-08 12:57:25 +02:00
Iceman fbe86a9070
Update cmdhfmf.c 
Textual,  
and  HF MF KEYBRUTE is considered obselete since improved hardnested. 
Will let it still be in code for learning purposes.
 2019-09-08 12:29:10 +02:00
Philippe Teuwen 28534c10ad hf mf autopwn not available offline 2019-09-07 20:45:12 +02:00
Philippe Teuwen a8e922271b
Merge pull request #388 from sh7d/autopwn-fix 
autopwn: fix card detection
 2019-09-07 20:07:26 +02:00
sh7d 93e323d890 Review requested changes 2019-09-07 19:41:48 +02:00
Philippe Teuwen 9ce820768c missing free 2019-09-07 12:07:09 +02:00
sh7d 710c49f763 autopwn: fix card detection 2019-09-07 11:39:49 +02:00
iceman1001 8228b66cb6 chg: \n - param not obsessed with two hexsamples. \n textual 2019-09-07 10:32:16 +02:00
iceman1001 c34660b74c free some mem 2019-09-06 17:22:54 +02:00
iceman1001 57dc1849da return 2019-09-06 16:52:05 +02:00
Iceman f1eceab385 chg: hf iclass / hf mfu - free some 3des contexts 2019-09-06 09:00:01 +02:00
Philippe Teuwen ffe849fb93 fixing compilation bug in iclass 2019-09-05 23:34:51 +02:00
Philippe Teuwen 9cf2cd7ca9 remove leading/tailing "/" from installation RELPATHs 2019-09-05 23:20:46 +02:00
iceman1001 1ca235e58f chg: hf iclass decrypt -d - now also reads enccrypted blockdata as param to decrypt 2019-09-05 22:39:30 +02:00
Iceman 3323126d7b adaption 2019-09-05 16:07:25 +02:00
Iceman c9d42699fb textual 2019-09-05 15:52:40 +02:00
Philippe Teuwen ecb535cc58 make style 2019-09-05 00:48:48 +02:00
Philippe Teuwen f8636b18db searchFile: HOME takes precedence on repo and installed paths, more coherent 2019-09-04 23:40:42 +02:00
Philippe Teuwen d84c039742 Example of shebang on Lua script 2019-09-04 23:36:23 +02:00
Philippe Teuwen 43055ae6a7 searchFile for cmdscripts 2019-09-04 23:29:03 +02:00
Philippe Teuwen 00ad68215b add cmdscript example 2019-09-04 23:28:19 +02:00
Philippe Teuwen 7594ea4942 skip comments in cmdscripts 2019-09-04 23:13:51 +02:00
Philippe Teuwen 2ddbbd255b data load: search file with and without extension .pm3 2019-09-04 22:53:54 +02:00
CristarIngram 15d8e246d8
more mfc keys 2019-09-03 16:10:22 +02:00
Philippe Teuwen bccb9069f9 prepare libamiibo.a inclusion 2019-09-03 00:18:43 +02:00
Philippe Teuwen f7f80a9b9f fido2: fix fido assert loading file 2019-09-02 22:51:28 +02:00
Philippe Teuwen 002580b6d4 fido: fix typos 2019-09-02 22:48:25 +02:00
iceman1001 f1d31f1e43 chg: 'mem load' - use loadxxxx_safe method 2019-08-31 21:49:59 +02:00
iceman1001 3352904f1d chg 'mem spiffs load' - use loadfile_safe 2019-08-31 21:47:31 +02:00
iceman1001 5ff9cbaac0 fix: 'hf iclass eload' - load file works again. 2019-08-31 15:25:36 +02:00
Philippe Teuwen 7e579f9fca rename SIMxxx.BIN in lowercase 2019-08-30 22:13:51 +02:00
Philippe Teuwen f6a4f9cbe3 move client scripts to tools 2019-08-30 22:11:02 +02:00
Philippe Teuwen 3245260c00 Add Makefile.defs with common defs 2019-08-30 22:10:06 +02:00
Philippe Teuwen d772c6169a rename flasher -> proxmark3-flasher 2019-08-30 21:57:43 +02:00
Philippe Teuwen 4fdb5a2f4b make install: half way 2019-08-30 21:55:13 +02:00
Philippe Teuwen b5f5b9276f make install skeleton 2019-08-30 21:44:40 +02:00
Philippe Teuwen 4d31b2399b reintroduce PREFIX and use relative paths for finding share/ when installed, independently of PREFIX 2019-08-30 21:36:10 +02:00
iceman1001 e1e5687e32 add: lua scripts can now search for files. 2019-08-30 14:53:53 +02:00
Oleg Moiseenko 4433f8982c
Appveyour fix paths (#379) 2019-08-30 13:55:35 +03:00
Philippe Teuwen 2022df1068 make style 2019-08-30 10:45:52 +02:00
Philippe Teuwen 2c853d94ea move hardnested tables to resources/ 2019-08-30 09:02:01 +02:00
Philippe Teuwen eba13925e4 move bf_bench_data.bin to resources/hardnested_* 2019-08-30 08:53:24 +02:00
iceman1001 0771f0ae95 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-30 08:52:06 +02:00
iceman1001 f6fa2c4651 moved to docs 2019-08-30 08:51:55 +02:00
Philippe Teuwen 08a5de1f0e searchFile traces 2019-08-30 08:32:34 +02:00
Philippe Teuwen 40709f4536 move defparams.json to resources/emv_defparams.json 2019-08-30 02:18:14 +02:00
Philippe Teuwen 382129205f move capk.txt to resources/ 2019-08-30 02:10:55 +02:00
Philippe Teuwen c6ac4056d3 fix iclass txt 2019-08-30 02:01:14 +02:00
Philippe Teuwen 5b6af929ab move oid.json to resources/ 2019-08-30 02:00:41 +02:00
Philippe Teuwen af65beb987 move aidlist.json to resources/ 2019-08-30 01:23:50 +02:00
Philippe Teuwen ca8aee33ea move iclass_dump.bin in resources/ 2019-08-30 01:23:10 +02:00
Philippe Teuwen de5c5df732 remove debug print 2019-08-30 00:08:31 +02:00
iceman1001 4d073ae19d mv iclass_dump.bin one folder up 2019-08-29 21:49:54 +02:00
Philippe Teuwen 73cefedd61 remove entirely ncurses, not needed nowadays 2019-08-29 18:22:14 +02:00
iceman1001 6529c9616f chg: remove termcap and use pkg-config for ncurses (@ZeroChaos-) 2019-08-29 16:56:22 +02:00
iceman1001 f3a63767ed chg: 'hf iclass loclass t' - now uses loadfile_safe. However the iclass_key.bin and iclass_dump.bin must be in the new folder structure 2019-08-29 15:55:52 +02:00
iceman1001 00f82304e2 chg: 'hf iclass loclass t' - now uses loadfile_safe 2019-08-29 14:33:09 +02:00
iceman1001 f0d73dc3d1 chg: 'hf iclass decrypt' - now takes transport key as param. also search for key / dump. Also saves decrypted to bin/eml/json_decref 
chg: 'hf iclass encrypt' - now takes transport key as param.
 2019-08-29 14:17:39 +02:00
Philippe Teuwen 0d6a29197b rework OS/ARCH info 2019-08-29 11:10:54 +02:00
iceman1001 74f96be6be textual 2019-08-29 10:46:57 +02:00
iceman1001 c3c5011e1d textual 2019-08-29 10:36:48 +02:00
Philippe Teuwen b10edbaddc user dir: rework err msgs 2019-08-29 10:31:37 +02:00
Philippe Teuwen fcd9b42dca reintroduce _stat on mingw, needed to strip path 2019-08-29 10:07:40 +02:00
iceman1001 6e54adcb7c fix: 'hw version' - identifing os on unknown.. 2019-08-29 09:53:28 +02:00
iceman1001 979f3aba2e chg: 'hf iclass chk' 
chg: 'hf iclass lookup'  - use fileutils load dictionary instead.

chg: 'hf iclass encrypt' - start w change to allow for key parameter
 2019-08-29 07:47:17 +02:00
iceman1001 3683cd88c6 chg: 'hw version' - simple os detection. 2019-08-29 07:45:09 +02:00
Matthias Konrath a69fbdd3af Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into autopwn_restyle 2019-08-29 06:17:27 +02:00
Philippe Teuwen 430c53a7ac Fix buffer allocation again, just getting rid of it 2019-08-28 23:51:52 +02:00
Philippe Teuwen aa77f7298c Fix buffer allocation for showing compiler version 2019-08-28 23:28:28 +02:00
Philippe Teuwen 11c7db3523 Get ~/.proxmark3 working on Mingw 2019-08-28 23:07:23 +02:00
Philippe Teuwen d2d58db985 Move history and logfile to ~/.proxmark3 2019-08-28 21:53:31 +02:00
iceman1001 117ebf0beb chg: 'hf mf ecfill' - now uses NG format. 
chg: 'hf mf eload'  - now uses NG format.
chg: 'hf mf fchk m' - now uses ecfill trick,  if fchk got all keys,  it will dump the card directly.
    sample:
         hf mf fchk 1 m     (must have dictionaries uploaded to device) if all keys are found,  you can now run
         hf mf esave         to get a complete dump.
 2019-08-28 21:21:27 +02:00
iceman1001 8d9751ebe4 fix: uint cant be negative.. 2019-08-28 21:16:09 +02:00
iceman1001 ad3fe38b45 fix: loaddictionary_save, now with correct mem clear. 2019-08-28 21:15:32 +02:00
iceman1001 f3ab9632f0 return values 2019-08-28 21:12:32 +02:00
Philippe Teuwen cbca61f6ba searchAndList: hide temptative repo path 2019-08-28 19:25:15 +02:00
Matthias Konrath e4159b7cb3 Cleaned up the ouput to be as minimalistic as possible. Now the verbose flag output is realy verbose. 2019-08-28 18:39:01 +02:00
Matthias Konrath 2e29b361c5 Restyled the autopwn command output according to @doegox 2019-08-28 15:57:21 +02:00
Matthias Konrath 6c76e2ed5b Restyled to the autopwn command output. 2019-08-28 14:20:52 +02:00
Iceman 86790df6e7
Merge pull request #364 from matthiaskonrath/load_dictionary_safe 
Implementation of a function to safely load a dictionary
 2019-08-28 12:55:08 +02:00
Matthias Konrath 5167507a83 Fixed the loadFileDICTIONARY_safe memset alignment. Thanks to @doegox for pointing that out. 2019-08-28 12:14:40 +02:00
Matthias Konrath 2290b2bd88 Fixed the description of the loadFileDICTIONARY_safe function. 2019-08-28 11:30:30 +02:00
Matthias Konrath 7237a9638b Removed debugging stuff. 2019-08-28 11:19:54 +02:00
Matthias Konrath e259b26d60 Streamlined the naming conventen and types. 2019-08-28 10:45:45 +02:00
Matthias Konrath 7eb79732ff Added security features to the loadFileDICTIONARY_safe function (memset after a realloc). 2019-08-28 10:38:56 +02:00
Matthias Konrath 1ce10cfea6 Added additional checks (loadFileDICTIONARY_safe). 2019-08-28 10:09:01 +02:00
Matthias Konrath ae7b0de2c9 Fixed a typo and added and improved the checks for the returned data of loadFileDICTIONARY_safe. 2019-08-28 09:49:21 +02:00
Matthias Konrath 9dc3c39a95 Added additional checks to the from load dictionary returned data points. 2019-08-28 09:45:11 +02:00
Matthias Konrath 225b18d5fc Implemented a function to safely load dictionaries. 2019-08-28 09:34:46 +02:00
Philippe Teuwen 254beefda2 Fix mingw utf8->cp850 support 2019-08-28 00:03:27 +02:00
Philippe Teuwen 4fe7c7c9fa remove utf8 dashes 2019-08-27 23:17:02 +02:00
iceman1001 4b8c80ec33 return values.. 2019-08-27 21:56:03 +02:00
Matthias Konrath a0c2de5602 Added an key found message to the read b key with a key feature. 2019-08-27 20:28:28 +02:00
Matthias Konrath 42d58cbced fixed the read B key features error handling. 2019-08-27 19:55:45 +02:00
Matthias Konrath c9a02adc70 Added the read B key with known A key feature, and minor changes to the UI (alignment). 2019-08-27 19:45:37 +02:00
Matthias Konrath 02c1657594 Added some found keys to the dictionary. 2019-08-27 19:17:52 +02:00
Philippe Teuwen d88b76beda partial make style 2019-08-27 17:28:08 +02:00
iceman1001 13aa4ee6ab fix: cleaning up 'hf mf autopwn' - reused the fix from below aswell. 
Add: 'hf mf dump'  rename filenames (@mohemiv) see https://github.com/RfidResearchGroup/proxmark3/pull/360
 2019-08-27 17:15:42 +02:00
iceman1001 703329faca chg: add used known key to found list :) 2019-08-27 11:08:03 +02:00
iceman1001 48d3802d35 chg: optimization of iclass mac calculations on deviceside (@pwpiwi) see https://github.com/Proxmark/proxmark3/pull/861 
chg: some textual
 2019-08-27 10:51:52 +02:00
Matthias Konrath 1e648088b1 Improved the help message of the autopwn command. 2019-08-26 22:54:59 +02:00
Philippe Teuwen 16a7cfd7b2 make style (excepted cmdhficlass...) 2019-08-26 22:28:39 +02:00
Philippe Teuwen 9c677e045e mf autopwn: try nested harder before hardnested; typos 2019-08-26 22:21:23 +02:00
Philippe Teuwen d838c81601 hf mf attacks: rewordings 2019-08-26 20:57:23 +02:00
Philippe Teuwen 1368595be1 hf mf nested: swap loops for faster results (try harder to break keyA first) 2019-08-26 20:37:33 +02:00
Philippe Teuwen bdd6ef98b5 fix autopwn help 2019-08-26 20:34:16 +02:00
Iceman d548b8daeb
Merge pull request #353 from matthiaskonrath/hardnested_autopwn 
Autopwn
 2019-08-26 15:12:21 +02:00
Matthias Konrath 236c2eb1d0 Changed createKeyDump to a less generic name (createMfcKeyDump). 2019-08-26 14:29:21 +02:00
Philippe Teuwen 1628ac8e62 revert temporarily hf iclass chk/lookup 2a1e6dff 2019-08-26 13:55:42 +02:00
Philippe Teuwen 7076df0e18 hf mf chk/fchk: don't stop on line errors when parsing dict 2019-08-26 13:53:23 +02:00
Philippe Teuwen 6ac9d2f0fb lf t55xx chk: load dic with searchFile 2019-08-26 13:46:53 +02:00
Philippe Teuwen 2a1e6dff80 hf iclass chk/lookup: load dic with searchFile and fail when errors in args 2019-08-26 13:36:37 +02:00
Philippe Teuwen 4ddc3d61d5 hf mf chk/fchk: load dic with searchFile and fail when errors in args 2019-08-26 13:21:03 +02:00
Matthias Konrath 2edee59837 Changed the variable names, added aditional dictionary size checks, fixed a corner case with the key transferes. 2019-08-26 12:27:40 +02:00
iceman1001 2e4c7f4f8d chg: reuse code 2019-08-26 10:52:07 +02:00
Matthias Konrath 13641771ba Improved help message, implementation of a verbose option (to reduce the output), corrected some spelling mistakes and cleaned up variable names. 2019-08-25 22:24:52 +02:00
Matthias Konrath 47b2c5ddc6 Removed old command options. 2019-08-25 11:16:10 +02:00
Matthias Konrath bd01b7bd96 Now the keys are transfered to the simulator memory and the whole card gets dumped at the end. 2019-08-25 11:13:53 +02:00
Matthias Konrath 7dbb5427ea Transformation from hardautopwn to autopwn, now are all the mifare classic attacks automated. 2019-08-24 18:11:03 +02:00
iceman1001 f9d8d56317 add iclass json dump format 2019-08-24 13:16:28 +02:00
Philippe Teuwen ec174a7232 better searchFile api 2019-08-24 07:51:24 +02:00
Philippe Teuwen 7ab7d68a26 calloc in fileutils 2019-08-24 07:18:45 +02:00
iceman1001 c6145a81c2 chg: iclass commands 2019-08-24 05:08:03 +02:00
Philippe Teuwen 9d05628c3c mem load: update examples 2019-08-23 23:21:20 +02:00
Philippe Teuwen b09849c91b pull filenamemcopy out of searchFile 2019-08-23 23:07:05 +02:00
Philippe Teuwen 4b95be1b39 searchFile: search also implicit relative path 2019-08-23 22:09:54 +02:00
Philippe Teuwen 8c26e07ceb use searchFile to find dictionaries 2019-08-23 22:08:36 +02:00
Philippe Teuwen 34a0fdb9d6 reorganize lua script dir defs 2019-08-23 22:07:45 +02:00
Philippe Teuwen 31e430744b searchFile: use filenamemcopy 2019-08-23 21:49:58 +02:00
Philippe Teuwen e0cdb5d7a7 makefile: allow override of install paths 2019-08-23 21:07:20 +02:00
Philippe Teuwen c709ee7c10 rework PREFIX for future make install 2019-08-23 20:55:50 +02:00
Matthias Konrath 87cbf3aa70 Improved the reliability, speed and redability. Ready for a pull mr. iceman ;) 2019-08-23 17:17:17 +02:00
Iceman 4b2b103e80
Update mfc_default_keys.dic 
data from forum,
 2019-08-23 15:23:55 +02:00
Philippe Teuwen 440c05cdfa searchFile accepts also explicit absolute or relative path 2019-08-23 00:08:19 +02:00
Philippe Teuwen 3ebc00854b Add searchAndList & searchFile in fileutils 2019-08-22 23:55:37 +02:00
Philippe Teuwen e8efeacc57 remove ON_DEVICE from fileutils 2019-08-22 23:07:52 +02:00
Philippe Teuwen 77c86099cc clean and uniformise dic files 2019-08-22 22:58:16 +02:00
Philippe Teuwen 23044c00d0 rename and move dict files 2019-08-22 22:16:33 +02:00
Philippe Teuwen 915c200ebc luascript: use fileExists 2019-08-22 21:18:37 +02:00
Philippe Teuwen 72392ab305 fileutils: fix rel path to includes 2019-08-22 21:18:14 +02:00
Philippe Teuwen 9825f521b4 Fix clang issue where generated .d are sometimes newer than .o 2019-08-22 21:05:45 +02:00
Philippe Teuwen 40b6956a22 script list: print dir tree 2019-08-22 19:53:23 +02:00
Philippe Teuwen 595b8a1885 introduce PREFIX for pm3 system directory and move to common.h 2019-08-22 19:36:20 +02:00
iceman1001 ab38130c3e chg: some more checks in pathing 2019-08-22 17:44:08 +02:00
Matthias Konrath abb69e2dc9 Further improved the hardautopwn feature. 2019-08-22 14:55:06 +02:00
Matthias Konrath 407078d90a Experimental hardautopwn implementation. 2019-08-22 12:49:26 +02:00
Philippe Teuwen 9ae27cd73c scripts list / scripts run: look also in the new lua scripts paths 2019-08-22 00:32:15 +02:00
Philippe Teuwen 3c6500a1b2 Lua: look for scripts also in ~/.proxmark/{luascripts,lualibs} and /usr/local/share/proxmark3/... 2019-08-21 23:53:27 +02:00
Philippe Teuwen a8ee33baf4 change scripts/ to luascripts/ 2019-08-21 23:17:01 +02:00
Philippe Teuwen fb00690957 rename and +x few eml helper scripts 2019-08-21 22:45:06 +02:00
Iceman 56267ea623 readd fileutils 2019-08-21 14:43:22 +02:00
Iceman a0f261c1e0 chg: moved fileutils from loclass 2019-08-21 14:41:33 +02:00
Iceman 4e627f09c0 add: proxmark3 -v/--version - for easiness to detect version in offline mode and installs 2019-08-21 12:52:59 +02:00
Iceman fea5d88278 add: detect unfused / write once magic tags, from https://github.com/nfc-tools/libnfc/pull/554 2019-08-20 14:53:52 +02:00
Philippe Teuwen 589f1e9d3e client/Makefile: add missing deps 2019-08-19 21:50:16 +03:00
Philippe Teuwen 0449527e2a adapt client/Makefile to new mbedtls & zlib way of working, remove unneeded dirs 2019-08-19 21:50:16 +03:00
Philippe Teuwen 0115efe190 isolate reveng, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen 6ebae499aa rework fpga_compress & isolate zlib: use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen aebfe0af19 rework mfkey Makefile and move util_posix to common, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen 829934886f rework tinycbor Makefile, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen 7b78833800 rework liblua Makefile and skip clients compilation, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen 9767c075d9 rework jansson Makefile, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen f4c810f83b allow override of CFLAG & alike, remove /opt paths 2019-08-19 21:50:16 +03:00
iceman1001 f06846e2d0 chg: 'hf iclass loclass' - break attack earlier if one csn byte recovery fails. No need to try run it. and some colors... 2019-08-19 20:24:08 +02:00
Philippe Teuwen ab2100879e Get btpin/btfactory available in FPC DEV builds 2019-08-19 17:47:11 +02:00
root 63b47a003e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-18 17:06:58 +02:00
iceman1001 f2e77bfbe4 chg: some tabs converted 2019-08-17 15:59:11 +02:00
Philippe Teuwen 4d16f3e7d2 fix reveng: unsigned long on Mingw64 is only 32b, hopefully limits.h can help 2019-08-15 19:24:50 +02:00
Philippe Teuwen f008b965d5 missing include 2019-08-14 23:06:14 +02:00
root d770e4c57a remove debugstatements 2019-08-14 22:59:14 +02:00
Philippe Teuwen a187968967 Hmm, let's try to fix reveng on 32b 2019-08-14 22:19:52 +02:00
Philippe Teuwen 2f029d0d9d remove comment 2019-08-14 21:54:43 +02:00
Philippe Teuwen ea601f4052 fix reveng for all platforms else than WIN32 2019-08-14 21:53:04 +02:00
Philippe Teuwen db0ac1639b em4x watch & read: collect enough samples to cover EM XL tags 2019-08-13 22:57:54 +02:00
Philippe Teuwen 252929bed4 fix lf read command parsing bug 2019-08-13 20:30:19 +02:00
cjbrigato 961f98c125 SPIFFS : FIXES FS corruption against high numbero f current losses, high number of files manipulation. FIXES LOG_BLOCK erasing handlers. FIXES Garbage Collector. Overall, SPIFFS should now be WAY MORE resilient to any form of misbehavior. In case of corrupted filesystem (should still be readable !), spamming 'mem spiffs check' from the client will ensure at least 2 new free 4k blocks each tile (if number of LOG_PAGE available is enough) and in the same pass will move/reorganize the LOG_PAGES of contextual blocks. Yiha 2019-08-13 17:39:48 +02:00
iceman1001 de1093d5d9 textual 2019-08-12 16:32:27 -04:00
iceman1001 bbc324f9fe follow status pattern 2019-08-12 16:31:57 -04:00
Philippe Teuwen 01ce580e7b make btpin & btfactory accessible in BTADDON builds 2019-08-12 18:58:28 +02:00
Colin J. Brigato cb39be8c47
Fixes Compilation on OSX 2019-08-12 12:39:16 +02:00
Philippe Teuwen 47b60d84de make style 2019-08-11 23:53:45 +02:00
Philippe Teuwen 8b0a80ec98 add missing include for whereami.c in android 2019-08-11 21:42:01 +02:00
Philippe Teuwen 3e96c27c18 remove clang warning 2019-08-11 21:42:01 +02:00
Philippe Teuwen 80b4e81130 Fix fpga_compress race condition and isolate it in tools 2019-08-11 21:42:01 +02:00
Philippe Teuwen d19754567d summer restructuring: 
* .h include only the strict minimum for their own parsing
  * this forces all files to include explicitment their needs and not count on far streched dependencies
  * this helps Makefile to rebuild only the minimum
  * according to this rule, most standalone .h are now gone
  * big app.h is gone
  * remove seldom __cplusplus, if c++ happens, everything will have to be done properly anyway
* all unrequired include were removed
* split common/ into common/ (client+arm) and common_arm/ (os+bootloader)
  * bring zlib to common/
  * bring stuff not really/not yet used in common back to armsrc/ or client/
  * bring liblua into client/
  * bring uart into client/
  * move some portions of code around (dbprint, protocols,...)
* rename unused files into *_disabled.[ch] to make it explicit
* rename soft Uarts between 14a, 14b and iclass, so a standalone could use several without clash
* remove PrintAndLogDevice
* move deprecated-hid-flasher from client to tools
* Makefiles
  * treat deps in armsrc/ as in client/
  * client: stop on warning (-Werror), same as for armsrc/

Tested on:

* all standalone modes
* Linux
 2019-08-11 21:42:01 +02:00
Iceman b7d412d27b Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-10 21:04:25 +02:00
Iceman a36b784ecd chg: help text commands now green 2019-08-10 18:34:02 +02:00
Iceman 3f9613b87f chg: script run dumptoemul - better fail messages 2019-08-10 18:20:20 +02:00
Iceman b06274623f fix: hf iclass dump - now also save EML 2019-08-10 18:05:24 +02:00
Philippe Teuwen ceda9f9f4b
Merge pull request #310 from ViRb3/rework-help 
Rework hitag2 read/write help
 2019-08-09 22:16:21 +02:00
Philippe Teuwen 5051ea429d typo 2019-08-09 13:02:10 +02:00
Philippe Teuwen c58937b5f5 client: clean deps while cleaning objects 2019-08-09 12:12:22 +02:00
Philippe Teuwen 5a6c9e7863 hf tune: mask 32b dword to 16b 2019-08-07 13:04:36 +02:00
Philippe Teuwen bc28eb04e4 Revert 00350db and add waiting time extension request mechanism, see issue #265 2019-08-07 13:04:34 +02:00
Philippe Teuwen e057fa6fa0 Add time measurements of recv packets on client side 2019-08-07 13:04:31 +02:00
Philippe Teuwen 9b44590f8d make style 2019-08-07 13:04:26 +02:00
Philippe Teuwen 12a0540d91 mf sim: add option to pass explicitly atqa/sak and reject explicitly unknown vals for option t 2019-08-07 01:32:37 +02:00
Philippe Teuwen 4615354864 mf sim: respect DBG_NONE and explicit ATQA/SAK usage 2019-08-07 00:47:32 +02:00
Victor d158ffebfd Note that hitag1 read/write not yet implemented 2019-08-06 19:13:38 +01:00
Victor 67887a83d3 Rework hitag2 read/write help 2019-08-06 19:08:51 +01:00
Philippe Teuwen 1354aec556 typos 2019-08-06 13:51:10 +02:00
iceman1001 25748b0746 style 2019-08-05 12:01:11 -04:00
iceman1001 f317e3247a chg: 'lf nedap' - decoding / encoding of Nedap. (anon) 2019-08-05 17:43:53 +02:00
Philippe Teuwen 6f47e12797
Merge pull request #308 from cjbrigato/patch-1 
FIXes # 174 and more (OSX > 10.4 num_Cpus) the good way
 2019-08-05 00:41:20 +02:00
Philippe Teuwen 7a620ddaa7 remove redundant conditions 2019-08-05 00:31:51 +02:00
Colin J. Brigato 38e4e8d80c
FIXes OSX > 10.4 num_Cpus() the good and posix way 
sysconf() is  part of IEEE Std 1003.1-1988 (POSIX.1).
Fortunately, it *is* available to OSX `>=10.5`.
At least on `~10.14`, the old unposix `sysctl` osx way was lost, at least in portable environments.
This fixes it, but will not be compatible with OSX > 10.4. 
So i'm sorry but here we loose compatibility with Macs olders than 2005. (🤣)
 2019-08-05 00:27:15 +02:00
iceman1001 18d2c24e9e chg: 'trace list' - abort when ENTER key is pressed 2019-08-04 19:13:54 +02:00
Philippe Teuwen f40600f997 make style 2019-08-04 16:57:06 +02:00
Philippe Teuwen 1cb039255e Add client option -i to stay in interactive mode after a script or command 
From 5a3f474331
with some fix in the logical flow
 2019-08-04 15:34:18 +02:00
Philippe Teuwen 88d2a61c0b typo 2019-08-04 12:58:36 +02:00
iceman1001 a90e5e1858 chg: legic cmds uses return macros. 
chg: hf search started to use macros
 2019-08-03 23:36:55 +02:00
Philippe Teuwen 60bfc37f35 remove more dummy cmds 2019-08-03 22:52:32 +02:00
Philippe Teuwen 61538bd635 thinfilm simulation when on battery 2019-08-03 22:37:01 +02:00
Philippe Teuwen 25f358955b make hf search robust to various HF configurations 2019-08-03 22:14:12 +02:00
Philippe Teuwen 4a3fb3ccf1 split nfcbarcode from iso14443a 2019-08-03 22:14:12 +02:00
Iceman e4972e8810
Merge pull request #305 from ViRb3/better-warn 
Better warn user of hardcoded hitag info
 2019-08-03 20:01:18 +02:00
Philippe Teuwen 017b3357ed Comment Felica simulation in client, there is no corresponding code in ARM 2019-08-03 19:57:57 +02:00
Philippe Teuwen a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
Philippe Teuwen cbf5c717f7 Remove unused CMD_* 2019-08-03 19:48:02 +02:00
Victor a0193fa903 Better warn user of hardcoded hitag info 2019-08-03 18:29:02 +01:00
iceman1001 52065adcfa chg: 'hf topaz reader' - more verbose 2019-08-02 11:37:35 -04:00
iceman1001 0747cf9ec0 add more keys (@anon) 2019-08-02 09:48:42 -04:00
Philippe Teuwen ab74d2b798 Revert ARRAYLEN on whereami.c, bag of bones... 2019-08-02 08:06:30 +02:00
Philippe Teuwen 0eae1e2563 make style 2019-08-02 00:26:48 +02:00
Philippe Teuwen 865a7c3ad4 Add thinfilm simulation 2019-08-02 00:26:07 +02:00
Philippe Teuwen 824e0ae3e4 use thinfilm trace with hf thinfilm list 2019-08-01 20:15:46 +02:00
Philippe Teuwen 3bc5f7688d thinfilm trace 2019-08-01 20:06:07 +02:00
iceman1001 63a7f8a4c4 fix: 'hf topaz reader' - not crashing when trying to read a thinfilm 2019-08-01 12:36:50 -04:00
iceman1001 5a2d0c4cc1 chg: 'hf thinfilm info' - print text 2019-08-01 12:22:51 -04:00
iceman1001 2a054438ab chg: 'hf thinfilm info' - fixed manufacture lookup 2019-08-01 12:16:33 -04:00
Philippe Teuwen 7bdcf3cff5 thinfilm, show raw data if unknown encoding 2019-08-01 18:03:41 +02:00
Philippe Teuwen 85c0f3e9e3 thinfilm partial info when verbose 2019-08-01 17:49:35 +02:00
iceman1001 10c949a47e chg: 'hf thinfilm info' - versbose mode and sanity checks 2019-08-01 11:33:00 -04:00
iceman1001 2400418067 style 2019-08-01 11:15:39 -04:00
iceman1001 faf68081b0 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-01 11:11:07 -04:00
iceman1001 a331090c6a Chg : 'hf thinfilm info' - added crc check 2019-08-01 11:09:51 -04:00
Philippe Teuwen 8f6c048481 thinfilm: fix urls with 0xFE terminator 2019-08-01 17:07:07 +02:00
Philippe Teuwen 3fb442798d thinfilm usage typo 2019-08-01 15:49:58 +02:00
iceman1001 fbff51c88d Add: hf thinfilm info - support to read and decode Kovio Thinfilm NCT tags 2019-08-01 09:39:33 -04:00
Philippe Teuwen 733a7d836d more ARRAYLEN 2019-08-01 00:14:09 +02:00
Philippe Teuwen f276dca3f1 less hardcoded sizes and more ARRAYLEN 2019-07-31 23:45:17 +02:00
iceman1001 74288ad128 chg: hf topaz - got some love 2019-07-31 15:43:00 -04:00
Philippe Teuwen 98624037ad hf mfu: please no extended ascii char 2019-07-31 12:43:15 +02:00
Philippe Teuwen f0c939b1bc hf mfu: avoid hardcoded array size 2019-07-31 12:14:44 +02:00
Philippe Teuwen 5edd342d4c Add NTAG_I2C_1K support to hf mfu, thanks JP Szikora 2019-07-31 12:04:32 +02:00
iceman1001 4c9b95c216 chg: flash messge 2019-07-30 14:31:10 -04:00
iceman1001 6d1c996251 chg: flashing - test messages 2019-07-30 19:22:24 +02:00
netvader 8abbbe4d5e
Update default_keys.dic 
add hotel key from alltours
 2019-07-29 11:03:20 +02:00
Philippe Teuwen c6b8e199fd fix usart cmd descriptions 2019-07-28 21:08:50 +02:00
Philippe Teuwen c83ff9da0f make style 2019-07-28 19:24:00 +02:00
Philippe Teuwen 5854ab19dd client tells when over TCP 2019-07-28 19:23:37 +02:00
iceman1001 a25814bda4 ADD: 'trace list' - annotate nano signature 2019-07-28 14:23:30 +02:00
iceman1001 00350db238 Chg: hf tune - increase timeout vaules. fix #265 2019-07-28 03:29:31 -04:00
iceman1001 c5b8df449d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-07-28 09:22:30 +02:00
iceman1001 ca53711b8d chg: lf t55xx - helptext 2019-07-28 09:21:02 +02:00
iceman1001 9f4620c92c make style 2019-07-27 17:48:52 -04:00
iceman1001 f433e26e3b Add: 'hf mfu info' - now does orinality check against ECC. (@pwpivi) 
Adapted to prefered codestyle and added references.
 2019-07-27 23:44:23 +02:00
iceman1001 283060f962 chg: renaming a struct 2019-07-27 21:15:43 +02:00
iceman1001 e99910694b chg: some more key, thanks @Ollibolli 2019-07-27 15:06:58 +02:00
iceman1001 d7c967b65d chg: 'codestyle' 2019-07-27 10:25:03 +02:00
iceman1001 e9b493ead6 style 2019-07-27 02:39:30 -04:00
Iceman b7ba46d38e
Merge pull request #292 from netvader/patch-1 
Update default_keys.dic
 2019-07-26 23:53:15 +02:00
netvader 54a18ebf2b
Update default_keys.dic 
added some keys from clever fit gym, hotel room turkey, and simonsvoss key card
 2019-07-26 22:45:16 +02:00
3ldidi94 ee152657c6
Add one more key 
Found a new key that is not in this dic file, so I add it.
 2019-07-26 11:43:21 +02:00
mwalker33 9085465c38 Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-07-25 21:00:41 +10:00
mwalker33 3211f35062 Added set default timings 2019-07-25 21:00:30 +10:00
mwalker33 b222161941
Merge branch 'master' into master 2019-07-25 20:12:00 +10:00
mwalker33 77d96ff3b7 Bug Fix Timing order 
Timing for backward compatibility
 2019-07-25 20:01:03 +10:00
Philippe Teuwen c0eb19acb1 remove tabs 2019-07-24 00:52:24 +02:00
mwalker33 b16f2fdaba Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-07-24 08:15:38 +10:00
mwalker33 cdc3787008 clean 2019-07-24 08:12:25 +10:00
Philippe Teuwen ab043a68b8 remove space in filename 2019-07-23 23:44:41 +02:00
Philippe Teuwen ac233a346a make style 2019-07-23 23:43:30 +02:00
Philippe Teuwen ac18114909 Remove long unsigned int warning 2019-07-23 22:46:58 +02:00
Philippe Teuwen 11e5131604
Merge pull request #284 from mwalker33/master 
T55x7 Downlink mode support added
 2019-07-23 22:42:47 +02:00
Philippe Teuwen 7e84a546c5 GetFromDevice leftovers 2019-07-23 21:45:06 +02:00
Philippe Teuwen 544fb30ce6 typos 2019-07-23 21:40:01 +02:00
Philippe Teuwen 9beabaabf5 make style 2019-07-23 21:33:52 +02:00
mwalker33 5de04f84e9 Restored * 8 
Revert back to store and use the full value (*8) for the timing.
 2019-07-23 20:12:05 +10:00
cjbrigato 70cd0d844b FIX : Tereifying typo 2019-07-23 07:39:34 +02:00
mwalker33 4e0e69ed63 Added T55 downlink mode support 2019-07-23 09:50:28 +10:00
cjbrigato 5c3676ad81 ADD: Early SPIFFS implementation see #257, UPDATE HF_COLIN accordingly 2019-07-22 22:56:06 +02:00
Philippe Teuwen daae890667 Bootrom & flasher changes: 
* use macros for versions
* activate UNDERSTANDS_VERSION in bootrom
* fix missing break; bug in bootrom
* force flash_load to reject images > 256k if bootloader not up to date
* move logic from flasher to flash
 2019-07-20 10:48:40 +02:00
slurdge 68aa9d631d Flasher support for versionning 
Only bootrom with version > 1.0.0 will allow 512K writes
 2019-07-20 10:47:24 +02:00
Philippe Teuwen 8e6258936c make style 2019-07-19 13:18:35 +02:00
Philippe Teuwen 33f2cb0981 Rework flasher exit on error 2019-07-19 13:15:32 +02:00
Philippe Teuwen f6f14f82d4 Add option -i to flasher to query Pm3 for its memory size, and some doc tuning 2019-07-19 13:02:12 +02:00
Philippe Teuwen 44278272a4 typo 2019-07-19 12:39:23 +02:00
slurdge 7bf3255a6c Flasher support for 512K flash 
A better way would be to cut the connecting function and flashing function and to move the whole mem computation to flash.c
Working flasher
 2019-07-19 12:35:04 +02:00
Philippe Teuwen 4e9e7d6da0 temporary fix to get Appveyor happy. Will need more tuning later. 2019-07-18 23:50:45 +02:00
Julien Piat 29f8bfb80c Update default_keys.dic with new keys from Scan Badge APK 2019-07-18 15:54:21 +02:00
Philippe Teuwen 259c730bb0 exit(EXIT_FAILURE) if a port was specified to the client and no pm3 is usable 2019-07-17 20:15:47 +02:00
merlokk 84022807a8 fix rare emv search behavior 2019-07-17 12:20:04 +03:00
merlokk a6977860db fix emv search keep field bug 2019-07-17 11:27:05 +03:00
Oleg Moiseenko d3b6a8e193
Merge pull request #253 from merlokk/emv_apdu 
Emv apdu
 2019-07-16 18:08:39 +03:00
merlokk 638d698445 make style 2019-07-16 18:05:36 +03:00
merlokk 5fd2a7613f add check 2019-07-16 18:05:23 +03:00
merlokk e61a65fbe8 check PPSE instead of PSE and vice versa. I have one card with this strange behavior... 2019-07-16 17:15:32 +03:00
merlokk a30c62137b use apduencode for emv commands 2019-07-16 17:04:54 +03:00
merlokk bd8824a2f3 make style 2019-07-16 16:10:11 +03:00
merlokk 7726ec6000 move sAPDU 2019-07-16 16:05:47 +03:00
Philippe Teuwen ed4289d462
Merge pull request #251 from merlokk/reorg_includes 
added PACKED attribute for structures and reorganize include folder
 2019-07-16 14:52:14 +02:00
merlokk 12c6b5cb20 add the definition of PACKED in its client/deprecated-hid-flasher/flasher/proxmark3.h 2019-07-16 15:25:48 +03:00
merlokk 20d13d5509 added PACKED attribute for structures and reorganize include folder 2019-07-16 14:50:38 +03:00
Philippe Teuwen d8763509de Add 'hw standalone' to jump to standalone mode from command line or script 2019-07-15 22:31:19 +02:00
Oleg Moiseenko ddd4601c1e
Merge branch 'master' into ext_apdu 2019-07-15 19:25:48 +03:00
merlokk 84c09ce881 added define PACKED 2019-07-15 19:21:19 +03:00
merlokk d2a2acf69c make style 2019-07-15 19:12:01 +03:00
merlokk df1dd71d14 apdu format and print works 2019-07-15 17:26:42 +03:00
Iceman caceea24a4
Update default_keys.dic 2019-07-15 15:36:12 +02:00
Philippe Teuwen 0ea7fa7784 buggy 'mem read' removed, 'mem save' renamed 'mem dump', can now display too 2019-07-15 12:57:20 +02:00
Philippe Teuwen 31c3a15cd4 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  textual
  Changelog for PR #245, #246
  chg: 'script run read_pwd_mem' - now can correctly deal with more than 4096 bytes when printing mifare classic keys
  Fix. More flexible anti-collision frame check
  hf_mf_sim. Really tags not respond NACK on invalid authentication
 2019-07-15 00:31:46 +02:00
Philippe Teuwen cad1d500ca add msleep command 2019-07-15 00:31:38 +02:00
Chris 859a5e80ce Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-07-14 22:52:50 +02:00
Chris 0a845df8c3 chg: 'script run read_pwd_mem' - now can correctly deal with more than 4096 bytes when printing mifare classic keys 2019-07-14 22:52:34 +02:00
Philippe Teuwen 383d3327be remove spurious changes in make style 2019-07-14 18:42:11 +02:00
merlokk a9d15d85e6 sketch2 2019-07-14 15:14:54 +03:00
merlokk 51bcc80a2b small fix 2019-07-14 15:00:40 +03:00
merlokk 68bfbde185 CmdHF14AAPDU sketch 2019-07-14 14:59:59 +03:00
Philippe Teuwen 55602bf833 Fix few zelaous WARNING->ERR 2019-07-14 12:17:34 +02:00
Philippe Teuwen 8bf4b4ad97 Promote WARNING to ERR on some error msgs 2019-07-14 00:35:18 +02:00
Philippe Teuwen bb3c5e364e remove perror 2019-07-14 00:30:57 +02:00
Eloff 735077f358 Does clear trace log only at first call 'hf mf chk', to save whole process history 2019-07-13 18:26:52 +03:00
Philippe Teuwen b0dbbd3683 make style 2019-07-13 00:38:30 +02:00
merlokk d94c74b24b make style 2019-07-12 13:58:38 +03:00
Philippe Teuwen fec7d802b9 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  Update default_keys.dic with keys from an APK
 2019-07-11 13:54:48 +02:00
Philippe Teuwen 844d732297 Replace ukbhit by kbd_enter_pressed, not requiring tcgetattr: 
Note that it behaves differently now
* it looks for Enter key only, not any key
* it "eats" the input, no need for (void)getchar() after it
* it works the same no matter the value of ICANON
* the mingw version has been adapted to act the similarly

This should fix its usage on Android where tcgetattr always returns -1
 2019-07-11 13:01:34 +02:00
merlokk 4d8a411413 APDUEncode 2019-07-11 13:08:43 +03:00
3ldidi94 6f457873cc
Update default_keys.dic with keys from an APK 
Update the dic with keys from Android application "Scan Badge".
I did the diff between keys already present and keys from the application.
 2019-07-11 10:37:00 +02:00
Philippe Teuwen 73bbb2e9e8 Silent properly GCC format-truncation warnings in jansson 2019-07-10 22:32:55 +02:00
Philippe Teuwen e53ac8b715 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  Fix compilation under MacOSX
 2019-07-10 21:49:54 +02:00
Philippe Teuwen 99d2ed224a Minor changes on bootloader chip info 2019-07-10 21:49:14 +02:00
slurdge 4727ab96d7 Dynamic report of the chipID for flashing purposes 2019-07-10 21:11:20 +02:00
Philippe Teuwen 5924847e0c
Merge pull request #234 from matrix/osx_makefiles 
Fix compilation under MacOSX
 2019-07-10 20:58:32 +02:00
Philippe Teuwen fce082db56
Merge pull request #235 from matrix/osx_warnings 
Fix Clang warnings
 2019-07-10 20:50:29 +02:00
Philippe Teuwen f466cbc8e1
Merge pull request #236 from matrix/emv_bug 
Fix EMV bug
 2019-07-10 20:40:09 +02:00
Gabriele Gristina 1740d43655 Fix EMV bug 2019-07-10 18:48:15 +02:00
Gabriele Gristina fa2595a619 Fix Clang warnings 2019-07-10 18:46:30 +02:00
Gabriele Gristina 563050c8ba Fix compilation under MacOSX 2019-07-10 18:43:19 +02:00
merlokk 1169a6cf1b apdu rename and print 2019-07-10 19:21:54 +03:00
merlokk 16b6d7e529 apdu universal parser 2019-07-10 19:11:56 +03:00
Victor cb45313981 Add hitag2 write password auth 2019-07-09 23:00:57 +01:00
slurdge 248b109c9a Check if bootloader segment is within bounds 2019-07-09 22:12:39 +02:00
t0m4 0a1b2698c9 Code review 2019-07-07 14:00:13 +02:00
t0m4 88df59722e Code cleaning 2019-07-07 12:10:51 +02:00
t0m4 95fd247e10 Add 'hf 15 csetuid' command to set UID on ISO15693 Magic tags 2019-07-07 10:52:00 +02:00
iceman1001 959a2a9c87 mysterious keys #issue 839 offical repo 2019-07-06 11:16:39 -04:00
Philippe Teuwen e047d223e4 Fix #216: skip --as-needed linker options under MacOSX 2019-07-06 10:06:04 +02:00
Victor 773845f411 Print help if unknown arg for hitag reader/writer 2019-07-04 22:12:48 +01:00
Iceman ae4c3374cb
Update default_keys.dic 
More keys from 6b6bafed54
 2019-07-04 12:33:01 +02:00
Slurdge 7205a910c5 Add compiler name in [CLIENT] section 2019-07-03 16:08:09 +02:00
Iceman 3938933c63
Update default_keys.dic 
from mct app pr.
 2019-06-28 15:50:19 +02:00
Philippe Teuwen 0eea50f5a0 Add support for compilation on RaspberryPiZero (armv6) 
More generally, add support for platforms with atomics, which not really linked to
architecture but compiler features. This may also help on some mips for example.
 2019-06-26 00:12:32 +02:00
iceman1001 c6d245b843 fix: syntax erros in luascripts 2019-06-23 08:13:17 -04:00
Jacopo Jannone 7e1d4a54ad Fix syntax errors with Calypso & 14443b Lua 2019-06-23 11:53:48 +02:00
iceman1001 7961ff982d unique and added some more keys from @korsehindi 2019-06-15 12:05:40 -04:00
iceman1001 f11500f60f revert and double check empty buffers 2019-06-13 15:13:41 -04:00
Philippe Teuwen 2382ad551b update msleep in deprecated-hid-flasher 2019-06-12 13:57:02 -07:00
Philippe Teuwen 1ebfa897c8 remove some cppcheck warnings 2019-06-12 06:41:23 -07:00
Iceman cb07f2f807
Merge pull request #210 from javastraat/master 
<added keys for Transportes Insular La Palma (Public Transport)>
 2019-06-09 11:23:28 +02:00
iceman1001 db578e9f5f fix: read14a.lua - wrong call 2019-06-09 04:59:16 -04:00
Albert Einstein b344e7c133 <added keys for Transportes Insular La Palma (Public Transport)> 2019-06-09 10:27:20 +02:00
iceman1001 e7d00dce83 chg: upgrade always possible 2019-06-08 15:26:05 -04:00
iceman1001 fd2ac38ac3 chg: lf em 4x05_info 2019-06-08 15:24:12 -04:00
iceman1001 a6fc729f22 style 2019-06-08 10:11:18 -04:00
iceman1001 7fd7b539be textual 2019-06-08 10:10:04 -04:00
iceman1001 d3f26fe7b7 style 2019-06-08 10:09:13 -04:00
Philippe Teuwen a55e597e36 make style 2019-06-07 21:40:33 +02:00
Philippe Teuwen f7dfd2a1f2 Fix arg names mismatches between decl & def 2019-06-07 21:26:03 +02:00
Philippe Teuwen 732bc766f9 Reduce some var scopes 2019-06-07 18:41:39 +02:00
Philippe Teuwen 7a06a77283 text of data setdebugmode 2019-06-06 11:34:33 +02:00
Philippe Teuwen 1a39ec3026 hf mf/mfu dbg => hw dbg 2019-06-06 11:31:47 +02:00
Philippe Teuwen d7614684f8 Make sure standalone modes can be launched when connected on USB without client 2019-06-02 23:20:02 +02:00
Philippe Teuwen 742fe16830 Makefile verbose mode: make V=1 as for CMake 2019-06-02 16:04:35 +02:00
Philippe Teuwen 8c0cd4cfa2 Cleaner makefile execution, use 'make Q=' if you want to see full lines 2019-06-02 00:25:25 +02:00
Philippe Teuwen 9b668e3827 client Makefile doesn't depend on platform specs anymore 2019-06-01 01:03:34 +02:00
Philippe Teuwen 5e83fcbd58 client Makefile doesn't use PLATFORM_DEFS anymore 2019-06-01 00:59:11 +02:00
Philippe Teuwen e98c4e246d rework standalone makefile 2019-06-01 00:23:38 +02:00
Philippe Teuwen 501919a34a flashmem: text 2019-05-31 23:08:27 +02:00
iceman1001 ecc62add26 fix return check 2019-05-31 14:07:07 -04:00
iceman1001 0a3791ea3a chg: 'lualibs - 14a minor adaptation 2019-05-31 19:10:01 +02:00
iceman1001 a8b09eba31 chg: 'hf mfu info' - typo 2019-05-31 19:06:22 +02:00
iceman1001 430742a3b6 chg: 'mem info - public key' 2019-05-31 11:25:49 +02:00
iceman1001 b378d373ad chg: USB doesnt need extra delay 2019-05-29 04:00:02 -04:00
iceman1001 d2fb18f648 chg: 'hf mf dump' - remove debug statements 2019-05-29 08:55:12 +02:00
iceman1001 cee2fc7a34 hf mf rdbl - uses NG 2019-05-28 13:20:56 -04:00
iceman1001 ffc24d672b keys 2019-05-28 13:18:33 -04:00
iceman1001 caee0a1f6a key 2019-05-28 08:00:33 -04:00
iceman1001 0004b1075e chg: lf cotag demod - adjusted error trigger 2019-05-28 05:23:48 -04:00
iceman1001 8ed6c18497 style 2019-05-28 05:22:38 -04:00
iceman1001 74fb740c21 fix: lf em 4x05 - use correct paritytest (@marshmellow)\nchg: lf em 4x05_read\n chg: lf em 4x05_write - uses NG 2019-05-28 05:15:12 -04:00
iceman1001 548d6429ed return codes 2019-05-27 09:15:53 -04:00
iceman1001 53f2058c7a chf: hf mf eget\nhf mf eset\nhf mf eclr - uses NG 2019-05-27 07:46:27 -04:00
iceman1001 58bed70ad0 chg: hf 14a sim - uses NG 2019-05-26 15:00:49 -04:00
iceman1001 b05796c7c4 chg: hf mf dbg\nchg: hf mf sim\nchg: hf 14a sim - uses NG 2019-05-26 13:42:27 -04:00
iceman1001 ade858b4f5 fix: script run read_pwd_mem - wrong offsets for -i/-t/-m 2019-05-25 15:56:56 -04:00
iceman1001 6df94abf71 textual 2019-05-25 13:32:54 -04:00
iceman1001 37c30c0395 fix: askdemod - enhances which solves some viking demod errors 2019-05-25 13:27:43 -04:00
iceman1001 abc66484e5 fix: 14a raw commands - running lua scripts works again for MIX/NG frames 2019-05-25 09:06:44 -04:00
iceman1001 2d972f8cb9 style 2019-05-24 10:31:31 -04:00
iceman1001 20b39d55f2 fix: lf presco - show helptexts again 2019-05-24 10:27:21 -04:00
iceman1001 10fc50aff8 fix: lf viking demod - works :) 2019-05-24 09:48:31 -04:00
iceman1001 0d1438d156 chg: lf psksim - uses NG 2019-05-24 09:11:30 -04:00
iceman1001 80a91eba11 chg: need to free some 2019-05-24 07:22:50 -04:00
iceman1001 e727fe5818 chf: lf asksim - uses NG 2019-05-24 07:06:08 -04:00
iceman1001 98b75e43a5 fix: lf t55xx wipe 2019-05-24 06:22:43 -04:00
iceman1001 d32c4d5267 chg: resized flashmem offset for dictionaries to fit 2019-05-23 18:50:24 -04:00
iceman1001 594398ef73 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-23 18:32:21 -04:00
iceman1001 9426f61922 chg: lf sim - free mem? 2019-05-23 18:32:17 -04:00
iceman1001 ed9a5e6d6f chg: textual 2019-05-23 18:31:56 -04:00
Iceman 16c99b9fac
Merge pull request #202 from javastraat/master 
modified help in hf mf fchk and chk & some extra keys
 2019-05-23 23:10:12 +02:00
iceman1001 1ca50fd3b2 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-23 17:07:18 -04:00
iceman1001 c13e2f09a1 chg: lf simfsk\nlf paradox sim\nlf awid sim\n\lf ioprox sim\nlf pyramid sim - NG 2019-05-23 17:07:12 -04:00
Albert Einstein 38d0b37e1e added keys 2019-05-23 21:08:52 +02:00
Albert Einstein 684e93d61a added keys 2019-05-23 21:06:15 +02:00
Albert Einstein de694d7cca modified help in fchk and chk 2019-05-23 21:04:48 +02:00
Philippe Teuwen fda181890c nested structs on the sender, for more lean packet size computation 2019-05-23 20:54:21 +02:00
iceman1001 263d662783 chg: lf fsksim - uses NG 2019-05-23 13:16:06 -04:00
iceman1001 0564931450 fix: lf sim - if called with empty graphbuffer all strange things happend, like turning on HF field 2019-05-23 10:51:19 -04:00
iceman1001 f8dbf6138a fix: lf sim - dont forget to PACK your structs on both sides\n chg: data convertbitstream - converts bit to max/min in order to facilitate demodulation of simulation data 2019-05-23 06:12:20 -04:00
iceman1001 78d7077f01 chg: more keys 2019-05-23 05:02:28 -04:00
Philippe Teuwen e0c9e2b0d1 rework usart RX timings 2019-05-22 23:30:52 +02:00
iceman1001 794d109f30 chg: lf t55 - fixes / read block uses NG 2019-05-22 11:59:39 -04:00
iceman1001 150fc205b2 chg - returns 2019-05-22 10:10:48 -04:00
iceman1001 1e4f7b7f68 chg - returns 2019-05-22 10:07:27 -04:00
iceman1001 160110f56d chg - returns 2019-05-22 09:57:29 -04:00
iceman1001 8266514ef0 chg - returns 2019-05-22 09:53:10 -04:00
iceman1001 da2c8d0292 chg - returns 2019-05-22 09:48:57 -04:00
iceman1001 f8749c9ee9 chg - returns 2019-05-22 09:47:03 -04:00
iceman1001 09b66e500d chg - returns 2019-05-22 09:46:40 -04:00
iceman1001 66361ec6a3 chg - returns 2019-05-22 09:44:55 -04:00
iceman1001 e191dc777d chg - returns 2019-05-22 09:43:39 -04:00
iceman1001 24458e1392 chg: lf search - works again 2019-05-22 09:40:58 -04:00
iceman1001 461a90eeaf chg: lf em - and even more return codes 2019-05-22 09:28:12 -04:00
iceman1001 420ca1b235 more returns 2019-05-22 09:04:38 -04:00
iceman1001 486211599d chg: return codes 2019-05-22 08:57:08 -04:00
iceman1001 d546f39534 chg: cmdlft55xx return codes 2019-05-22 08:48:23 -04:00
iceman1001 9925159bcd chg: return codes 2019-05-22 08:33:33 -04:00
iceman1001 ad394a2d6b chg: lf em 410x_sim - reworked to NG\n chg: lf em 410x_demod - now can demod the simulation data. 2019-05-22 08:32:30 -04:00
iceman1001 750739efe4 chg: not fatal 2019-05-22 05:59:43 -04:00
iceman1001 69bab29834 chg: params 2019-05-22 05:58:16 -04:00
Philippe Teuwen 13b461cab2 usart txrx: wait reply depends on rx waittime 2019-05-22 00:06:51 +02:00
Philippe Teuwen fe6cbfc8fd baudrates & btfactory 2019-05-20 21:37:50 +02:00
iceman1001 cbc42336d6 fix: lf nedap sim - error when adding parity 2019-05-20 15:24:47 -04:00
iceman1001 f0c173ccba style 2019-05-20 10:50:23 -04:00
iceman1001 178c922218 chg: lf read - now uses NG 2019-05-20 10:48:51 -04:00
iceman1001 ab8826fed8 chg: lf config - uses NG 2019-05-20 09:50:04 -04:00
iceman1001 d7f1ab2175 chg: lf cmdread - now uses NG 2019-05-20 09:15:45 -04:00
iceman1001 ce4198f5f2 new pwds - white cloner (mwalker) 2019-05-20 07:11:16 -04:00
iceman1001 983e63d82f hw commands - uses NG 2019-05-20 04:28:34 -04:00
Philippe Teuwen f0ec37b742 fix hw connect parsing 2019-05-18 21:35:50 +02:00
iceman1001 d4ad0da335 textual, 2019-05-18 18:51:05 +02:00
Philippe Teuwen 413440fdab hw connect: detect invalid usages 2019-05-18 18:45:15 +02:00
Philippe Teuwen e6d64df6d0 Fixing segfault 2019-05-18 18:41:24 +02:00
iceman1001 faf3a95a45 chg: 'hw connect' - new params. p <port> b <baudrate> 
a correct call is now

hw connect p com6 b 115200

This will set baudrate between Client and BT White Dongle.
 2019-05-18 18:06:14 +02:00
iceman1001 24a4d053b3 chg: prompt now shows which channel is used. 2019-05-18 18:02:30 +02:00
iceman1001 d5802ff766 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-18 17:59:48 +02:00
iceman1001 687f7f3697 consistent output 2019-05-18 17:56:03 +02:00
iceman1001 cba5d18124 use MIX 2019-05-18 17:55:11 +02:00
iceman1001 a4f4104075 textual 2019-05-18 17:53:08 +02:00
Philippe Teuwen 10dc959f34 btfactory: reset role as well 2019-05-18 17:47:29 +02:00
Philippe Teuwen e9eb764358 Fix MCK in usart, our MCK is 16*12/2/2 2019-05-16 20:12:00 +02:00
Philippe Teuwen b5e4a60a15 timeout reconfiguration: flag was never cleared and some more changes: 
* clear newtimeout_pending flag
* fix initial newtimeout_pending flag value on win32
* remove all _atomic as anyway a load+clear wouldn't be atomic and we're not in a critical situation: just one writer seldomly called on reconnect
* move new timeout poll to uart_recv for faster deployment
* remove redundant uart_reconfigure_timeouts(UART_FPC_CLIENT_RX_TIMEOUT_MS);
 2019-05-16 12:35:40 +02:00
iceman1001 9b85f80321 chg: the reconnect now works good on ubuntu and mingw (for me :)) 
chg: increased timeout for FPC from 170 -> 200.  Mingw seems slower.
 2019-05-16 08:02:56 +02:00
iceman1001 c125b3e9fe chg: less nesting 2019-05-16 07:33:02 +02:00
Philippe Teuwen b4e8be82f4 remove spMutex, use atomic test&set instead 2019-05-16 00:29:30 +02:00
iceman1001 bfe2cff383 chg: hf mf nack - now uses NG 2019-05-15 07:47:46 -04:00
iceman1001 50c59fb6b2 chg: cident - uses NG 2019-05-15 07:03:19 -04:00
iceman1001 65ff4f0e92 chg: hf mf setmod - uses NG 2019-05-15 06:52:22 -04:00
iceman1001 0edf5500fe mix 2019-05-15 12:02:22 +02:00
iceman1001 0740d14faa chg: some unifiying return values 2019-05-15 10:24:06 +02:00
Philippe Teuwen bc090857b8 text 2019-05-15 08:57:15 +02:00
iceman1001 1e31455474 textual 2019-05-15 02:18:23 -04:00
Philippe Teuwen 8401eb4e14 Add usart btfactory 2019-05-15 02:15:19 +02:00
iceman1001 586e2ebabd textual 2019-05-14 11:42:58 -04:00
iceman1001 36ecc4be97 style 2019-05-14 11:42:17 -04:00
Iceman eef53a853a
Merge pull request #196 from mcd1992/guikeys 
Add clamp to PageDown case in plot GUI and updated changelog as requested in #195
 2019-05-14 17:38:35 +02:00
iceman1001 ace4798c4d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-14 17:13:54 +02:00
iceman1001 8bfe669430 fix: 'script run legic' - at last, it now saves in EML and BIN format. 2019-05-14 17:13:29 +02:00
Aaron McDaniel 1186753bf6 Added clamp to PageDown case in plot GUI and updated changelog 2019-05-14 10:12:46 -05:00
Philippe Teuwen 1147c9faf8 Use ARRAYLEN 2019-05-14 12:51:45 +02:00
iceman1001 da09131aa3 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-14 12:37:02 +02:00
iceman1001 d792f015a2 fix: 'script run legic' - bytes was in string format, 2019-05-14 12:36:37 +02:00
Philippe Teuwen 62cf4ad8a7 fancy INPLACE 2019-05-14 12:35:25 +02:00
iceman1001 48c71aeef6 fix: 'script run legic' - also save as binary. https://github.com/RfidResearchGroup/proxmark3/issues/193 
if binary file exists,  it will try to increase filename counter to find a non-existing name.
 2019-05-14 11:54:25 +02:00
iceman1001 28398222e6 chg: 'hf tune' - now with prefix :) 2019-05-14 11:18:33 +02:00
Iceman d4eb91fa43
Merge pull request #195 from mcd1992/guikeys 
Added paged moving to the plot GUI
 2019-05-14 11:18:00 +02:00
Philippe Teuwen d535d5a378 hf tune: can be interrupted by keyboard 2019-05-14 08:40:22 +02:00
Philippe Teuwen 42d025d01a Slight rework of hw tune 2019-05-14 08:29:24 +02:00
Philippe Teuwen c281f71f59 hf tune: group commands 2019-05-14 08:25:26 +02:00
mcd1992 528da6ec32 Added paged moving to the plot GUI 2019-05-13 19:39:27 -05:00
Philippe Teuwen 7ed7a9de40 Rework hf tune to make it synchronous (needed for rdv4) 2019-05-14 00:37:03 +02:00
Philippe Teuwen 995d782bb0 CMD_READER_HITAG requires always a hitag_data struct 
used as SendCommandMIX(CMD_READER_HITAG, RHT2F_UID_ONLY, 0, 0, NULL, 0);
sent to ReaderHitag((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes);
void ReaderHitag(hitag_function htf, hitag_data *htd)
=> we should always send a hitag_data struct
 2019-05-13 23:15:07 +02:00
Philippe Teuwen ff7cd9d84d CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES needs 6 bytes of data. 
used as SendCommandMIX(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
sent to MifareAcquireEncryptedNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
  [...]
  uint64_t ui64Key = bytes_to_num(datain, 6);

=> we should always send 6 bytes for "bytes_to_num"
 2019-05-13 23:11:05 +02:00
Philippe Teuwen e4f00c52da Fix #194 Graph window loops to end if you scroll left past 0 2019-05-13 20:34:02 +02:00
iceman1001 6a6902e57d chg: luascripts now uses t55xx write NG frame format 2019-05-13 16:51:26 +02:00
iceman1001 801cb95967 fix: 'lf t55xx write' - wrong bitshift 2019-05-13 13:36:54 +02:00
iceman1001 d2a4ade2af chg: lf t55xx write - now uses NG frames. 2019-05-13 13:23:53 +02:00
Philippe Teuwen 0e827b1083 Fix CMD_T55XX_WRITE_BLOCK expecting data and sending NULL 2019-05-13 12:21:09 +02:00
Philippe Teuwen 6caf571a44 NG->MIX for hitag cmds where the zeroes were actual args 2019-05-13 10:35:30 +02:00
Philippe Teuwen 4929b16bf9 style 2019-05-12 20:38:03 +02:00
Philippe Teuwen a2c70e5481 Add .dic to gitattributes for LF, remove existing CR 2019-05-12 20:37:51 +02:00
Chris 41db59f028 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-12 18:45:13 +02:00
Chris d44a5712a7 add: default key for library / parking 2019-05-12 18:43:20 +02:00
Philippe Teuwen 80a71c59d4
Merge pull request #186 from uhei/hexdump 
Cmdtrace: Show trace ouput in hexdump format
 2019-05-10 19:27:45 +02:00
Philippe Teuwen b6b20e246c
Merge pull request #187 from uhei/macos-readline 
client/Makefile: use brew libreadline on macOS
 2019-05-10 19:07:03 +02:00
Philippe Teuwen 3412e9d8c5 Capabilities versionning, would also detect platform struct pack issues 2019-05-10 19:00:18 +02:00
Philippe Teuwen 5aed3e04c9
Merge pull request #190 from uhei/memcpy-bo 
client/comms.c: fix buffer overflow
 2019-05-10 18:47:39 +02:00
Uli Heilmeier a1c24c6c7d Cmdtrace: Show trace ouput in hexdump format 
Adding option 'x' to show trace output for 14a in hexdump format.
This output can be imported into Wireshark using the 'Import from Hex Dump' option.
Encapsulation type should be set to 'ISO 14443' and Max Frame Length to 256.

Format defined at https://www.kaiser.cx/pcap-iso14443.html
 2019-05-10 16:03:39 +02:00
Uli Heilmeier 0119e13ff3 client/comms.c: fix buffer overflow 
Don't copy more bytes into pm3_capabilities as its size.

Fix: RfidResearchGroup/proxmark3#189
 2019-05-10 14:50:09 +02:00
Uli Heilmeier 94b782ee10 client/Makefile: use brew libreadline on macOS 
Make sure we use libreadline from brew and not the default macOS shipped one.
Otherwise compilation fails for undefined rl_event_hook
 2019-05-10 12:24:38 +02:00
Philippe Teuwen 39c7941930 style 2019-05-09 20:20:54 +02:00
Philippe Teuwen 2bee7e12f6 Fix hf mfu dump on ULC: UID in filename 2019-05-09 20:05:12 +02:00
Philippe Teuwen 7195ce9b27 remove iso15 getUID timeout msg 2019-05-09 13:25:14 +02:00
Philippe Teuwen 730927a81d NG->MIX for few cmds where the zeroes were actual args 
CMD_READER_ISO_14443a
CMD_EPA_PACE_REPLAY
CMD_TEST_HITAGS_TRACES
CMD_FELICA_COMMAND
 2019-05-09 12:33:17 +02:00
Philippe Teuwen 84f696451d units 2019-05-09 01:07:34 +02:00
Philippe Teuwen 2c10482279 all LF sim: client waits till button pressed 2019-05-09 00:08:59 +02:00
Philippe Teuwen ddd62e2848 text 2019-05-08 22:45:20 +02:00
Philippe Teuwen d088ed4232 fast mode on LF techs using t55xx write block 2019-05-08 22:43:35 +02:00
Philippe Teuwen 962f45e3e6 mf nested: remove compilation warning 2019-05-08 22:02:14 +02:00
Philippe Teuwen 77398550b0 fast mode on Mifare emulator upload 2019-05-08 21:54:15 +02:00
Philippe Teuwen c72e74275d fast mode on epa pace replay 2019-05-08 20:13:07 +02:00
Philippe Teuwen e7362d5e6a fast mode on legic cmds 2019-05-08 19:48:53 +02:00
Philippe Teuwen 93171e3d74 fast mode on sc upgrade, no much diff 2019-05-08 19:34:11 +02:00
Philippe Teuwen 2f71d951e1 iclass: avoid last ping in fast modes 2019-05-08 19:16:37 +02:00
Philippe Teuwen 2f2796be7e Fix deprecated-hid-flasher 2019-05-08 13:32:17 +02:00
Philippe Teuwen 4fd520c6d4 Introduce SendCommandBL 2019-05-08 13:31:58 +02:00
Philippe Teuwen e93b4e3c61 Remove usb_cmd refs 2019-05-08 11:17:14 +02:00
Philippe Teuwen c190ac0955 Hide conn error when hw reset, as suggested by @iceman 2019-05-08 11:14:29 +02:00
Philippe Teuwen 68e5b3c355 style 2019-05-08 01:35:51 +02:00
Philippe Teuwen f49d7e6d39 remove SendCommand 2019-05-08 01:32:32 +02:00
Philippe Teuwen c867b3bc9a Add cmd: usart btpin to change add-on BT PIN 2019-05-08 01:24:46 +02:00
Philippe Teuwen df2203d9c3 hw command text 2019-05-08 00:58:36 +02:00
iceman1001 964006fd21 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-08 00:17:52 +02:00
iceman1001 01efa71e27 use NG 2019-05-08 00:10:03 +02:00
iceman1001 8ebd5e0579 textual, fixes to legic commands used. Needs testing 2019-05-08 00:07:20 +02:00
Philippe Teuwen 02ea378e38 Wow, two improbable bugs were cancelling each other 2019-05-08 00:02:08 +02:00
iceman1001 5b087a053c fix: script run legic_buffer2card - correct params for write command 2019-05-07 23:53:06 +02:00
iceman1001 a5f19cde79 textual 2019-05-07 23:46:37 +02:00
iceman1001 81feb56003 text 2019-05-07 23:44:46 +02:00
iceman1001 8548eda9bd Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-07 23:41:56 +02:00
iceman1001 d313804e78 textual 2019-05-07 23:41:41 +02:00
Philippe Teuwen 920affeb44 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  textual
  textual
 2019-05-07 23:39:47 +02:00
Philippe Teuwen c505a59e3d Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  refactor NG
  refactor
  textual
  refactored NG
  textual
  refactoring NG
  refactoring
  15 - use NG and refactoring
  textual
  using MIX
  textual
  textual
  textual
  Update .gitignore
  chg: script run didump - helptexts
  fix:  rename to match the new file
  chg: script run didump - use MIX
  chg: hw ping - shouldnt be converted yet..
 2019-05-07 23:38:28 +02:00
iceman1001 9c95a2e8aa textual 2019-05-07 23:37:15 +02:00
Philippe Teuwen 2f1061f95b rework ping 2019-05-07 23:35:09 +02:00
iceman1001 89e25a4d1d textual 2019-05-07 23:34:05 +02:00
iceman1001 a59f2a1b60 refactor NG 2019-05-07 23:27:16 +02:00
iceman1001 e1bb05b35e refactor 2019-05-07 23:21:56 +02:00
iceman1001 7ccff2db4a textual 2019-05-07 23:19:22 +02:00
iceman1001 e799717880 refactored NG 2019-05-07 23:12:58 +02:00
iceman1001 6b472f6c56 textual 2019-05-07 23:04:29 +02:00
iceman1001 3c533db308 refactoring NG 2019-05-07 22:59:29 +02:00
iceman1001 9bf961cb8a refactoring 2019-05-07 22:48:18 +02:00
iceman1001 6fbd45aaed 15 - use NG and refactoring 2019-05-07 22:46:00 +02:00
iceman1001 b52a4a53b0 textual 2019-05-07 22:33:51 +02:00
iceman1001 b73146533a using MIX 2019-05-07 22:33:26 +02:00
iceman1001 c81bce6bf2 textual 2019-05-07 22:15:26 +02:00
iceman1001 2af7255f62 textual 2019-05-07 22:12:18 +02:00
iceman1001 75325aef86 textual 2019-05-07 22:08:46 +02:00
iceman1001 07b6535f7e chg: script run didump - helptexts 2019-05-07 22:03:11 +02:00
iceman1001 c99845b3d1 fix: rename to match the new file 2019-05-07 21:56:05 +02:00
iceman1001 df555be792 chg: script run didump - use MIX 2019-05-07 21:49:45 +02:00
iceman1001 c180c8df20 chg: hw ping - shouldnt be converted yet.. 2019-05-07 21:35:22 +02:00
Philippe Teuwen bf0ab55833 text 2019-05-07 20:47:05 +02:00
Philippe Teuwen 532dbf28a1 let OpenPm be responsible of setting session.pm3_present 2019-05-07 20:37:23 +02:00
Philippe Teuwen 061321c353 flash still need old cmds 2019-05-07 20:13:01 +02:00
Philippe Teuwen 290f2b625b Automated upgrades SendCommandOLD/MIX 0,0,0,NULL,0 -> NG and SendCommandOLD ....,NULL,0 -> MIX 2019-05-07 19:51:33 +02:00
iceman1001 39272ba1fb convert sendOLD -> MIX for simple cmds 2019-05-07 19:13:14 +02:00
iceman1001 0c20c1a9d1 convert to MIX for simple send commands. 2019-05-07 19:03:25 +02:00
iceman1001 119b1e7c81 chg: mem commands - sendMIX 2019-05-07 18:50:45 +02:00
iceman1001 cb991b4d2c make sure CloseProxmark sets pm3_present. 2019-05-07 17:31:07 +02:00
iceman1001 7eb7685559 cleaning up, simplify 2019-05-07 15:57:22 +02:00
iceman1001 f2a954b422 chg: save serial port name as copy. 2019-05-07 15:40:01 +02:00
iceman1001 43db2a50e2 cleaning 2019-05-07 14:48:53 +02:00
iceman1001 f60977695a cleaning up 2019-05-07 14:41:20 +02:00
iceman1001 b91e21edde better output from setting prompt, cursor is still inside ... 2019-05-07 12:29:26 +02:00
iceman1001 f85280ad41 fix: 'hw connect' - if pm3 client was in offline more to start with, check.. 2019-05-07 12:28:17 +02:00
Philippe Teuwen a20392edf3 change offline prompt asap 2019-05-07 12:18:51 +02:00
Philippe Teuwen de54d35d5f unplug detection 2019-05-07 12:11:36 +02:00
iceman1001 f68a398e42 rename 2019-05-07 11:46:12 +02:00
iceman1001 bb19e42bbd textual 2019-05-07 11:44:29 +02:00
iceman1001 fb7445a027 chg: 'hw connect' - make port optional. Reused previous serial port 2019-05-07 11:42:36 +02:00
iceman1001 61d250a7f8 add: 'hw connect' - lets you connect to a specified serial port. If already connected, it disconnects current port before. 2019-05-07 11:05:05 +02:00
Philippe Teuwen 1c70163605 reconnect fast 2019-05-07 01:06:01 +02:00
Philippe Teuwen ec5876ba35 Linux: Detect soon when pm3 is unplugged 2019-05-06 23:25:01 +02:00
iceman1001 fa8bd85016 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-06 22:42:01 +02:00
iceman1001 29a160c905 reconnect version2 yolo 2019-05-06 22:41:00 +02:00
iceman1001 52396e8b5a textual 2019-05-06 22:40:06 +02:00
Philippe Teuwen c6b8c0c472 manual Makefile style (as some tabs need to be preserved) 2019-05-06 20:45:59 +02:00
iceman1001 dd82c42588 fix #185 - Only -mno-ms-bitfields on MINGW (@doegox) 2019-05-06 15:37:40 +02:00
iceman1001 3a902a7a4c chg: add some helptexts 2019-05-06 14:38:56 +02:00
iceman1001 cffd14a96b chg: reconnect to a disconnected proxmark3 device without restarting the client. Old functionality restored :) 
chg: renamed thread
chg: easier if-statements for USART
 2019-05-06 14:11:23 +02:00
Philippe Teuwen eb7aa033ff Add fast mode support for RX NG frames 2019-05-05 22:34:22 +02:00
Philippe Teuwen 65bd945b54 style 2019-05-05 22:04:35 +02:00
iceman1001 71c37dcb04 alphabet order 2019-05-05 18:42:09 +02:00
Philippe Teuwen 6b5a0f8319 Rename and unguard CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K ans it's used more generally than LF 2019-05-04 23:56:59 +02:00
Philippe Teuwen ed1ff3db7e forgot 2 files in the merge :( my bad 2019-05-04 11:33:48 +02:00
Philippe Teuwen 1cff822f1e remove warning 2019-05-03 22:37:04 +02:00
Philippe Teuwen 3176684f4a Add usart dev cmds & dynamic flash support capability 2019-05-03 22:30:17 +02:00
iceman1001 8e2d5370f9 fix: seems the mutex messed up on ubuntu but there it works without. 2019-05-03 21:58:47 +02:00
iceman1001 a49ae2d0ce FIX: slow reconfigure on mingw of serial port 2019-05-03 21:33:00 +02:00
iceman1001 ed1950a0f5 fix: cross thread communictions of timeout variable 2019-05-03 17:53:32 +02:00
iceman1001 535559a140 textual 2019-05-03 11:25:55 +02:00
iceman1001 cb34e554fe chg: info log = yellow 2019-05-03 09:41:28 +02:00
Philippe Teuwen b723126deb Make smartcard support detection dynamic 2019-05-03 09:04:28 +02:00
Philippe Teuwen f33d0bf206 hw tune: block client till button pressed 2019-05-03 08:40:21 +02:00
Philippe Teuwen 2ec05efa3a remove outdated & unused loclass files 2019-05-02 12:24:00 +02:00
iceman1001 0cedfc7b2b chg: list should always be available, since we can now load / save trace files. 2019-05-02 10:42:02 +02:00
Philippe Teuwen 4e17b17343 remove snooper.c, outdated and we can do the same with pm3 client 2019-05-02 00:40:00 +02:00
Philippe Teuwen e286b3091d remove cli.c, outdated and we can do the same with pm3 client 2019-05-02 00:34:55 +02:00
Philippe Teuwen 59cc7b46d4 emv: dynamic detection in client 2019-05-02 00:23:58 +02:00
Philippe Teuwen f217b47cbd style 2019-05-02 00:18:20 +02:00
Philippe Teuwen 32bb9511ec Replace WITH_LF by dynamic detection in client 2019-05-02 00:02:38 +02:00
Philippe Teuwen e6135a8f78 Replace WITH_ISO14443a by dynamic detection in client 2019-05-01 23:38:57 +02:00
Philippe Teuwen d7b53aacee Replace WITH_HITAG by dynamic detection in client 2019-05-01 23:26:06 +02:00
Philippe Teuwen 78fdffddf7 Replace WITH_ICLASS by dynamic detection in client 2019-05-01 23:20:18 +02:00
Philippe Teuwen c640c63e51 Replace WITH_FELICA by dynamic detection in client 2019-05-01 23:18:21 +02:00
Philippe Teuwen 745bff4143 Replace WITH_ISO14443b by dynamic detection in client 2019-05-01 23:17:14 +02:00
Philippe Teuwen 858def687a Replace WITH_LEGIC by dynamic detection in client 2019-05-01 23:14:30 +02:00
Philippe Teuwen 582d948ac2 Replace WITH_ISO15693 by dynamic detection in client 2019-05-01 23:04:50 +02:00
Philippe Teuwen 2d99c6096b fix IfPm3Fpc call 2019-05-01 23:04:20 +02:00
Philippe Teuwen 30d29434d5 Replace WITH_FPC by dynamic detection in client 2019-05-01 22:56:10 +02:00
Philippe Teuwen bb966caab1 Replace WITH_LCD by dynamic detection in client 2019-05-01 22:47:21 +02:00
Philippe Teuwen a79c792d9f Fix smartcard commands visibility 2019-05-01 22:37:47 +02:00
Philippe Teuwen 6b2677c154 Replace WITH_SMARTCARD by dynamic detection in client 2019-05-01 22:33:27 +02:00
Philippe Teuwen cad676a23c Replace WITH_FLASH by dynamic detection in client 2019-05-01 21:46:29 +02:00
Uli Heilmeier 52179146b6 cmdparser: fix copy& paste typo 2019-05-01 21:31:34 +02:00
Philippe Teuwen 10489db97d capabilities: more IsAvailable helpers 2019-05-01 21:09:23 +02:00
Philippe Teuwen ca43afa19b begin of dynamic capabilities handling in client 2019-05-01 20:48:15 +02:00
iceman1001 5a6929c533 chg: lua lib 14a, added disconnect support 2019-05-01 18:26:12 +02:00
iceman1001 ec5f70caf2 easier to read 2019-05-01 15:15:48 +02:00
Philippe Teuwen 645a4e9d1d generalize KEYS_IN_BLOCK usage 2019-05-01 14:55:14 +02:00
iceman1001 b7e3806eff chg: 'hf mf chk' - let eload part benefit for fast push mode 
chg: 'script run mfkeys' -  corrected to use NG frames correct
 2019-05-01 13:15:51 +02:00
Philippe Teuwen 13b2e6eed7 Fix hf mf chk 2019-05-01 12:19:51 +02:00
iceman1001 5ab9716e77 textual 2019-05-01 06:04:33 +02:00
iceman1001 63d67e2b0f fix: setting pm3_present in flasher. 2019-05-01 05:48:20 +02:00
Philippe Teuwen 4f11ef048f style 2019-05-01 01:38:52 +02:00
Philippe Teuwen 820a6d99a9 better offline mode 2019-04-30 23:52:40 +02:00
iceman1001 f8f39d6196 fix: passing a struct. 2019-04-30 22:03:20 +02:00
iceman1001 e6315b88a1 missing 2019-04-30 21:55:43 +02:00
Philippe Teuwen 63cd4a9fbb Merge branch 'better_color_handling' 
* better_color_handling:
  Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed
  Use PrintAndLogEx in flasher
  Simplify color & banner logic
  Smart color handling:
 2019-04-30 21:37:19 +02:00
Philippe Teuwen 27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
Philippe Teuwen a5d05e8d42 Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed 2019-04-30 20:23:22 +02:00
Philippe Teuwen 5c9c38ff71 Use PrintAndLogEx in flasher 2019-04-30 20:19:29 +02:00
iceman1001 cddc25994c fix: by reference 2019-04-30 16:16:17 +02:00
iceman1001 6cddaa0a08 fix: 'hf mf keybrute' - adapt to NG for checkkeys. Kind of out-of-datem, since hardnested solves this better. 2019-04-30 14:29:52 +02:00
iceman1001 2dea3684ae fix: 'hf iclass eload' - enable NG (Thanks @doegox) 
chg: 'hf iclass chk' - now uses fast push mode
 2019-04-30 14:19:26 +02:00
iceman1001 c1445d2a31 CHG: 'hf mf chk' - uses NG 2019-04-30 14:01:23 +02:00
iceman1001 937d839c6a chg: 'script run mfkeys' - use fast push mode. 2019-04-30 13:27:19 +02:00
Philippe Teuwen 0a4b90ac20 Simplify color & banner logic 2019-04-30 13:02:27 +02:00
iceman1001 e1063e2836 chg: reconfigure uart timeouts when compiled for FPC and connecting over USB. 2019-04-30 12:57:44 +02:00
iceman1001 481d70b0da chg: 'hf iclass eload' - use fast push mode. 2019-04-30 12:14:46 +02:00
iceman1001 918a46a984 uninit. 2019-04-30 12:12:55 +02:00
iceman1001 10ac5fd256 chg: 'lf sim' - now uses fast push mode 2019-04-30 10:10:25 +02:00
iceman1001 0ee710ed92 chg: lua scripts now get easy access to fast_push_mode option 2019-04-30 09:48:08 +02:00
Philippe Teuwen a91d0a7b19 Smart color handling: 
* if on Windows, no color, as usual
* if on Linux, color only on real term
  * no color when > foo
  * no color in the logfile
 2019-04-30 00:41:52 +02:00
Philippe Teuwen f4d62eec09 Fix COMMS_DEBUG_RAW 2019-04-29 23:02:49 +02:00
Philippe Teuwen 56f92348ea style 2019-04-29 22:41:28 +02:00
Philippe Teuwen 73b6fa7cbc Simpler newfilenamemcopy 2019-04-29 22:40:10 +02:00
Philippe Teuwen 35ea8e745e Faster CmdHF14AMfChk 2019-04-29 22:39:42 +02:00
Philippe Teuwen 32a512b13e Support break_after_ACK for MIX frames 2019-04-29 22:39:18 +02:00
Philippe Teuwen ac9f3b29f6 better COMMS_DEBUG_RAW 2019-04-29 22:38:54 +02:00
Philippe Teuwen fc6be9fea4 Define USB_CMD_DATA_SIZE_MIX 2019-04-29 22:38:26 +02:00
iceman1001 b08b1c2cd9 chg: 'hf mfu info' - ndef parsing was a bit wrong 2019-04-29 18:58:27 +02:00
iceman1001 31a531f1d0 chg: better ndef parsing and texts 2019-04-29 17:34:47 +02:00
iceman1001 9e34a8e56d chg: 'hf mfu info' - ndef has 4 byte blocks on UL/NTAG 2019-04-29 17:34:24 +02:00
iceman1001 60ea44069e text 2019-04-29 14:57:05 +02:00
iceman1001 c4e4e7dc69 text 2019-04-29 14:55:39 +02:00
iceman1001 50f5b1b422 intial 2019-04-29 14:49:18 +02:00
iceman1001 f4f61fecd6 chg: 'script run ndef_dump' - optional verbose ndefparsing 2019-04-29 14:47:44 +02:00
iceman1001 ea7ad8cbc6 fixes to ndef 2019-04-29 14:44:08 +02:00
iceman1001 f4b75d7f5b fix: ndef parse uri off by one 2019-04-29 14:42:37 +02:00
iceman1001 67e3ac3f54 add: ndef parsing to LUA 2019-04-29 14:19:41 +02:00
iceman1001 03d6454d95 chg: 'script run mfkeys' : uses NG 
chg: 'hf mf chk' : uses old/mix
 2019-04-29 12:12:14 +02:00
iceman1001 7454a4dcf2 chg: 'hf mf chkkeys' - now uses NG 2019-04-29 02:07:40 +02:00
iceman1001 7cc6975e52 fix 2019-04-29 01:52:55 +02:00
iceman1001 2b561ad732 next 2019-04-29 01:51:00 +02:00
iceman1001 47fbb557b4 next 2019-04-29 01:39:40 +02:00
iceman1001 b254e70160 next 2019-04-29 01:32:45 +02:00
Philippe Teuwen 5e8fc73527 Debug hexdumps of comm 2019-04-29 01:20:03 +02:00
iceman1001 805b679b2f fxing 2019-04-28 23:58:51 +02:00
iceman1001 a6ee9ef3e7 Merge branch 'experimental_varlen' of https://github.com/RfidResearchGroup/proxmark3 into experimental_varlen 
# Conflicts:
#	client/scripts/ndef_dump.lua
 2019-04-28 23:57:31 +02:00
iceman1001 9d512d411c chg: added manufacturer to 14ainfo structure. 
chg: ndefdump remakes
 2019-04-28 23:43:55 +02:00
Philippe Teuwen 69f8d81f4e style 2019-04-28 22:54:00 +02:00
Philippe Teuwen f1deb865db Merge branch 'master' into experimental_varlen 
* master:
  ltrim cmd before display
  hf mf eload: fix absence of filename
  detect wrong numOfBlocks / numOfSectors arguments
  safeFile*: accept when suffix is already provided
  loadFile*: accept when suffix is already provided
  textual,  to reflect which repo.
  LoadEML: don't complain on the last \n
 2019-04-28 22:53:12 +02:00
Philippe Teuwen 5bc9118a19 baudrate only for physical uart 2019-04-28 22:51:40 +02:00
Philippe Teuwen 281cdead26 ltrim cmd before display 2019-04-28 22:38:44 +02:00
Philippe Teuwen 334e6d208b hf mf eload: fix absence of filename 2019-04-28 22:16:50 +02:00
Philippe Teuwen 997f5d700e detect wrong numOfBlocks / numOfSectors arguments 2019-04-28 21:34:05 +02:00
iceman1001 cf0d17853e next 2019-04-28 21:29:47 +02:00
Philippe Teuwen 1dbcb712c3 safeFile*: accept when suffix is already provided 2019-04-28 20:42:57 +02:00
iceman1001 f4f8636b86 more converting scripts 2019-04-28 19:51:25 +02:00
iceman1001 79bfe892d6 next 2019-04-28 19:45:00 +02:00
iceman1001 25dd7c9a1c spelling 2019-04-28 19:39:09 +02:00
iceman1001 02c2ea5a15 chg: next batch of scripts 2019-04-28 19:26:26 +02:00
Philippe Teuwen 405f24522e loadFile*: accept when suffix is already provided 2019-04-28 19:21:04 +02:00
iceman1001 819896acf6 first batch of updated scripts to use sendMIX commands instead. 2019-04-28 18:46:06 +02:00
Philippe Teuwen c6172b4d9c LoadEML: don't complain on the last \n 2019-04-28 16:47:50 +02:00
iceman1001 195887487b fixes to commands.lua to support MIX/NG 2019-04-28 16:35:30 +02:00
iceman1001 292462fb74 fixes to sendMIX/SendNG 2019-04-28 16:31:49 +02:00
iceman1001 cc5b63823b chg: better sending 2019-04-28 12:52:25 +02:00
iceman1001 9779868753 style 2019-04-28 11:09:46 +02:00
iceman1001 abf93f4f2c Merge branch 'experimental_varlen' of https://github.com/RfidResearchGroup/proxmark3 into experimental_varlen 2019-04-28 11:05:51 +02:00
iceman1001 c13f9e7a0f add: SendCommandMIX, SendCommandOLD support in LUA 2019-04-28 11:05:23 +02:00
Philippe Teuwen fbec3f3125 Merge branch 'master' into experimental_varlen 
* master:
  fix segfault
  rework shell scripts for easy client or flasher
  Stop poking Internet when compiling
  doc multiple commands with -c
  Add support for: proxmark3 -c "hw ping;hw version;hw ping"
  update.sh flash boot only if option -b
 2019-04-27 16:55:28 +02:00
Philippe Teuwen 8ebc44ee81 fix segfault 2019-04-27 16:52:23 +02:00
iceman1001 c5c364d994 fix: compilation on mingw 2019-04-27 11:57:11 +02:00
iceman1001 238eda8b17 chg: 'hw detectreader' cleanup 2019-04-27 11:07:59 +02:00
Philippe Teuwen e2e0b704c5 Several changes in the initial connection, see details: 
* TestProxmark uses pingng
* New command CMD_CAPABILITIES to transmit capabilities from pm3 to host
* Use TestProxmark to retrieve capabilities with that new command
* CloseProxmark if TestProxmark fails
* Hide baudrate for USB and retrieve real baudrate from pm3 for BT
 2019-04-27 02:46:20 +02:00
Philippe Teuwen 7d1161d7d8 First packet is in TestProxmark, not pm3_version 2019-04-27 01:16:43 +02:00
Philippe Teuwen 12937884f6 move uart_speed to conn struct and display baudrate only for real UART 2019-04-27 01:15:52 +02:00
Philippe Teuwen 200290bc56 doc multiple commands with -c 2019-04-27 00:33:14 +02:00
Philippe Teuwen d3cc0bb71c Add support for: proxmark3 -c "hw ping;hw version;hw ping" 2019-04-27 00:31:05 +02:00
Philippe Teuwen e9bfc3eb7a Merge branch 'master' into experimental_varlen 
* master:
  rename usb_present
  TestProxmark only if OpenProxmark returned pm3 present
  Trying original SPI mode for 24MHz flash mem
  text
 2019-04-26 23:30:30 +02:00
Philippe Teuwen 897632a717 rename usb_present 2019-04-26 23:30:03 +02:00
Philippe Teuwen 4a576efc44 TestProxmark only if OpenProxmark returned pm3 present 2019-04-26 23:26:51 +02:00
Philippe Teuwen 3b6a249646 move global connection flags to cnn struct 2019-04-26 23:16:24 +02:00
Philippe Teuwen 01b31c742b Use block_after_ACK in flashmem too 2019-04-26 13:53:11 +02:00
Philippe Teuwen b12be75a5b Remove block_after_ACK mechanism on NG frames, flashing uses OLD and NG won't use ACK anymore 2019-04-26 12:02:34 +02:00
Philippe Teuwen a14b3d8b87 Merge branch 'master' into experimental_varlen 
* master:
  missing bracket
  text
  CHG: remove WITH_EMV since its not used at all.
 2019-04-26 10:54:12 +02:00
iceman1001 4ad9f57939 missing bracket 2019-04-26 10:49:30 +02:00
Philippe Teuwen 1c136c8fc6 Merge branch 'master' into experimental_varlen 
* master:
  rework Dbprintf & add color support
  use color macros
  doc magic
  archive and fix hid-flasher
  update standalone readme
 2019-04-26 10:48:28 +02:00
iceman1001 cf7e7d3447 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 10:36:26 +02:00
Philippe Teuwen cb452c98ba rework Dbprintf & add color support 2019-04-26 10:36:06 +02:00
iceman1001 88744650db Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 08:56:16 +02:00
Philippe Teuwen 70995f0f1e use color macros 2019-04-26 08:29:48 +02:00
iceman1001 de05d6e4d2 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 00:30:36 +02:00
Philippe Teuwen 7d6f971db4 archive and fix hid-flasher 2019-04-26 00:11:45 +02:00
Philippe Teuwen 540fecb760 Merge branch 'master' into experimental_varlen 
* master:
  adjust standalone doc
  Use placeholder for standalone mode if needed
  Move compile options to Makefile.hal
  textual
  chg: refactor standalone mode info string add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
 2019-04-25 23:01:49 +02:00
iceman1001 5c49fcbfdb CHG: remove WITH_EMV since its not used at all. 2019-04-25 22:51:01 +02:00
Philippe Teuwen f3b3508d3e Move compile options to Makefile.hal 2019-04-25 22:15:16 +02:00
Philippe Teuwen 0fc79824dd Merge branch 'master' into experimental_varlen 
* master:
  remove redundant def
  chg:  forgot to readd hitag support :)
  Guard Hitag code
 2019-04-25 20:59:27 +02:00
Philippe Teuwen a844afc273 Guard Hitag code 2019-04-25 20:42:41 +02:00
Philippe Teuwen eababdd3ef Merge branch 'master' into experimental_varlen 
* master:
  chg: 'hf mf sim' - textual
  fix:  warning on mingw64.   This offset is calculated, casting it to u32 should be fine.
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 remove all offending code,  return 1.   Will only impact the speed of hardnested execution.
  fix again OSX
  fix https://github.com/RfidResearchGroup/proxmark3/issues/173
  used predefined constants, common types moved to common header files
  backward compatibility, on load converter for old mfu dump format
  loops for counters output
  UL/NTAG new dump file format. Added counters support, simulation
 2019-04-25 20:05:04 +02:00
iceman1001 df96b58fcc style 2019-04-25 17:06:40 +02:00
iceman1001 ef95d8c742 chg: 'hf mf sim' - textual 2019-04-25 16:57:18 +02:00
iceman1001 5cc3a1b717 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-25 16:55:48 +02:00
iceman1001 3bfd01bffb fix: warning on mingw64. This offset is calculated, casting it to u32 should be fine. 2019-04-25 16:55:00 +02:00
Iceman f227041932
Merge pull request #172 from McEloff/hfmfu 
UL/NTAG new dump file format. Added counters support, simulation
 2019-04-25 16:10:03 +02:00
iceman1001 fe35a972f5 fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 
remove all offending code,  return 1.   Will only impact the speed of hardnested execution.
 2019-04-25 16:08:08 +02:00
iceman1001 90463cb79f fix again OSX 2019-04-25 09:49:47 +02:00
iceman1001 ce8d5c66ab fix https://github.com/RfidResearchGroup/proxmark3/issues/173 
this seems to work for OSX,  and improved linux version with fallback.
 2019-04-25 08:29:15 +02:00
Philippe Teuwen 4b5800d78f remove name 2019-04-24 15:57:24 +02:00
Philippe Teuwen 517bf7e238 Merge branch 'master' into experimental_varlen 
* master:
  Force no-ms-bitfields to ensure proper struc packing on Windows
 2019-04-24 15:05:09 +02:00
Philippe Teuwen 1b246cd380 Force no-ms-bitfields to ensure proper struc packing on Windows 2019-04-24 15:04:43 +02:00
Philippe Teuwen 79d7fb65b5 Merge branch 'master' into experimental_varlen 
* master:
  Fix segfault when loading a file
  Revert c7a4d7af, remove redundant include
 2019-04-24 00:59:57 +02:00
Philippe Teuwen 25048ccf2f Fix segfault when loading a file 2019-04-24 00:53:25 +02:00
Philippe Teuwen e453aff88c First adjustments for FPC BT link 2019-04-23 23:36:36 +02:00
Eloff 66ee8dc09e used predefined constants, common types moved to common header files 2019-04-23 21:14:20 +03:00
Eloff a8c1fa7a3b backward compatibility, on load converter for old mfu dump format 2019-04-23 17:07:20 +03:00
Eloff 8793a9e596 Merge commit 'e171010d' into hfmfu 
# Conflicts:
#	CHANGELOG.md
 2019-04-22 23:26:20 +03:00
Eloff 4161779083 loops for counters output 2019-04-22 23:20:35 +03:00
Philippe Teuwen 9602e641e2 Merge branch 'master' into experimental_varlen 
* master:
  translation
  document offsets
  textual
  textual
  typo
  'hf mf sim' full-byte anti-collision frame support
 2019-04-22 21:39:38 +02:00
iceman1001 458ce75073 textual 2019-04-22 19:21:55 +02:00
iceman1001 166da51360 textual 2019-04-22 19:21:07 +02:00
Philippe Teuwen d6892136ac Add communication_delay also to dl_it timeout 2019-04-22 02:44:06 +02:00
Philippe Teuwen 3e402797c1 dl_it uses also global start_time reset by packets reception as this can take ages (50s at 9600 baud for LF samples) 2019-04-22 02:11:46 +02:00
Philippe Teuwen eebea8c088 DbpStringEx using reply_ng 2019-04-22 01:33:32 +02:00
Philippe Teuwen 913c03d3c4 Reset WaitForResponse timeout every time we get a packet 
as cmds sending a lot of Dbprintf msgs can take ages on slow links
e.g. "hw status" on 9600 baud link takes 26.5s with "reply_old" Dbprintf
 2019-04-21 23:56:08 +02:00
Philippe Teuwen 75ee60f267 WaitForResponseTimeoutW: fix, no communication_delay when timeout=-1 2019-04-21 23:26:51 +02:00
Eloff db3103b531 UL/NTAG new dump file format. Added counters support, simulation 2019-04-21 03:18:00 +03:00
Philippe Teuwen 4aa1b49493 fix uart_posix: bytecound must be 32b 2019-04-21 01:05:02 +02:00
Philippe Teuwen 6e744043f5 usart working... when debugged... 2019-04-21 00:44:19 +02:00
Philippe Teuwen a7773b3395 Introduce reply_mix, to still get some varlen on old API 2019-04-20 03:17:19 +02:00
Philippe Teuwen 3bcf80bb34 Introduce SendCommandMIX, to still get some varlen on old API 2019-04-20 02:41:40 +02:00
Philippe Teuwen 95822d8360 minor 2019-04-20 01:49:37 +02:00
Philippe Teuwen 238fc10c9a style 2019-04-20 01:08:07 +02:00
Philippe Teuwen 7331b7d6d2 Merge branch 'master' into experimental_varlen 
* master:
  Add ref to new mifaresim.h in standalone modes
  fix: Standalone/hf_colin now compiles
  Update readme.md
  chg: hitag compile flag optional
  fix: standalonemode matty_run now compiles
  typo
  smallfix
  chg: fpga lf simulation
  chg: 'fpga lf sim' - 25% both on sides.
 2019-04-19 23:17:36 +02:00
Philippe Teuwen c4766b2649 Semi-Automated SendCommand -> SendCommandOLD 2019-04-19 23:01:13 +02:00
Eloff 52d1b7341f typo 2019-04-19 09:39:11 +03:00
Philippe Teuwen 128d90ca3c SendCommandOLD: hid-flasher 2019-04-19 02:10:52 +02:00
Philippe Teuwen b68ccfa7b8 SendCommandOLD : comms & flash 2019-04-19 02:01:47 +02:00
Philippe Teuwen 2ac5482d9c SendCommandOLD & errors retval: mifarehost 2019-04-19 01:45:45 +02:00
Philippe Teuwen 45afe8dec0 errors retval for cmdemv 2019-04-19 01:14:58 +02:00
Philippe Teuwen a6f52e839f fix bug 2019-04-19 01:14:04 +02:00
Philippe Teuwen 1b6a45ac17 propagate CmdsParse return value 2019-04-19 00:47:51 +02:00
Philippe Teuwen 38fc6e2290 errors: cmdmain 2019-04-19 00:42:25 +02:00
Philippe Teuwen dcfee8963b SendCommandOLD & errors: cmdflashmem 2019-04-18 23:26:12 +02:00
Philippe Teuwen 7dbd12ad27 SendCommandOLD: cmdhw 2019-04-18 22:42:15 +02:00
Philippe Teuwen 9bd59a8d40 Add SendCommandOLD 2019-04-18 22:19:28 +02:00
Philippe Teuwen b860cc6eaf Rename MAGIC defines 2019-04-18 21:49:37 +02:00
Philippe Teuwen 8c89b35f1e style 2019-04-18 21:41:48 +02:00
Philippe Teuwen 9ff841efb2 CRC optional, replaced by magic on USB 2019-04-18 21:39:35 +02:00
Eloff 960b21793c 'hf mf sim' full-byte anti-collision frame support 2019-04-18 21:02:48 +03:00
Philippe Teuwen 482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen 0e855f647a typo 2019-04-18 10:45:24 +02:00
Oleg Moiseenko 1d60cf3bd6
Merge pull request #169 from merlokk/sf 
smallfix
 2019-04-18 11:26:21 +03:00
merlokk 8bf8f1735e smallfix 2019-04-18 11:25:57 +03:00
Philippe Teuwen 4e31c6110b Better Command structs 2019-04-18 00:12:52 +02:00
Philippe Teuwen 533667ea6d Better Reply structs 2019-04-17 23:44:48 +02:00
Philippe Teuwen 64eb93c9c4 style 2019-04-17 22:08:10 +02:00
Philippe Teuwen 7cbcf8163c Merge branch 'master' into experimental_varlen 
* master: (27 commits)
  textual
  style redundant assignment
  timeout fix
  small fix
  add termcap
  add readline and small fix
  rdp
  textual
  null term?
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/166
  add dlls to release
  style
  style
  test fix
  test fixes
  another fix
  fix memleak
  fix
  textual
  use printandlogex
  ...
 2019-04-17 22:06:39 +02:00
Philippe Teuwen be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +02:00
iceman1001 587d826f84 textual 2019-04-17 20:36:10 +02:00
iceman1001 2783ba7583 style redundant assignment 2019-04-17 19:48:29 +02:00
iceman1001 b574db169e textual 2019-04-17 16:56:52 +02:00
iceman1001 853d2e14e6 null term? 2019-04-17 16:53:28 +02:00
iceman1001 ec7ab1a4ed fix: https://github.com/RfidResearchGroup/proxmark3/issues/166 2019-04-17 16:52:58 +02:00
iceman1001 3207aaea67 style 2019-04-17 14:57:21 +02:00
iceman1001 1ee3679a98 style 2019-04-17 14:54:42 +02:00
iceman1001 da2aa2c55f test fix 2019-04-17 14:50:07 +02:00
iceman1001 524346901a test fixes 2019-04-17 14:48:32 +02:00
iceman1001 e0bd6b2019 another fix 2019-04-17 14:39:47 +02:00
iceman1001 2044fd4130 fix memleak 2019-04-17 14:35:22 +02:00
iceman1001 f5b7371d7c fix 2019-04-17 14:33:09 +02:00
iceman1001 72f6ba712a textual 2019-04-17 14:01:05 +02:00
iceman1001 bc0e9687d7 use printandlogex 2019-04-17 13:45:55 +02:00
iceman1001 6930ca5785 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-17 12:01:33 +02:00
iceman1001 01b83482a7 use printandlogex 2019-04-17 11:58:44 +02:00
iceman1001 53b48ae6a9 use printandlogex 2019-04-17 11:55:52 +02:00
iceman1001 3fdac2577f use printandlogex 2019-04-17 11:54:40 +02:00
iceman1001 d89a5d0a5e use printandlongex 2019-04-17 11:48:17 +02:00
iceman1001 002e6b23fe Use printandlogex 2019-04-17 11:47:32 +02:00
Philippe Teuwen 8bfc5c1b47 New reply frames reception 2019-04-17 01:06:26 +02:00
Philippe Teuwen 96843c3f47 New reply frames transmission (reception still to be done) 2019-04-16 23:15:23 +02:00
Philippe Teuwen 4eaa2fc5aa move common util fcts to /common to avoid common files (e.g. crc) to depend on non-common files 2019-04-16 23:02:40 +02:00
Eloff 63f9f11066 'hf mf sim' bugs fix, RATS support, etc 2019-04-16 23:52:05 +03:00
Philippe Teuwen 8b99df9074 Merge branch 'master' into experimental_varlen2 
* master: (33 commits)
  unified Proxmark3 text
  removed
  more colors
  rearranged banner output and messages
  textual
  revert
  revert
  revert
  style spaces
  fix fake com port
  style
  style
  styles
  not null?
  style
  style
  style
  style
  style
  style
  ...
 2019-04-16 20:58:58 +02:00
Philippe Teuwen 83571f02a0 style 2019-04-16 20:49:32 +02:00
iceman1001 436910605b unified Proxmark3 text 2019-04-16 20:00:25 +02:00
Philippe Teuwen 44bbb7d2c7 new frame format, smaller and with crc. Some code simplified 2019-04-16 20:00:17 +02:00
iceman1001 33b4a32dfd removed 2019-04-16 19:06:18 +02:00
iceman1001 8657e17a0b more colors 2019-04-16 17:29:19 +02:00
iceman1001 2639de23c6 rearranged banner output and messages 2019-04-16 17:26:15 +02:00
iceman1001 74ece72b26 textual 2019-04-16 17:21:42 +02:00
iceman1001 aaedeafbb1 style spaces 2019-04-16 16:56:56 +02:00
iceman1001 d17191d0a4 style 2019-04-16 16:11:46 +02:00
iceman1001 c6aa14efb7 style 2019-04-16 16:07:25 +02:00
iceman1001 f50566225c styles 2019-04-16 16:02:03 +02:00
iceman1001 eae370fc3d not null? 2019-04-16 15:51:13 +02:00
iceman1001 a6f145bd1a style 2019-04-16 15:47:21 +02:00
iceman1001 d8f756fd14 style 2019-04-16 15:43:53 +02:00
iceman1001 7b30126371 style 2019-04-16 15:29:18 +02:00
iceman1001 1c4a7709da style 2019-04-16 15:27:25 +02:00
Philippe Teuwen 34467b7550 Variable length frames, part1: USB Host -> Pm3 2019-04-16 10:01:08 +02:00
merlokk 934fb42a95 Jablotron ID length fix 2019-04-15 18:04:12 +03:00
Philippe Teuwen 62f46d6544 Use PrintAndLogEx 2019-04-14 18:51:07 +02:00
Philippe Teuwen 9a7bba2438 Move UART open msg to avoid flood in wait mode 2019-04-14 18:49:19 +02:00
Philippe Teuwen ba926a91e5 more yellow 2019-04-14 18:38:06 +02:00
Philippe Teuwen 04c0384d3e Testing pm3 communication 2019-04-14 17:25:17 +02:00
Philippe Teuwen 3cba736841 baudrate for usart: use define and limit to 115200 only for WITH_FPC_HOST 2019-04-14 14:42:03 +02:00
Philippe Teuwen 9676d788e0 style 2019-04-14 13:37:53 +02:00
Philippe Teuwen 681c8fd22a main: use proper executable name, especially for mingw 2019-04-14 13:35:52 +02:00
Philippe Teuwen e708d86306 Rework command line options 2019-04-14 12:54:37 +02:00
iceman1001 d28fac3ef0 style 2019-04-14 11:43:05 +02:00
iceman1001 e9db49be1e chg: 'data rawdemod' - enhanced command params 2019-04-14 11:13:31 +02:00
iceman1001 dd404a67a1 Fix: USART - default speeds is lower (@ryan) 2019-04-14 11:09:31 +02:00
Philippe Teuwen 4763eb417a fix coverity warnings 2019-04-14 11:05:32 +02:00
iceman1001 0a9d2ca03d lets see if cexpf can be removed now. 2019-04-14 07:41:25 +02:00
Philippe Teuwen 8d94d2d67f comparison of integers of different signs [-Wsign-compare] 2019-04-14 00:45:27 +02:00
Philippe Teuwen 15f0fef555 Fix data shiftgraphzero corrupting end of GraphBuffer 2019-04-13 23:57:26 +02:00
Philippe Teuwen 993728072a comparison of integers of different signs [-Wsign-compare] 2019-04-13 23:55:58 +02:00
Philippe Teuwen 97676d3210 comparison of integers of different signs [-Wsign-compare] 2019-04-13 23:38:34 +02:00
Philippe Teuwen ce606b51fc Handle explicitly enum vals in switch [-Wswitch-enum] 2019-04-13 22:46:08 +02:00
Philippe Teuwen b6ee94ec8e style 2019-04-13 22:07:58 +02:00
Philippe Teuwen 5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
iceman1001 4572acc1eb cleaning out the helptext 
mingw got some bad asciiarts
 2019-04-13 13:34:02 +02:00
iceman1001 e20a47478f comment away my playground 2019-04-13 03:07:53 +02:00
iceman1001 dae0016bb2 times times times 2019-04-13 03:01:31 +02:00
iceman1001 22f8440183 struct 2019-04-13 02:51:33 +02:00
iceman1001 0a8c303685 move defines 2019-04-13 02:49:15 +02:00
iceman1001 1cb83e78a5 localtime, gmtime replaced 2019-04-13 02:45:53 +02:00
iceman1001 361cd83fce gmtime_r 2019-04-13 02:41:46 +02:00
iceman1001 48e1a7648e posix 2001 2019-04-13 02:30:00 +02:00
iceman1001 ecf282a54c missing include 2019-04-13 02:18:49 +02:00
iceman1001 f05566c834 missing pointers.. 2019-04-13 02:16:22 +02:00
iceman1001 a27348c592 replaced with threadsafe strtok_r call 2019-04-13 02:13:23 +02:00
iceman1001 85b4463000 style 2019-04-13 02:10:44 +02:00
iceman1001 f8a533af5d style 2019-04-13 02:09:23 +02:00
iceman1001 4cadd8c2ee style 2019-04-13 02:04:40 +02:00
iceman1001 ef46e3af29 style 2019-04-13 01:47:10 +02:00
iceman1001 618e31e920 style 2019-04-13 01:46:10 +02:00
Philippe Teuwen 4f32655004 use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-13 00:25:43 +02:00
Philippe Teuwen 05374fce07 Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes] 2019-04-12 19:41:56 +02:00
Philippe Teuwen 65305f361f no comment :( 2019-04-12 15:12:01 +02:00
Philippe Teuwen 1cb2ae889c Avoid Coverity BAD_COMPARE, but honestly I don't get it at all... 
int readCOTAGUid(void) {
>>>     CID 337768:  Incorrect expression  (BAD_COMPARE)
>>>     This implicit conversion to a function pointer is suspicious: "CmdCOTAGRead > NULL".
130         return CmdCOTAGRead > 0;

This is just an int compared to zero, why it thinks it's a null pointer??
 2019-04-12 13:43:36 +02:00
iceman1001 e7f4f615c0 unified text 2019-04-12 10:55:09 +02:00
iceman1001 d8ab476022 fix: 'hf legic info' - unsegmented card now uses card size to calc remaining length. Also made the output at bit more clear and colorful 2019-04-12 10:20:53 +02:00
Philippe Teuwen 8aa5b42cdf Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-12 02:07:11 +02:00
Philippe Teuwen f6a6ec8447 Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-12 01:55:25 +02:00
Philippe Teuwen 7d48ad19f9 Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-12 01:00:54 +02:00
Philippe Teuwen 20393d71a8 hardnested_tables: add C99 flag in suggested compilation 2019-04-11 19:43:48 +02:00
iceman1001 6609db82ab textual 2019-04-11 17:20:08 +02:00
iceman1001 a872f04c1e textual 2019-04-11 17:19:48 +02:00
iceman1001 fb8d7c3efa textual 2019-04-11 17:18:17 +02:00
iceman1001 7547952a4d style 2019-04-11 07:40:50 +02:00
Iceman 7483e56249
Merge pull request #155 from davidbeauchamp/hid36bit 
Add 36bit HID format, extend calcWiegand() to include oem bits
 2019-04-11 07:33:12 +02:00
David Beauchamp 5317fa0277 Restore log level 2019-04-10 20:44:21 -04:00
David Beauchamp 8d479e3a68 Add 36bit HID format, extend calcWiegand() to include oem bits 2019-04-10 20:34:42 -04:00
Philippe Teuwen 2879599ac4 #ifndef on all header files 2019-04-11 01:16:25 +02:00
Philippe Teuwen 35e97ba96a static 2019-04-11 00:10:21 +02:00
Philippe Teuwen 6416de1a38 emv_tags [-Wmissing-field-initializers] 2019-04-10 23:13:00 +02:00
Philippe Teuwen 3cd047be5d oops typo 2019-04-10 22:47:18 +02:00
Philippe Teuwen 0fe323de80 asn1_tag: remove unused field and initialize the others [-Wmissing-field-initializers] 2019-04-10 22:33:12 +02:00
Philippe Teuwen 34aa860fbd more [-Wmissing-field-initializers] 2019-04-10 22:20:45 +02:00
Philippe Teuwen 919cfb5841 more [-Wmissing-field-initializers] 2019-04-10 15:01:19 +02:00
Philippe Teuwen 0ab6de64d4 structs: initializes explicitely all fields, so we can detect when we really forgot one [-Wmissing-field-initializers] 2019-04-10 13:59:00 +02:00
iceman1001 af3397bd19 chg: 'lf indala demod' - textual 2019-04-10 13:46:51 +02:00
iceman1001 097835e684 fix nedap clone helptext. all waiting for the nedap clone cmd ... 2019-04-10 13:32:35 +02:00
iceman1001 2c68edfad4 fix indala clone/demod helptext 2019-04-10 13:31:09 +02:00
Philippe Teuwen 0ce9e37fb7 Remove duplicate helptext 2019-04-10 13:17:38 +02:00
Philippe Teuwen 3d6d58aae5 internal help fcts -> static 2019-04-10 13:06:05 +02:00
Philippe Teuwen cc0454d5d2 tag unused Cmd [-Wunused-parameter] 2019-04-10 12:23:40 +02:00
Philippe Teuwen 7f76fea21a good const, bad const, fixing -Wincompatible-pointer-types-discards-qualifiers 2019-04-10 10:21:42 +02:00
osboxes.org e703dcb8ad style 2019-04-10 09:49:42 +02:00
osboxes.org 598d016477 style 2019-04-10 09:47:46 +02:00
osboxes.org acf3920394 style 2019-04-10 09:47:36 +02:00
osboxes.org ffd2c92584 style 2019-04-10 09:46:01 +02:00
osboxes.org ba45da1c28 style 2019-04-10 09:38:33 +02:00
osboxes.org 827cd721fe style 2019-04-10 09:37:46 +02:00
osboxes.org ad52243981 style 2019-04-10 09:36:23 +02:00
iceman1001 2b582c9bd0 unused 2019-04-10 09:00:38 +02:00
iceman1001 9c78f4d6d0 unused 2019-04-10 08:58:08 +02:00
iceman1001 84233a8f85 unused 2019-04-10 08:57:23 +02:00
iceman1001 0a43c80dff unused 2019-04-10 08:55:29 +02:00
iceman1001 d5dc1156e1 unused 2019-04-10 08:54:33 +02:00
iceman1001 1809d6c839 unused 2019-04-10 08:52:45 +02:00
Philippe Teuwen 6d0ee581fd ease hardnested_tables compilation, in case we figure out what to do with it some day 2019-04-09 22:50:04 +02:00
Philippe Teuwen 55ac61e145 remove redundant buffer init 2019-04-09 22:43:29 +02:00
Philippe Teuwen 28ca3e8c22 on prototypes, void means sth 2019-04-09 22:42:23 +02:00
iceman1001 9c74a96c9b unused 2019-04-09 21:40:25 +02:00
iceman1001 cf21db6f38 unused 2019-04-09 21:38:04 +02:00
iceman1001 c19b5977d4 unused 2019-04-09 21:36:52 +02:00
iceman1001 3f2d02b978 unused 2019-04-09 21:36:14 +02:00
Philippe Teuwen 2ebf940bf0 PrintAndLogEx: use const on char *fmt 2019-04-09 21:25:11 +02:00
Philippe Teuwen a561370f8d more strncpy fix 2019-04-09 20:15:08 +02:00
Philippe Teuwen df55154649 more 2019-04-09 20:08:35 +02:00
Philippe Teuwen 2f33682035 use sizeof 2019-04-09 20:05:27 +02:00
Philippe Teuwen ff194eb861 CmdHF15Write: make sure truncated string is null-terminated 2019-04-09 20:02:41 +02:00
Philippe Teuwen 258332894b hardnested: get rid of shift by negative value 2019-04-09 17:49:02 +02:00
iceman1001 87660df8f2 fix: 'hf mf hardnested' - not verify key when reading nonce file 2019-04-09 17:14:47 +02:00
iceman1001 ac88c435f6 remove old iso14443crc.c, fully replaced by crc16.c functions. 2019-04-09 10:12:15 +02:00
Fl0-0 be90c76f47 Fix sizes for GCC 8.2 string truncation warnings 2019-04-09 09:45:06 +02:00
iceman1001 b0d627bae5 check returnvalue 2019-04-08 14:41:06 +02:00
iceman1001 678293913c ccc 2019-04-08 14:22:50 +02:00
iceman1001 726e02b900 color 2019-04-08 14:22:04 +02:00
iceman1001 98d8405830 wrong includes 2019-04-08 12:58:26 +02:00
iceman1001 493a26b93a updated 2019-04-08 12:47:34 +02:00
iceman1001 cd85c57e11 style 2019-04-08 12:38:32 +02:00
iceman1001 cfe793bd22 pointers 2019-04-08 12:29:49 +02:00
iceman1001 b7b7db8ca4 unshadow crc16 2019-04-08 10:45:55 +02:00
iceman1001 4843726d7e unshadow bs_ones, bs_zeros 2019-04-08 10:36:58 +02:00
iceman1001 0e05faaf0c styles 2019-04-08 10:33:06 +02:00
iceman1001 0b6dce3363 styles 2019-04-08 10:30:20 +02:00
iceman1001 29d73046cc unshadow clock, the mysterious one 2019-04-08 10:21:28 +02:00
iceman1001 2b3e5b7aac style 2019-04-08 10:19:01 +02:00
iceman1001 ebe98723d4 unshadow 2019-04-08 10:17:08 +02:00
iceman1001 21d88ae2c2 unshadow, multiple defines. 2019-04-08 10:16:57 +02:00
iceman1001 91e34643ab unshadow 2019-04-08 10:14:22 +02:00
iceman1001 7f0b1eacd1 unshadow 2019-04-08 10:13:15 +02:00
iceman1001 a1d9b574fd style 2019-04-08 10:11:57 +02:00
iceman1001 5e1c5f72e1 styles 2019-04-08 10:10:48 +02:00
iceman1001 dcb83d2962 styles 2019-04-08 10:01:57 +02:00
iceman1001 e1d56b5f94 unshadow 2019-04-08 09:50:06 +02:00
iceman1001 2fc54ca667 unshadow clock.. the mysterious variable 2019-04-08 09:42:27 +02:00
iceman1001 854536b155 unshadow 2019-04-08 09:39:05 +02:00
iceman1001 eadc980835 unshadow 2019-04-08 09:26:39 +02:00
iceman1001 55cbedc600 styles 2019-04-08 09:24:31 +02:00
iceman1001 21fd059dc2 unshadow 2019-04-08 09:08:03 +02:00
iceman1001 ec278e60cc unshadow 2019-04-08 08:34:40 +02:00
iceman1001 a2176b722d fix 2019-04-08 08:28:43 +02:00
iceman1001 1815376ef5 style 2019-04-08 08:26:30 +02:00
iceman1001 8f2983368c style 2019-04-08 08:26:18 +02:00
iceman1001 075ccebfd5 unshadow 2019-04-08 08:23:11 +02:00
iceman1001 9328a8efbb fix 2019-04-08 08:15:28 +02:00
iceman1001 8d2c02878b simpler branching 2019-04-08 08:11:18 +02:00
iceman1001 a89ae9cb35 check return value from zlib inflateInit2... 2019-04-08 08:08:47 +02:00
iceman1001 f6a80e0dc8 funcArgNamesDifferent 2019-04-07 20:34:42 +02:00
iceman1001 514611e885 fix 2019-04-07 20:24:13 +02:00
iceman1001 f1a01dcc7b fix 2019-04-07 20:22:24 +02:00
iceman1001 8aa5dec805 styles 2019-04-07 20:21:14 +02:00
iceman1001 e95955b793 shadowing 2019-04-07 20:17:59 +02:00
iceman1001 648706d691 shadowing 2019-04-07 20:13:30 +02:00
iceman1001 f27d618a08 shadowing 2019-04-07 20:12:24 +02:00
iceman1001 b37981df74 shadow 2019-04-07 20:08:53 +02:00
iceman1001 c4d88c239b style 2019-04-07 19:21:24 +02:00
iceman1001 b6345a5df7 style 2019-04-07 18:44:15 +02:00
iceman1001 98d24a4fe8 style 2019-04-07 18:42:47 +02:00
iceman1001 c881acd631 more 2019-04-07 18:35:01 +02:00
iceman1001 4c4471331b fix 2019-04-07 18:32:03 +02:00
iceman1001 27003904ce printandlogs.. 2019-04-07 18:12:58 +02:00
iceman1001 8d9bd81020 never used assignments 2019-04-07 16:49:22 +02:00
iceman1001 9eba3a849a shadowing 2019-04-07 16:34:21 +02:00
iceman1001 03b44b324b assign 2019-04-07 16:30:02 +02:00
iceman1001 0ffe2a4700 shadowing 2019-04-07 16:25:19 +02:00
iceman1001 c65d782d73 shadowing 2019-04-07 16:23:07 +02:00
iceman1001 7bf24a170f style 2019-04-07 15:22:01 +02:00
iceman1001 d8f539c217 style 2019-04-07 15:20:27 +02:00
iceman1001 0b455607a9 fsize can't be zero 2019-04-07 12:41:29 +02:00
iceman1001 69ba2d6a5b rename variables in order to prevent a popular usbcommand named as c. 2019-04-07 12:33:33 +02:00
iceman1001 a7dea8f1e7 overshadowed buf. 2019-04-07 12:30:25 +02:00
iceman1001 1273971991 more crc 2019-04-07 12:14:16 +02:00
iceman1001 8003d95be9 crc 2019-04-07 12:13:05 +02:00
Philippe Teuwen b787ccf150 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  more crc overshadow
 2019-04-07 12:11:07 +02:00
Philippe Teuwen a7448f802f make style: don't indent preprocessor directives 2019-04-07 12:10:51 +02:00
iceman1001 a8ad793f7f more crc overshadow 2019-04-07 12:10:04 +02:00
iceman1001 c4920d7179 fix crc overshadowing 2019-04-07 12:07:50 +02:00
iceman1001 7a24d7fdb6 chg: 'lf indala demod' - texual 2019-04-07 08:52:10 +02:00
Philippe Teuwen 24acbf86eb arg names 2019-04-06 22:15:57 +02:00
Philippe Teuwen 7259a27f05 Change printT55xxBlock API 2019-04-06 22:04:02 +02:00
Philippe Teuwen 50e131f99b arg names 2019-04-06 21:59:34 +02:00
Philippe Teuwen 51d6fa13eb arg names 2019-04-06 21:46:00 +02:00
Philippe Teuwen 41f36ca20b make style 2019-04-06 19:09:01 +02:00
Philippe Teuwen 2603c8d0d1 Merge branch 'hf_mf_sim' of git://github.com/vratiskol/proxmark3 into vratiskol-hf_mf_sim 
* 'hf_mf_sim' of git://github.com/vratiskol/proxmark3:
  Astyle
  Verbose mode
  ReSync file
  Add Encrypted data test
  Mifare 10B UID
  cardAUTHKEY log
  Remove FLAG_RANDOM_NONCE
  Mifare Sim
  LogTrace
  Log Level
  Use Variable
  Add Variable for MAX_MIFARE_FRAME_SIZE
  Add Data Block debug
  Correct flags & test
  Correct return
  Revert "Merge branch 'master' into hf_mf_sim"
  Sync from Upstream
  Astyle update
  hf mf sim
 2019-04-06 19:06:16 +02:00
Philippe Teuwen b666c27f3c
Merge branch 'master' into hf_mf_sim 2019-04-06 01:22:15 +02:00
Philippe Teuwen 98d9408746 make style 2019-04-06 00:52:55 +02:00
Philippe Teuwen 59d40068e2 style 2019-04-06 00:38:22 +02:00
vratiskol 2278d3372e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-06 00:33:10 +02:00
Philippe Teuwen 366c1ec901 style 2019-04-06 00:07:48 +02:00
Philippe Teuwen 9ff5a4e2fa style 2019-04-05 23:17:16 +02:00
Philippe Teuwen 84753b91c0 fix %u <> size_t compilation warning 2019-04-05 21:12:32 +02:00
Philippe Teuwen 841f20c5e5 test_t55x7 logs & stats 2019-04-05 19:34:05 +02:00
iceman1001 fa0a2914f6 style 2019-04-05 19:29:16 +02:00
iceman1001 4be92f129a style 2019-04-05 19:13:03 +02:00
iceman1001 ffdfe09659 style 2019-04-05 18:57:05 +02:00
iceman1001 d42b779cbe style 2019-04-05 18:55:31 +02:00
iceman1001 e7406de219 redundant. 2019-04-05 18:53:17 +02:00
iceman1001 ea5dddafef fix: invalidPrintfArg 2019-04-05 18:47:36 +02:00
iceman1001 82f4388abe style 2019-04-05 09:22:12 +02:00
iceman1001 6404c974b6 style 2019-04-05 09:20:37 +02:00
iceman1001 647dcc596f style 2019-04-05 09:18:52 +02:00
iceman1001 632e80e9b1 style 2019-04-05 09:16:01 +02:00
iceman1001 5b0eed26b5 style 2019-04-05 09:14:40 +02:00
iceman1001 774cbc5cb9 chg: 'script run test_t55x7' - better test loops 2019-04-05 08:58:12 +02:00
iceman1001 229452719a chg: compare with low case 2019-04-05 08:36:12 +02:00
iceman1001 a499e30608 chg: 'script run test_t55x7' - more modulations and better wipe card 2019-04-05 08:21:10 +02:00
iceman1001 1a565ae953 fix uninitialised 2019-04-05 07:39:07 +02:00
vratiskol 7f198192ec ReSync file 2019-04-05 04:09:20 +02:00
vratiskol 0578e19fba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-05 03:48:25 +02:00
iceman1001 ad97aa3d29 chg: 'hf iclass sim' - void*, should be uin8_t* 2019-04-05 00:08:36 +02:00
iceman1001 4326d05674 clarify 2019-04-04 23:48:00 +02:00
iceman1001 444c12717c clarify 2019-04-04 23:45:58 +02:00
iceman1001 4d18b5a11c fix: compare unsigned 2019-04-04 22:36:45 +02:00
iceman1001 d127c2294c fix: compare unsigned 2019-04-04 22:35:38 +02:00
iceman1001 419eef5a43 fix: duplicate break 2019-04-04 22:22:31 +02:00
iceman1001 7a152dc383 fix: duplicate break 2019-04-04 22:11:30 +02:00
iceman1001 0dc0a96b3c fix: duplicate break 2019-04-04 22:10:46 +02:00
iceman1001 ff25fc700e fix: duplicate break 2019-04-04 22:09:43 +02:00
iceman1001 cd78a0878b fix: duplicate breaks 2019-04-04 22:08:23 +02:00
iceman1001 116837e9a0 chg: 'lf t55xx info' - text layout 2019-04-04 20:06:15 +02:00
iceman1001 436b026b27 ADD: 'script run test_t55x7' - a script to do regression test for t55xx programming / proxmark3 capability to read/demodulate different t55x7 configurations 2019-04-04 07:21:58 +02:00
vratiskol 6e8b3c29ba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 22:18:39 +02:00
iceman1001 38162917dc Add: new lua scripting support for some t55xx commands. 
core.t55xx_detect()    - same as 'lf t55xx detect'
  core.t55xx_readblock() - read t55xx block, don't forget to run detect before.  Returns actual blockdata.
 2019-04-03 19:48:00 +02:00
iceman1001 c03e425550 chg: 'hf 15 restore' - fail message added 2019-04-03 15:42:42 +02:00
iceman1001 0383d7f052 chg: 'hf mf restore' - add finish message 
chg: 'hf mfu restore' - add finish message
chg: 'hf 15 restore' - add finish message,  close filehandle when failing.
 2019-04-03 15:34:36 +02:00
vratiskol 1c77185fb9 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 01:48:46 +02:00
Philippe Teuwen 8c74b2f9da Remove compilation warning, even if it was not real issue 
cmdhflegic.c:269:13: warning: ‘strncpy’ output truncated before terminating nul copying 4 bytes from a string of the same length [-Wstringop-truncation]
 2019-04-02 22:48:22 +02:00
Philippe Teuwen cbf81cf5c3 remove compilation warning 2019-04-02 22:43:00 +02:00
Philippe Teuwen 64ce30c06c make style 2019-04-02 22:32:45 +02:00
Philippe Teuwen 5225722a50 t55xx info: fix q5 condition 2019-04-02 22:08:50 +02:00
Philippe Teuwen 21be6d4400 FPC: got RX working, got client over usart somehow working..., see detailed commit msg 
* using WITH_FPC:
  * activate basic usart
  * no double buffer for now, no interrupt
  * usart_dataavailable/usart_readbuffer/usart_writebuffer, to demo it:
    * pm3 client over USB, minicom over usart
    * analyse a d 414243
* using WITH_FPC_HOST:
  * it implies WITH_FPC as it's based on it
  * control pm3 with client over usart
  * EXPERIMENTAL! still some frame desync issues
  * you can connect both from usart & USB with two pm3 clients
    * actually you *have* to connect USB for the moment because
      it's used to send debug messages about buggy usart... See Dbprintf_usb below
  * "sessions": msgs are directed to the latest client to have sent a cmd
  * Dbprintf_usb macro to send msgs to USB client to help debugging usart...
  * We now have an option to run client at different speed as usart is 115200:
    client/proxmark3 /dev/ttyUSB0 -b 115200
  * Consequently, argc,argv handling is a bit revamped, it was so messy...
  * USB and flashing are still at 460800, don't try flashing over usart yet ^^
 2019-04-02 22:06:10 +02:00
iceman1001 4c007beefd textual 2019-04-02 10:36:32 +02:00
iceman1001 4eff3521a7 Chg: 'lf t55xx info' - now prints if its a known config block 2019-04-02 10:33:25 +02:00
Philippe Teuwen d448549524 t55xx info: tag out of spec FSKa modulations in standard mode 2019-03-31 21:30:30 +02:00
Philippe Teuwen 045eda93e9 t55xx config: allow to toggle on/off i/q5/st 2019-03-31 19:42:36 +02:00
Philippe Teuwen e88fa75fd0 Revamped t55xx info: support offline block0, Q5, fix extended, add warns etc 2019-03-31 19:06:36 +02:00
Philippe Teuwen 43ca641939 Flasher: Avoid race condition when flasher finds the not yet closed pm3 port 2019-03-31 12:15:49 +02:00
Philippe Teuwen 2080dd396d t55xx detection: remove Atmel as it can be others, see t55xx trace for real manufacturer 2019-03-31 01:18:00 +01:00
Philippe Teuwen 720c410278 Fix lf t55xx trace: read the correct block 2019-03-31 01:13:59 +01:00
Philippe Teuwen 9cec581f1c Makefile: remove WINBINS/WINEXES, ProxSpace doesn't use them 2019-03-29 09:49:42 +01:00
Philippe Teuwen db4aa08b78 make style 2019-03-28 14:19:41 +01:00
Philippe Teuwen 2ebada74f0 makefile: fix race condition, now we can make -j8 :) 2019-03-27 23:14:19 +01:00
iceman1001 5fd98db92d fix: LF FDX-B demod - more lenient with max errors. Thanks to @maltehillmann 2019-03-27 15:35:43 +01:00
vratiskol a068f7c2bc Mifare Sim 
Compilation OK
Emulation 1k OK with android
 2019-03-27 14:18:26 +01:00
vratiskol ee2dfc0852 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-27 08:00:35 +01:00
vratiskol ffe4a0289f Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-26 22:28:20 +01:00
mazodude 15fdb07737 Start key file for Mifare Ultralight 2019-03-27 08:21:06 +11:00
iceman1001 069e73d025 preparing for more descramble patterns. 2019-03-26 21:13:57 +01:00
iceman1001 fb665ea7e3 chg: textual 2019-03-26 20:22:39 +01:00
iceman1001 34f4ee4902 whitespace 2019-03-26 20:22:12 +01:00
iceman1001 54e8eafa49 fix: 'lf t55xx chk' 
fix: 'lf t55xx brute'
fix: 'lf t55xx recoverpwd'
 - now works like they should again.
 2019-03-26 20:21:10 +01:00
iceman1001 834832be31 chg 'lf t55xx brute' - AquireData returns isnoise, but a pwd protected card signa looks like noise. 2019-03-26 16:23:19 +01:00
iceman1001 9133a9164f chg: 'lf t55xx chk' - refactored to use loadDictionary 2019-03-26 16:18:40 +01:00
vratiskol 60ac8b8934 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-26 10:08:49 +01:00
iceman1001 52be3f4fe5 chg: 'lf indala clone' - differnt input parms. '-L' gives a long UID. 
chg: 'lf indala demod' - tries to descramble parts,  and detection is changed.  Still issues with PSK2..
 2019-03-26 09:09:43 +01:00
vratiskol 04c14d1931 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-25 15:51:21 +01:00
iceman1001 68fc65a8c5 chg: 32bits binary strings used as default 2019-03-25 14:41:28 +01:00
iceman1001 6bc3ab1e44 chg: some pwd from forum 2019-03-25 14:39:49 +01:00
iceman1001 800bce865d fix: sprint_bin_break doesn't skip bits when newline printing 2019-03-25 14:39:09 +01:00
vratiskol cffb8cbca4 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-25 00:16:40 +01:00
Philippe Teuwen fe740fabfd cmdlfhid: comment unused struct 2019-03-25 00:04:28 +01:00
Philippe Teuwen 59cf25640f cmdhf14a: Fix usage of sizeof on a uint16_t array 2019-03-24 23:52:00 +01:00
Philippe Teuwen 7936626725 cmdanalyse: use byte arrays 2019-03-24 23:36:45 +01:00
vratiskol 0d5173739c Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-24 22:53:04 +01:00
Philippe Teuwen 9d1aa3fb96 fgpa_compress: dealloc responsibility to main and add missing one 2019-03-24 22:26:49 +01:00
Philippe Teuwen eb3f5e12eb Fix memleak in fpga_compress 2019-03-24 22:20:58 +01:00
Philippe Teuwen 19588b045f Fix realloc mistake: ptr nulled but not freed upon failure 2019-03-24 22:09:25 +01:00
iceman1001 44c3a0a8aa chg: 'lf keri demod' - added stopbits 2019-03-24 19:50:53 +01:00
iceman1001 08dc8ab695 debug 2019-03-23 19:09:37 +01:00
iceman1001 cfb11adeb8 simple check 2019-03-23 19:08:22 +01:00
iceman1001 55b8b8df82 fix: 'lf pyramid demod' - inverted 
chg: checksum colors
 2019-03-23 19:06:52 +01:00
vratiskol 3b06c9d8ee Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-21 20:46:56 +01:00
iceman1001 ca9061bd32 changed byte_t -> uint8_t 2019-03-21 15:19:18 +01:00
vratiskol e26677f841 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-21 14:45:08 +01:00
iceman1001 ffdd91cab6 add: 'hf 14a info' - uid changeable tests, finds two kinds of Gen2 / CUID. 4byte / 7byte but there other Gen2 cards which will not be detected by this. 2019-03-21 12:53:05 +01:00
vratiskol f42dd2590e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-20 23:42:00 +01:00
iceman1001 b111b37eb6 offline access 2019-03-20 22:05:29 +01:00
iceman1001 2534d02000 text 2019-03-20 22:04:35 +01:00
vratiskol 28d7b99e1b Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-20 15:59:11 +01:00
iceman1001 3c32fa9f38 color 2019-03-20 12:37:10 +01:00
vratiskol cb895fb8ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 21:15:54 +01:00
iceman1001 8e465d076c chg: use found clock is common 2019-03-19 17:53:42 +01:00
vratiskol 49f0b35ffd Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 16:48:45 +01:00
iceman1001 ab226c2864 detectST has better clock detection. Since 'data raw am' fails but 'data detect a' succeed in finding a clock. Lets see if anything else breaks because of this? 2019-03-19 10:20:10 +01:00
vratiskol 1e20316cee Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 02:07:22 +01:00
iceman1001 f79c0075c4 style 2019-03-19 00:12:46 +01:00
iceman1001 e3dbbd3271 style 2019-03-19 00:11:32 +01:00
iceman1001 fb9d34447e style 2019-03-18 23:59:35 +01:00
iceman1001 690400d145 style 2019-03-18 23:57:44 +01:00
iceman1001 b7b7840ae1 bool 2019-03-18 23:57:00 +01:00
iceman1001 b8c5faee92 style 2019-03-18 23:55:53 +01:00
iceman1001 2276779b01 style 2019-03-18 23:55:39 +01:00
vratiskol efa03a1e55 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 23:52:39 +01:00
iceman1001 122807148c style 2019-03-18 23:49:51 +01:00
iceman1001 26804cb85f style 2019-03-18 23:48:40 +01:00
iceman1001 fd198b0048 mem leaks 2019-03-18 23:46:26 +01:00
iceman1001 35592b979d unsigned long long 2019-03-18 23:43:44 +01:00
iceman1001 b57c2d5935 reverting.. 2019-03-18 23:31:04 +01:00
vratiskol 3c96440215 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 22:49:42 +01:00
iceman1001 7344d9128f style 2019-03-18 22:35:33 +01:00
iceman1001 e26e666734 style 2019-03-18 22:31:31 +01:00
iceman1001 93a91454f9 style and fixes 2019-03-18 22:30:13 +01:00
vratiskol c08c14656b Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 22:26:57 +01:00
iceman1001 17f5df152b style 2019-03-18 22:16:05 +01:00
iceman1001 b9cbc5cb7f bad logic 2019-03-18 22:14:07 +01:00
iceman1001 580159ed97 mem leak 2019-03-18 22:11:31 +01:00
iceman1001 4288e9db73 style 2019-03-18 22:04:53 +01:00
iceman1001 524ed17894 styles 2019-03-18 21:56:44 +01:00
iceman1001 38b24d94ba mem leaks 2019-03-18 21:53:57 +01:00
vratiskol c2c4aac7ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 21:51:29 +01:00
iceman1001 910b5f31c2 null terminated 2019-03-18 21:49:15 +01:00
iceman1001 1b48948486 clear 2019-03-18 21:45:06 +01:00
iceman1001 4fdbe9c3b2 chg: 'hf mf hard' - negativ comparison 
style
 2019-03-18 21:29:35 +01:00
iceman1001 aafa627095 style 2019-03-18 21:26:02 +01:00
iceman1001 52b90d3d6b bad comparission 2019-03-18 21:24:10 +01:00
iceman1001 dce51f34ed style 2019-03-18 21:21:15 +01:00
iceman1001 7deb99b999 realloc check? 2019-03-18 20:35:03 +01:00
iceman1001 20019b14ee style 2019-03-18 20:34:00 +01:00
iceman1001 5350f871ff style 2019-03-18 20:29:18 +01:00
iceman1001 4f88d7105f style 2019-03-18 20:24:09 +01:00
iceman1001 3727abd28c style 2019-03-18 20:17:24 +01:00
iceman1001 6889489555 uninit? 2019-03-18 20:02:00 +01:00
iceman1001 9e6b109856 string formatter 2019-03-18 20:01:17 +01:00
iceman1001 1d14c497b7 swapping order 2019-03-18 17:53:46 +01:00
iceman1001 cc9a99ed57 string formats 2019-03-18 17:46:52 +01:00
iceman1001 3e26b564cd nameing stuff 2019-03-18 17:42:49 +01:00
iceman1001 c8c9a69e3e unsigned value cant be less than zero 2019-03-18 16:59:21 +01:00
iceman1001 2a6be74fd1 fix: operations inside macro expansion 2019-03-18 16:57:41 +01:00
iceman1001 e92977f4bd Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-03-17 13:53:38 +01:00
iceman1001 c9cb16d428 fix: mfkey32, cut and paste error? 2019-03-17 13:51:47 +01:00
Iceman 9f9ee2f1fd
Update ntag_3d.lua 2019-03-16 11:22:36 +01:00
iceman1001 5583cfbc70 chg: 'lf search' - text 2019-03-16 11:07:49 +01:00
Philippe Teuwen 4632cc0203 typo 2019-03-16 10:50:01 +01:00
iceman1001 1fcd0f66c5 fix: null check 2019-03-16 07:31:13 +01:00
iceman1001 c83b2e7fff fix: null check 2019-03-16 07:31:00 +01:00
iceman1001 3efa05060e chg: update reveng v1.6.0 -> v1.6.2 2019-03-16 07:18:58 +01:00
Philippe Teuwen a856ad638c Adjust mifare_autopwn to latest hf mf dump 2019-03-16 01:35:34 +01:00
Philippe Teuwen f51e6fbad2 fix double free 2019-03-16 01:26:15 +01:00
iceman1001 35da3707d3 fix: 'hf iclass decrypt' - use after free 2019-03-15 22:07:21 +01:00
iceman1001 48a28fa575 fix: mem leaks 2019-03-15 22:05:36 +01:00
vratiskol cfe2b2797e Revert "Merge branch 'master' into hf_mf_sim" 
This reverts commit cbea5d9d02, reversing
changes made to b66152feb2.
 2019-03-15 21:45:00 +01:00
vratiskol cbea5d9d02 Merge branch 'master' into hf_mf_sim 2019-03-15 21:17:44 +01:00
vratiskol 6a52b6074f Sync from Upstream 2019-03-15 21:17:07 +01:00
vratiskol 64c3ae8b34 hf mf sim 2019-03-15 21:04:25 +01:00
iceman1001 f0d5b79abb chg: 'lf hitag reader' - more output 2019-03-15 20:10:17 +01:00
iceman1001 24df97b09b chg; remove compiler warning 2019-03-15 10:00:47 +01:00
Philippe Teuwen 2d2b128754 make style 2019-03-15 09:18:07 +01:00
iceman1001 b6f80e075b textual 2019-03-15 02:05:44 +01:00
iceman1001 e3127f7440 fix: 'hf 14b raw -t' - a bit messed up 2019-03-15 02:05:15 +01:00
iceman1001 c143f79e65 chg: 'sc upgrade' - verify firmware file integrity with sha512 validation (@piwi) 2019-03-15 01:54:43 +01:00
iceman1001 248135682c mix in proxmark code.. 2019-03-15 00:40:29 +01:00
iceman1001 bf99a181a8 free? 2019-03-15 00:32:50 +01:00
Philippe Teuwen 9b3cc10e0b fix Coverity string overflow 2019-03-15 00:27:26 +01:00
iceman1001 8f78c9d45e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-03-15 00:22:15 +01:00
iceman1001 f760677e32 overflow 2019-03-15 00:21:43 +01:00
Philippe Teuwen b538a67ba3 make style 2019-03-15 00:20:42 +01:00
Philippe Teuwen 2f2dfd6239 remove debug line 2019-03-15 00:19:18 +01:00
Philippe Teuwen f1a0e57f65 binarraytohex: handle Manchester wrong bit markers 2019-03-15 00:09:40 +01:00
iceman1001 da5ad8438c textual 2019-03-14 23:31:33 +01:00
iceman1001 5c3f12ee43 chg: 'lf hitag info' - added printing of configuration byte. (work-in-progress) 2019-03-14 23:30:45 +01:00
osboxes.org 9c2736d1eb spaces 2019-03-14 12:30:32 +01:00
iceman1001 71160ddbca fiddling 2019-03-14 11:34:32 +01:00
iceman1001 55f4942ab7 text 2019-03-14 11:30:49 +01:00
iceman1001 b65dc0a4c8 text 2019-03-14 11:29:50 +01:00
iceman1001 cbab48659e fix: 'lf hitag sim' - mem leaks 
fix: 'lf hitag cc' - mem leaks
 2019-03-14 11:20:44 +01:00
iceman1001 1f8040596f fix: 'hf 15 dump f' - now also selects card 2019-03-14 10:23:58 +01:00
iceman1001 e5a71fdd26 fix: 'hf iclass clone' - missing fclose 2019-03-14 10:01:07 +01:00
iceman1001 15020ffaa2 add: 'lf hitag info' - added a skeleton function. Needs to gather and print tag information. 2019-03-14 08:30:20 +01:00
iceman1001 7d88c22aaf chg: added limit check for loadfile 
rename: 'lf hitag checkchallenges'  ->  'lf hitag cc'
chg: 'lf hitag checkchallenges' - refactored, added helptext
 2019-03-14 08:24:49 +01:00
iceman1001 e4a9e348d6 chg: 'lf hitag list' - now uses the generic list. 2019-03-14 07:42:48 +01:00
iceman1001 2c44136913 chG: 'trace list hitag' - started to unify hitag2/S annotation 2019-03-13 23:05:45 +01:00
iceman1001 5608df9771 chg: refactored away hitag logtrace. 2019-03-13 22:48:51 +01:00
iceman1001 e3afad8758 CHG: 'lf hitag sim' - now loads from BIN/EML/JSON. Also merged it with 'lf hitag simS', which is removed. 2019-03-13 20:16:11 +01:00
iceman1001 072e83bc49 chg: 'lf hitag reader' - now support json format 2019-03-13 17:50:10 +01:00
iceman1001 b35ea2e352 chg: 'lf hitag writer' - refactored with timeouts etc. 
chg: 'lf hitag'  test without toggle mode enabled
 2019-03-13 16:44:32 +01:00
iceman1001 dda69c593a chg: 'lf hitag reader 21' - now save BIN/EML formats. 2019-03-13 16:31:34 +01:00
iceman1001 a117f06380 chg: refactoring of hitag (@piwi) 
chg:  refactoring of hitagS (@iceman)
 2019-03-13 12:18:37 +01:00
Philippe Teuwen d9308d912d fix: shifting signed 32-bit value by 31 bits is undefined behaviour 2019-03-13 00:07:40 +01:00
Philippe Teuwen 98ff923d61 fix more strncat usage (one must specify available room, not total dest buffer size) 2019-03-12 22:06:37 +01:00
iceman1001 33f9af9619 chg 'data AutoCorrelate' - adjust the manual limit to 4% 2019-03-12 20:50:44 +01:00
iceman1001 1d63258388 add: 'hf 14b raw' - added -t timeout option. see https://github.com/RfidResearchGroup/proxmark3/issues/125 2019-03-12 14:41:23 +01:00
iceman1001 35bc4a975e rename SNOOP -> SNIFF 2019-03-12 13:15:39 +01:00
iceman1001 77693521df rename idteck 2019-03-12 12:56:59 +01:00
iceman1001 a35025f33f rename snoop -> sniff 2019-03-12 12:56:39 +01:00
Philippe Teuwen 1b2601a48a Add missing EOF LF 2019-03-12 00:12:26 +01:00
Philippe Teuwen 346af6e3d1 make style 2019-03-11 23:12:31 +01:00
merlokk f24d7c4ba1 fix mfp wrbl command 2019-03-11 18:02:42 +02:00
iceman1001 fd642e8f51 adjustemnts 2019-03-11 15:08:34 +01:00
iceman1001 ff22f0ca7a rename: 
'lf snoop' -> 'lf sniff'
 'hf snoop' -> 'hf sniff'

As of now its gonna be called sniffing everywhere in the repo.
chg: 'lf search' textual
chg: 'hf search' textual
 2019-03-11 14:55:02 +01:00
iceman1001 eb906859b5 fix: 'lf ti demod' - hide debug messages 2019-03-11 07:38:20 +01:00
Philippe Teuwen 119e3f0ed9 Makefile: allow alternative platforms, try make PLATFORM=foo 2019-03-11 00:44:34 +01:00
iceman1001 7f26ed6e9f chg: 'lf hitag reader' - helptext 2019-03-10 14:44:21 +01:00
iceman1001 7921e363b0 output 2019-03-10 14:42:43 +01:00
Philippe Teuwen 73437dea62 Makefile: avoid compiling hardnested multiarch stuff systematically 2019-03-10 12:22:02 +01:00
Philippe Teuwen 21e6f2d861 jansson, tinycbor, mbedtls: avoid recompilations if not needed 2019-03-10 11:42:38 +01:00
Philippe Teuwen 2f12e57408 Makefiles: remove spurious spaces/tabs 2019-03-10 11:35:03 +01:00
Philippe Teuwen 961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen da6cdf014b Keep string syntax in color macros 2019-03-10 00:56:00 +01:00
Philippe Teuwen 48124f89b4 fix ‘sprintf’ output between 15 and 19 bytes into a destination of size 18 2019-03-10 00:24:29 +01:00
Philippe Teuwen 22b43c65ec fix warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘size_t’ {aka ‘long unsigned int’} 2019-03-10 00:11:39 +01:00
Philippe Teuwen 554011f828 Fix warning: ‘strncpy’ output truncated before terminating nul copying as many bytes from a string as its length 2019-03-10 00:09:46 +01:00
Philippe Teuwen 0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen 0d9223a547 client: fix mix of spaces & tabs 2019-03-09 23:35:06 +01:00
iceman1001 112411042f cleaning up 2019-03-09 21:59:00 +01:00
iceman1001 38503b55d5 chg: cleanup 2019-03-09 21:43:03 +01:00
iceman1001 902a5f06ff chg: 'lf search' - added TI detection 2019-03-09 21:42:40 +01:00
iceman1001 e8d15d0c18 FIX: 'data load' - now loads large files again (TITEST.txt) 2019-03-09 20:47:57 +01:00
iceman1001 9ebf3f4f6d chg: use bool instead 2019-03-09 20:34:20 +01:00
iceman1001 89db6064d0 fix: 'lf paradox demod' - wrong check 2019-03-09 17:25:53 +01:00
iceman1001 6d364ec70d chg: 'data detectclocks' - skip if isnoise 2019-03-09 14:00:46 +01:00
iceman1001 aebfe193dc chg: 'data raw' - skip if signal is noise 2019-03-09 13:54:03 +01:00
iceman1001 45e8403d4d fix: 'lf t55' - aquiredata uses getsamples 2019-03-09 12:54:39 +01:00
iceman1001 cc81b5bed9 fix: tolower 2019-03-09 12:31:29 +01:00
iceman1001 6b9e5e0400 chg: unified code 2019-03-09 11:36:05 +01:00
iceman1001 d998602690 textual 2019-03-09 11:31:53 +01:00
iceman1001 cc9ec2d79c textual 2019-03-09 11:30:26 +01:00
iceman1001 e093d1ab29 Adds colors, etc 2019-03-09 11:29:34 +01:00
iceman1001 dc36bd5e5a fix: 'lf CheckChipType' - restores demodbuff/graphbuf properly 2019-03-09 11:13:46 +01:00
iceman1001 59eb83bf90 fix: use defines instead. 2019-03-09 11:10:54 +01:00
Philippe Teuwen 2d1a077ae4 lua: more fix mix of spaces & tabs 2019-03-09 10:40:45 +01:00
Philippe Teuwen 05ff45e550 lua: fix mix of spaces & tabs 2019-03-09 10:34:43 +01:00
Philippe Teuwen bdd0494290 remove spurious spaces & tabs at end of lines: cpp files 2019-03-09 09:11:08 +01:00
Philippe Teuwen 60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
Philippe Teuwen edc19f202a Convert the few files with still Windows carriage returns 2019-03-09 08:49:41 +01:00
Philippe Teuwen d8788bb376 appease coverity 2019-03-09 08:43:28 +01:00
Iceman 17435d366f
Merge pull request #122 from RfidResearchGroup/computeSignalProperties 
Replace isNoise by computeSignalProperties and removeSignalOffset
 2019-03-09 08:35:37 +01:00
iceman1001 810f92dbab FIX: 'lf visa read' - increase samples solves #123 2019-03-09 08:29:37 +01:00
iceman1001 1cf3e1b581 fix: 'lf visa' - use defines instead 2019-03-09 08:14:42 +01:00
Philippe Teuwen 1cba26decf remove redundant removeSignalOffset 2019-03-08 20:30:54 +01:00
Philippe Teuwen ae719c3b05 Fix CmdT55xxBruteForce infinite loop 2019-03-08 20:10:16 +01:00
Philippe Teuwen abddff513e loadFile: fix double free 2019-03-08 19:49:12 +01:00
Philippe Teuwen 4160e32b0a Replace isNoise by computeSignalProperties and removeSignalOffset 2019-03-08 19:06:55 +01:00
iceman1001 9764381aa4 fix: ndef - missing comma 2019-03-08 17:25:36 +01:00
Chris 2a761e80db chg: analyse nuid' - added colors 2019-03-07 19:48:20 +01:00
Philippe Teuwen 259a561a69 analyse nuid: better ref and selftest from ref + little fix 2019-03-07 15:55:53 +01:00
Philippe Teuwen c5e1f9989c analyse nuid: fix crc -> selftest ok now 2019-03-06 20:16:12 +01:00
merlokk cfcdbcdcee added some checks into madcheck 2019-03-06 00:50:12 +02:00
merlokk 05f5fb3e47 del verbose on warning 2019-03-06 00:43:59 +02:00
Philippe Teuwen 4dfcb727af cmds history: don't push to history if last command is replayed 2019-03-05 21:15:54 +01:00
Philippe Teuwen 581043bc90 Look for aidlist.json in the client dir 2019-03-05 20:33:18 +01:00
Oleg Moiseenko 8302751db7
Merge pull request #112 from merlokk/ndef_tlv 
Ndef reading for and mfp
 2019-03-05 19:58:28 +02:00
merlokk 2e8771d7a3 added hf mf ndef 2019-03-05 19:57:08 +02:00
merlokk 53e0d03098 ndef cert right decode. 
https://github.com/skjolber/ndef-tools-for-android/blob/master/ndeftools/src/org/ndeftools/wellknown/SignatureRecord.java
https://github.com/nfcpy/ndeflib/blob/master/src/ndef/signature.py
 2019-03-05 19:41:50 +02:00
merlokk 04a6a63427 rename 2019-03-05 18:43:12 +02:00
merlokk 581fe408ba ndef sig decoding 2019-03-05 18:14:30 +02:00
merlokk a2be59db25 URI decode 2019-03-05 17:50:51 +02:00
merlokk c7c97d35b5 some code to decoding payload 2019-03-05 17:25:11 +02:00
merlokk 7003783c08 refactoring 2019-03-05 16:43:13 +02:00
merlokk fffa921aa0 ndef record decode OK 2019-03-05 16:41:20 +02:00
Iceman 5228cb5338
Merge pull request #110 from mazodude/master 
Delete MAD script as merlokk has implemented it
 2019-03-05 04:39:06 +01:00
merlokk 34a133451e small addon 2019-03-05 01:02:54 +02:00
merlokk 3bf618ca56 log structure 2019-03-05 00:54:45 +02:00
merlokk 64a5b355b5 added ndef record parse sketch 2019-03-05 00:51:32 +02:00
merlokk a2f8f0628c added ndef tlv parsing 2019-03-05 00:48:02 +02:00
merlokk 0a30e03aaf add header 2019-03-05 00:13:01 +02:00
merlokk cbe25f4832 add ndef.c/h 2019-03-05 00:11:31 +02:00
mazodude 760cd7b87c Delete MAD script as merlokk has implemented it 2019-03-05 08:36:04 +11:00
mazodude fef7e78957 Merge remote-tracking branch 'upstream/master' 2019-03-05 08:35:03 +11:00
sh7d 59bae84531 Mifare mad - do not exit if checksum is shitty 2019-03-04 22:12:10 +01:00
Philippe Teuwen 0944a12744 Add missing header 2019-03-04 20:27:57 +01:00
merlokk e191219d8a reading NDEF data from card 2019-03-04 20:22:25 +02:00
merlokk 54e8196774 hf mfp ndef sketch 2019-03-04 20:04:24 +02:00
merlokk 9c8e60cf03 added to hf mf mad 2019-03-04 19:44:19 +02:00
merlokk f45c330843 small visual fixes 2019-03-04 19:25:13 +02:00
merlokk 2c07bb790c hf mfp mad read contents by aid 2019-03-04 19:18:44 +02:00
Chris dcdb2ee218 fix: 'script run ndef_dump.lua' - move function 2019-03-01 19:24:02 +01:00
Chris 11f86c2d95 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-03-01 19:08:08 +01:00
merlokk ee9daac029 Merge branch 'master' of github.com:merlokk/proxmark3i into mf_mad 
# Conflicts:
#	client/cmdhfmf.c
#	client/mifare/mifarehost.c
 2019-03-01 19:37:43 +02:00
merlokk 3a98c9fcd3 fix mad2 crc8 check 2019-03-01 19:13:59 +02:00
merlokk 979aa678ad small fix 2019-03-01 19:07:34 +02:00
merlokk 5cc4bea4e3 mfp refactoring 2019-03-01 19:05:51 +02:00
merlokk 6208a6869c added mad decode for mfp 2019-03-01 18:50:25 +02:00
merlokk 4d79ced1a9 ашчуы шт ьфвюс 2019-03-01 18:49:53 +02:00
Chris ef2fc5b66c fix: 'hw tune' - reset demodplot line and grid clock 2019-03-01 12:09:35 +01:00
iceman1001 d73c501ffa another 2019-02-26 22:27:33 +01:00
Chris 8f05aa6fcf Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-02-25 22:34:30 +01:00
Chris c2046f2e65 CHG: 'hf mf dump' - now saves in BIN/EML/JSON default 
CHG: 'hf mf esave' - now saves in BIN/EML/JSON default
 2019-02-25 22:33:49 +01:00
iceman1001 8c6312e209 fix mem leaks 2019-02-25 19:10:37 +01:00
iceman1001 972f8590e0 fix dereference 2019-02-25 19:10:00 +01:00
iceman1001 56a75fbf0b fix: bad division 2019-02-25 19:03:31 +01:00
iceman1001 d6bb8d630a fix: strings 2019-02-25 19:03:14 +01:00
3ldidi94 d929f31eb3
Update default_iclass_keys.dic 2019-02-25 18:52:44 +01:00
iceman1001 64bae8c8be fix: 'data detectclock' - now prints clock again... 2019-02-25 15:07:31 +01:00
Chris 711d384e7d chg: 'data autocorrelate g' - visual with gridclock patter and markup of two tops. Also added a "visual" inspection of peaks with 3% tolerance. This increases usability quite much. 2019-02-25 12:44:21 +01:00
iceman1001 a8eb0fd05f colors 2019-02-25 00:38:48 +01:00
iceman1001 a4ecc6d3ce colors 2019-02-25 00:32:59 +01:00
iceman1001 e3a0594b98 colors 2019-02-25 00:31:00 +01:00
iceman1001 7945b5a805 colors 2019-02-25 00:15:39 +01:00
iceman1001 ae4e3b72af chg: colors 2019-02-25 00:10:02 +01:00
iceman1001 bd26794c20 revert 2019-02-24 23:57:04 +01:00
iceman1001 2b9eb401fa fix: more checks 2019-02-24 23:54:36 +01:00
iceman1001 142b3d8de5 fix: assign 2019-02-24 23:54:24 +01:00
iceman1001 0803e532cc fix: 'hf felica list' - string overflows 2019-02-24 23:51:23 +01:00
iceman1001 3d84e4dc03 fix: dead code 2019-02-24 23:43:35 +01:00
iceman1001 2e3694aa3b fix: 'trace list' - missing break 2019-02-24 23:40:11 +01:00
iceman1001 34a17f842d fix 2019-02-24 22:34:14 +01:00
iceman1001 da9c662b23 text 2019-02-24 22:31:24 +01:00
iceman1001 157e08f51d fix: mem leaks 2019-02-24 22:17:36 +01:00
iceman1001 f59e67c00c fix: possible overrun 2019-02-24 21:42:30 +01:00
iceman1001 528e8fe395 fix: clock can't be zero or negative 2019-02-24 21:21:56 +01:00
iceman1001 a0e061fcd1 fix: rearrange it 2019-02-24 20:11:05 +01:00
iceman1001 17fcd8c24b fix: possible bad null ref 2019-02-24 20:00:41 +01:00
iceman1001 c650c23856 fix: 'lf flexdemod' - bad types 2019-02-24 19:57:57 +01:00
iceman1001 47c808fd5c fix: check return value 2019-02-24 19:50:24 +01:00
iceman1001 a49b3763dd fix: bad check 2019-02-24 19:50:05 +01:00
iceman1001 aaac99fdee fix: 'hf mf csave' unused code 2019-02-24 19:46:09 +01:00
iceman1001 f58c47a7b8 cleanup 2019-02-24 19:38:16 +01:00
iceman1001 01cf818e48 remove a warning 2019-02-24 19:32:14 +01:00
iceman1001 8e01c9899f aaaaaa 2019-02-24 18:31:59 +01:00
iceman1001 6b1ae818a5 fix: bad break.. 2019-02-24 18:27:56 +01:00
iceman1001 7b9a5eb7e3 text 2019-02-24 17:32:01 +01:00
iceman1001 a47085a7b4 text 2019-02-24 17:30:55 +01:00
iceman1001 4b7f6089ae text 2019-02-24 17:30:05 +01:00
iceman1001 95f8a48b56 text 2019-02-24 17:28:54 +01:00
iceman1001 e2d253f641 text 2019-02-24 17:25:55 +01:00
iceman1001 92631bdfb4 text 2019-02-24 17:25:47 +01:00
iceman1001 4b0f13a2e4 text 2019-02-24 17:25:40 +01:00
iceman1001 528ffd9e66 text 2019-02-24 17:23:33 +01:00
iceman1001 63659fd352 text 2019-02-24 17:22:03 +01:00
iceman1001 b22189b415 text 2019-02-24 17:11:59 +01:00
iceman1001 7de440a8a0 text 2019-02-24 17:10:30 +01:00
iceman1001 8b33d45016 fix 2019-02-24 17:08:58 +01:00
iceman1001 f750ddb2c8 text 2019-02-24 17:06:46 +01:00
iceman1001 e0579223f0 text 2019-02-24 16:48:54 +01:00
iceman1001 c310640b03 fix: 'lf jabltron clone' - wrong number of blocks 2019-02-24 16:47:43 +01:00
iceman1001 8ddf03b302 text 2019-02-24 16:43:48 +01:00
iceman1001 49ba544190 fix: 'lf search' - indala wrong identified 2019-02-24 15:33:34 +01:00
iceman1001 9f26c0d6b7 text 2019-02-24 15:29:28 +01:00
iceman1001 69b691494d text 2019-02-24 15:26:31 +01:00
iceman1001 cc2c440683 chg: 'lf search' - colors 2019-02-24 15:16:57 +01:00
iceman1001 8551f811ca colors 2019-02-24 15:13:31 +01:00
iceman1001 730304ca92 texts 2019-02-24 15:10:19 +01:00
iceman1001 7bbb2cdb9d chg: 'lf t55xx chk' - logic params. 
chg: colors
 2019-02-24 15:07:41 +01:00
iceman1001 38262389fc chg: colors 2019-02-24 14:58:22 +01:00
iceman1001 cea5b5214d chg: colors 2019-02-24 14:51:21 +01:00
iceman1001 0daf7f8b40 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-02-24 14:39:55 +01:00
iceman1001 8cc9cc312f chg... names names..sigh 2019-02-24 14:39:20 +01:00
iceman1001 1c2dea29bb chg 2019-02-24 14:38:33 +01:00
iceman1001 730b4940f8 chg: 'lf keri sim' - is kind of up, *untested* 2019-02-24 11:14:51 +01:00
iceman1001 9f10ff6e17 sugar 2019-02-24 10:26:55 +01:00
iceman1001 a07dcf7924 chg: 'lf keri clone' - correct config block (use extended modes bit rates) 2019-02-24 10:25:53 +01:00
iceman1001 fe9c65b65f chg: 'lf keri clone' - now works 2019-02-23 17:19:34 +01:00
iceman1001 d1c22d0800 fix: 'lf keri demod' - proper demod now 2019-02-23 16:29:00 +01:00
iceman1001 dc0dc7b00a chg: cleanup 2019-02-23 16:05:24 +01:00
iceman1001 92b1f41793 revert chg, double free... 2019-02-23 16:02:44 +01:00
iceman1001 e0bf2e3fbf chg: 'lf search' - hooked up Keri detection 2019-02-23 15:56:11 +01:00
Iceman 1ad139ae6e
Merge pull request #101 from sh7d/fix-em41-spoof 
em41 - spoof fix
 2019-02-23 15:50:43 +01:00
iceman1001 f5f6f5d916 chg: linking in keri 2019-02-23 15:47:37 +01:00
iceman1001 2dc3bc6af3 ADD: 'lf keri' - basic commands. 2019-02-23 15:44:34 +01:00
sh7d c58f487cab em41 - spoof fix 2019-02-23 15:24:51 +01:00
iceman1001 22510b6f22 CHG: cleanups 2019-02-23 14:15:54 +01:00
merlokk 20be5c5d9f some of MAD2 code 2019-02-22 19:58:50 +02:00
merlokk 5122e1289d info-byte 2019-02-22 18:24:22 +02:00
merlokk 91ed51c673 add comment 2019-02-22 18:06:37 +02:00
merlokk 8010f2dc5e MAD1 OK 2019-02-22 18:05:45 +02:00
iceman1001 1b64c4cb63 fix: overflow was possible since 1000 is type long 2019-02-22 15:23:09 +01:00
iceman1001 140c327cc2 CHG: 'hf mf list' - readded it. calls trace list mf in the back 2019-02-22 09:43:03 +01:00
iceman1001 954e01c363 fix: bad loop 2019-02-21 23:38:07 +01:00
iceman1001 697af67bf1 fix: 'hf 14b info' - missing break 2019-02-21 23:37:18 +01:00
iceman1001 7ea7061ed0 fix: 'hf mf cload' - wrong free 2019-02-21 23:22:39 +01:00
iceman1001 b11f767c55 fix: 'lf em brute' - mem leak 2019-02-21 23:22:13 +01:00
iceman1001 c980ae109a fix: 'lf gprox' - wrong check value 2019-02-21 23:21:39 +01:00
iceman1001 09791638c8 fix: 'lf indala' - wrong number of bits 2019-02-21 23:21:13 +01:00
iceman1001 421604a395 fix: sc bruteforce' - wrong assign 2019-02-21 23:20:52 +01:00
merlokk 01c9325469 check MAD crc 2019-02-21 20:06:53 +02:00
merlokk b9dc841bf9 MAD. print GPB 2019-02-21 19:44:07 +02:00
merlokk db7580203b create mad.c/h 2019-02-21 19:34:12 +02:00
merlokk 3b21b17509 move mifare stuff to its folder 2019-02-21 19:15:46 +02:00
iceman1001 6d63b3fbed fix: mem leaks. 2019-02-21 16:17:49 +01:00
iceman1001 de317d9f48 fix: mem leaks. 2019-02-21 15:39:36 +01:00
iceman1001 91d6836a47 fix: mem leaks. 2019-02-21 15:34:31 +01:00
iceman1001 06ade9970a FIX: mem leaks 
FIX: 'hf mf nested' - params
 2019-02-20 22:29:39 +01:00
merlokk 1675b10c00 small fix 2019-02-20 21:15:44 +02:00
merlokk 583b732268 add hf mf mad command 2019-02-20 21:12:50 +02:00
merlokk f2b600e6e9 add keys for mad and ndef 2019-02-20 21:12:28 +02:00
merlokk 54ade5df94 add read sector code 2019-02-20 21:12:06 +02:00
merlokk 2c4db1ce7c check ATR length 2019-02-20 19:37:30 +02:00
Oleg Moiseenko d589e9cd45
Merge pull request #98 from merlokk/typ1 
typo
 2019-02-20 17:54:34 +02:00
merlokk 8ddedcb140 typo 2019-02-20 17:54:05 +02:00
merlokk 12582df976 fix macro 2019-02-20 16:05:32 +02:00
merlokk ed991e76b4 add print error if smart card functionality not defined 2019-02-20 16:04:08 +02:00
merlokk fe66f0fac4 added contact to emv scan 2019-02-20 15:52:26 +02:00
merlokk 8e199d4c9e add get ATR to cmdsmartcard 2019-02-20 15:51:55 +02:00
Oleg Moiseenko 200f44d94c
Merge pull request #96 from merlokk/p_err 
fix possible error
 2019-02-20 14:50:58 +02:00
merlokk d81478755e 2nd fix 2019-02-20 14:50:17 +02:00
merlokk 915c73bcfc fix possible error 2019-02-20 14:48:52 +02:00
Chris 3d7cf1e9b7 chg: text 2019-02-20 11:29:40 +01:00
merlokk e793fa8d73 fix tlvdb_get_uint8 2019-02-19 21:28:19 +02:00
merlokk 25d6a1274f small improvement 2019-02-19 21:19:45 +02:00
merlokk 56c9bcc03a added IAD decoding and some improvements 2019-02-19 21:15:54 +02:00
merlokk 26bca36929 delete comment 2019-02-19 18:39:05 +02:00
merlokk bebfcab7b9 Merge branch 'master' of github.com:merlokk/proxmark3i into emv_vsdc 2019-02-19 18:34:52 +02:00
iceman1001 72cf200df7 chg.... 2019-02-18 16:43:27 +01:00
iceman1001 b320ebca7c chg: textual 2019-02-18 16:39:39 +01:00
iceman1001 58f35d50a6 chg: textual 2019-02-18 16:32:13 +01:00
iceman1001 1e98c4621d chg: colors 2019-02-18 16:30:57 +01:00
iceman1001 5ec82a0dc4 chg: adjustments 2019-02-18 16:27:56 +01:00
iceman1001 a4f6701c85 chg: cleaning 2019-02-18 16:16:24 +01:00
iceman1001 0997c55800 chg: colors 2019-02-18 16:07:39 +01:00
iceman1001 38437a3916 chg: colors 2019-02-18 15:47:48 +01:00
iceman1001 fc1ed47d57 chg: more colors 2019-02-18 15:37:26 +01:00
iceman1001 23d0b6b1c6 chg: colors 2019-02-18 14:59:19 +01:00
iceman1001 e6c68645e3 chg: colors 2019-02-18 13:28:22 +01:00
iceman1001 20ccfb036c chg: more colors 2019-02-18 13:12:25 +01:00
iceman1001 06fc95b62d chg: 'hf mf fchk' - textual 2019-02-18 10:41:54 +01:00
iceman1001 cacba04959 chg: 'hf mf fchk' - better handling when no keys was found. 2019-02-18 10:38:49 +01:00
iceman1001 7e601e5285 chg: textual 2019-02-18 10:27:14 +01:00
iceman1001 e23d53adc1 chg: 'hf mf hardnested' - speedup for those with good cpus, triggering the bruteforce faster. 2019-02-17 16:48:14 +01:00
iceman1001 4ea05fc026 Fix: 'hf mf fchk' - now reports back correct found keys. 2019-02-17 15:56:45 +01:00
Iceman d6180309ae
Merge pull request #93 from vratiskol/master 
Use Variable for MIFARE_XXX_MAXSECTOR
 2019-02-15 18:19:18 +01:00
vratiskol 8e6b41f513 Use Variable for MIFARE_MINI_MAXSECTOR 
Modify type uint16_t => 256
 2019-02-15 15:17:28 +01:00
iceman1001 19cdedd9ec Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-02-15 12:38:53 +01:00
iceman1001 f8985ed1be chg: remove warning for overflow 2019-02-15 12:38:38 +01:00
Iceman 68797aee7e
Merge pull request #92 from vratiskol/master 
Update MAXBLOCK - MF 4K
 2019-02-15 10:53:13 +01:00
vratiskol 35df317a2c
Update MAXBLOCK - MF 4K 
- Modify MAXBLOCK size: 4k => 256
- Typo
 2019-02-15 01:08:30 +01:00
iceman1001 7934630d2b FIX: Makefile bad styled calls 2019-02-14 19:27:39 +01:00
osboxes.org cd44ea27b7 FIX: 'script run mifare_autopwn' - now doesn't crash 2019-02-04 22:16:12 +01:00
merlokk 7678ab13e0 add slolkey CA root 2019-02-03 22:36:15 +02:00
iceman1001 95db68fa30 FIX: scripts path needed for scripts to call other scripts. 2019-02-03 10:18:22 +01:00
iceman1001 77f4492433 fix: 'hf 15 write' - faulty string formatter token 2019-02-02 19:30:32 +01:00
Iceman 845496b625
Merge pull request #86 from merlokk/14a_apdu_send_framing2 
14a apdu send framing
 2019-02-01 20:02:20 +01:00
merlokk 029e75e866 formatting 2019-02-01 18:54:57 +02:00
merlokk 34bae8adcf add hf 14a chaining 2019-02-01 18:51:53 +02:00
merlokk 09c5f0ef76 remove debug and small output addon. errors was not visible 2019-02-01 18:12:01 +02:00
merlokk 673c080ea5 client part 2019-02-01 18:00:08 +02:00
iceman1001 5c231e772c chg: use calloc 2019-01-30 21:53:10 +01:00
iceman1001 ad72a424ef chg: use calloc 2019-01-30 21:40:50 +01:00
iceman1001 99b6087b01 chg: use calloc 2019-01-30 21:16:20 +01:00
iceman1001 e81b0fa355 chg: use calloc 2019-01-30 20:43:30 +01:00
iceman1001 ed7122e409 chg: use calloc 2019-01-30 20:21:41 +01:00
iceman1001 18db34ffb0 chg: use calloc 2019-01-30 20:18:50 +01:00
merlokk 30a6ef19b9 added FSC correct calculation in hf 14a info 2019-01-30 18:16:50 +02:00
iceman1001 c419f7bf37 CHG: dropfield when CL is used. 2019-01-29 15:42:31 +01:00
iceman1001 34be8b4d37 CHG: wrong iso7816 (@piwi) 2019-01-29 15:23:07 +01:00
iceman1001 fa3dfa59b9 chg: 'script run legic' - minor adjustments. 2019-01-26 19:10:29 +01:00
iceman1001 8059f533af syntax 2019-01-26 11:09:47 +01:00
iceman1001 f0b70d6a4b CHG: added manufacturers 2019-01-26 11:09:17 +01:00
iceman1001 f760ac99e3 chg: 'script run ndef_dump' - local functions 2019-01-26 10:40:37 +01:00
iceman1001 4fe4d74bfe FIX: 'emv roca' - not executing when client is compiled without WITH_SMARTCARD functionality, like for old devices 
see  https://github.com/RfidResearchGroup/proxmark3/issues/85
 2019-01-25 11:42:52 +01:00
iceman1001 5e13c7e588 ADD: Found a bunch more dictionary files, from a link on the forum. 2019-01-23 12:18:07 +01:00
iceman1001 61ebdbde6b CHG: adjusting compiling for older devices 2019-01-23 11:01:11 +01:00
iceman1001 0bec6038b7 CHG: adjusted compiling for older devices 2019-01-23 10:57:49 +01:00
Iceman e885ec737d
Update default_keys.dic 2019-01-22 12:03:53 +01:00
Iceman cf006a445f
Update default_keys.dic 
ADD:  more keys
 2019-01-22 11:55:04 +01:00
iceman1001 063feeae05 CHG: 'hf legic write' 
CHG: 'hf legic restore'
CHG: 'hf legic wipe' -  longer timeout for execution
 2019-01-21 22:12:43 +01:00
iceman1001 601cb0fe00 chg: 'hf legic dump' - longer timeout 2019-01-21 22:04:44 +01:00
Iceman 8ee857e4ba
Update tnp3clone.lua 2019-01-21 17:36:58 +01:00
iceman1001 7294262442 chg: 'script run iso15_magic' - added switch "-a" to swap between iceman styled vs offical styled iso15 raw commands. 
In order to run this script on official pm3 repo, you will need to copy this script and
/client/lualibs/read15.lua file.

Read help text for examples
script run iso15_magic -h
 2019-01-21 09:59:47 +01:00
iceman1001 fa889900c0 chg: calloc instead of malloc 
chg: textual
chg: extra size checks
chg: longer wait for reading mem
 2019-01-21 09:31:37 +01:00
iceman1001 66c82d16b0 chg: calloc calls 2019-01-21 09:02:00 +01:00
Iceman 5f2ecf67cd
Update default_pwd.dic 2019-01-21 00:02:33 +01:00
Iceman 6f3940b221
Update tnp3clone.lua 
Cleanup
 2019-01-20 23:55:11 +01:00
Iceman 6e99b1e49b
Update tnp3clone.lua 
Better to use default template for ST
 2019-01-20 23:53:54 +01:00
Iceman 49fc2a56ab
Update tnp3clone.lua 
According to post http://www.proxmark.org/forum/viewtopic.php?pid=34046#p34046
Set that ATQA / SAK,  set Sector 0 accessrights
 2019-01-20 23:46:03 +01:00
merlokk 6f0cc5fa7a small fix 2019-01-14 18:14:15 +02:00
iceman1001 46cbbe8d05 textual 2019-01-12 18:53:11 +01:00
iceman1001 fcfbeb6ac3 textual 2019-01-12 18:33:40 +01:00
iceman1001 f215ebef80 Refactored 'lf t55xx brute', split it up into two commands. 
- lf t55xx brute  (tries bruteforcing a range of pwds
- lf t55xx chk    (uses dictionary file or RDV4 flashmem)

FIX: adjust lf sim (@marshmellow42)  see 7008cf9c15
"attempt to speed up the loops waiting for carrier signal to go high or low
by only checking for a halt (button press or usbpol) every 256th loop
iteration. some users were experiencing modulating reactions to be too slow.

ADD: 'lf t55xx chk'
It uses @marshmellows42 idea behind commit  (6178b085a0)
With calculating a baseline (read block0 32times and average the signal-ish) and sampling only 1024 signal data. The algo then proceeds to calc the average and keep track of the candidate which is given the most difference in signal data average value.    I do some squaring and shifting for this.
The candidate is then send back to client to be tested properly with  trymodulation like before.

This seems to work good on t55xx card which has a ASK configuration.

WORK-IN-PROGRESS
 2019-01-11 14:46:27 +01:00
iceman1001 43d57855a0 CHG: wrong define 2019-01-11 12:56:59 +01:00
iceman1001 bd0e33fb58 chg: 'script run read_pwd_mem' - m|t|i params to simplify printing dictionary items 2019-01-10 18:55:56 +01:00
merlokk e058d87dc1 fix CDOL generation and add AC1 print result 2019-01-10 19:28:43 +02:00
merlokk eaedf7f811 VSDC up to CDOL2 calc 2019-01-10 18:33:21 +02:00
merlokk 628eceb5ed print fix 2019-01-10 17:44:51 +02:00
Oleg Moiseenko 7eb3e79d83
Merge pull request #81 from merlokk/emv_sdadda_fix 
Emv sdadda fix
 2019-01-10 17:27:29 +02:00
merlokk cada4e4877 DDA works 2019-01-10 17:24:45 +02:00
merlokk 607bef7ffd AC Response Format1 2019-01-10 16:22:32 +02:00
merlokk 70744d2cbb small fix 2019-01-10 13:26:15 +02:00
merlokk 8240639d73 fill VSDC with only AC1 2019-01-10 13:22:27 +02:00
merlokk 0ac728f0d4 VSDC path sketch 2019-01-10 13:06:56 +02:00
merlokk 56c0dad966 changes in cert decoding logic 2019-01-09 21:05:52 +02:00
merlokk 4921308d84 some changes in DDA 2019-01-09 21:03:56 +02:00
merlokk 20d29f35e5 SDA works 2019-01-09 19:32:08 +02:00
merlokk 506da60cad hash init 2019-01-09 18:47:26 +02:00
merlokk 88b2cf41de add description 2019-01-09 18:46:55 +02:00
iceman1001 e276bf1ce3 FIX: gcc8.1 warnings 2019-01-09 16:25:49 +01:00
merlokk 4a38ab7be4 small fix 2019-01-09 17:08:23 +02:00
merlokk 010492a87e input list build fixed 2019-01-09 17:04:21 +02:00
merlokk 4880316ab9 fix hash 2019-01-09 15:20:18 +02:00
iceman1001 96361abd97 FIX: supress gcc warnings like libjansson 
https://github.com/akheron/jansson/pull/423/files
 2019-01-09 12:28:56 +01:00
iceman1001 8f18a9abf2 CHG: tvl tag length adapted 2019-01-09 12:07:07 +01:00
iceman1001 d13541791b chg: tlvtag can be 4bytes.. 2019-01-08 20:20:16 +01:00
iceman1001 7bb8c629ba fix: remove warnings 2019-01-08 20:14:46 +01:00
RFID Research Group 4573f7b006
Merge pull request #80 from merlokk/emv_print_mode 
emv commands now prints channel
 2019-01-08 19:09:58 +01:00
merlokk 1fb7948623 emv commands now prints channel 2019-01-08 19:49:31 +02:00
merlokk ce6320cdc1 change sc apdu to be compatible with 14a apdu 2019-01-08 19:22:27 +02:00
iceman1001 11e0c09fdd CHG: more definitions 2019-01-08 16:48:04 +01:00
iceman1001 a17bf8e559 FIX: remove gcc8.2 warning 2019-01-08 11:20:42 +01:00
iceman1001 dac30911a3 FIX: remove gcc8.2 warnings 2019-01-08 10:56:56 +01:00
iceman1001 699a3b7152 FIX: remove overwriting warning 2019-01-08 02:23:06 +01:00
iceman1001 2d5d8c130d chg: 'hf list 14a' - another 7bit command 0x35 2019-01-08 02:22:41 +01:00
iceman1001 9b7089e71f FIX: remove warning of overwriting 2019-01-08 02:16:39 +01:00
Chris 5a34550ac5 CHG: printing 2019-01-07 17:49:09 +01:00
iceman1001 3ae871f534 CHG: 'hf 14a antifuzz' - original implementation by @asfabw, reworked a bit - WORK IN PROGRESS - 2019-01-07 09:32:16 +01:00
iceman1001 0dee369a58 FIX: 'hf tune' - now works... 2019-01-06 20:28:23 +01:00
iceman1001 806e5909a7 ADD: 'hf felica list' - updated annotation. 2019-01-06 19:41:29 +01:00
iceman1001 f99e6a5cae chg: remove warning 2019-01-06 19:19:30 +01:00
iceman1001 f08e471d2e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-01-05 20:45:54 +01:00
iceman1001 f23219f3b8 FIX: printing percentage char is now standard compliant (@fabled) 
see https://github.com/iceman1001/proxmark3/pull/272
 2019-01-05 20:45:02 +01:00
merlokk a86c6fa1a8 get rid of math.h ) 2019-01-03 21:00:07 +02:00
merlokk b5c2ccb78f pse/ppse works 2019-01-03 20:07:08 +02:00
merlokk 00d4393af4 tlv_get_uint8 2019-01-03 19:43:01 +02:00
merlokk 723298d00c added new tlv function 2019-01-03 19:42:40 +02:00
merlokk a5f8454168 added pse sfi files get 2019-01-03 13:41:28 +02:00
merlokk 0da07fe81c get SFI records 2019-01-02 19:31:06 +02:00
iceman1001 e3f4ef498f CHG: 'hf mf fchk' - textual 2019-01-02 12:11:49 +01:00
iceman1001 6e281a08ed CHG: 'hf mf fchk' - speed improvments by tweaking implementation. 
CHG: 'hf mf fchk' - can use dictionary from flashmem if one is uploaded. (faster)
 2019-01-02 11:52:13 +01:00
iceman1001 0fb0c35308 CHG: 'mem load' - the possibility to upload default_iclass_keys.dic, default_keys.dic, default_pwd.dic to predefined flashmemory sections. These will be used in pwd / key checking algorithms on device. 
CHG: 'script run read_pwd_mem.lua' - script now can print those uploaded dictionary files.

How to upload
pm3 --> mem load f default_iclass_keys i
pm3 --> mem load f default_keys m
pm3 --> mem load f default_pwd t

How to validate / view
PM3 -->scr run read_pwd_mem -o 237568 -k 8
pm3 -->scr run read_pwd_mem -o 241664 -k 6
pm3 -->scr run read_pwd_mem -o 245760 -k 4
 2019-01-01 18:01:40 +01:00
Chris 75d0b0b06f CHG: 'emv roca' - added selftest and textual layouts' 
DEL: removed unused old emv files
 2019-01-01 10:53:41 +01:00
Chris 0ddda8998e chg: added info 2019-01-01 10:15:27 +01:00
iceman1001 9e07a5c65a CHG: updated to RevEng v1.6.0 2018-12-31 15:46:32 +01:00
merlokk 690a8e604a updated licanse according to changes https://gist.github.com/robstradling/f525d423c79690b72e650e2ad38a161d#file-roca-c-L138 2018-12-29 00:31:10 +02:00
merlokk 3926874995 fix pse channels 2018-12-28 20:48:45 +02:00
merlokk 376ead028a added tests 2018-12-28 20:33:38 +02:00
merlokk 7401d51ebf roca works 2018-12-28 20:33:24 +02:00
merlokk e315328625 works 2018-12-28 20:06:18 +02:00
merlokk 44343d806f add some debug 2018-12-28 19:25:19 +02:00
merlokk 05814fbe75 added mpi print 2018-12-28 19:06:51 +02:00
merlokk f1cd108b1a move g_one to cycle 2018-12-28 18:09:20 +02:00
merlokk 5eafc491ec small add 2018-12-28 18:00:37 +02:00
merlokk 404f23ddbd small fix 2018-12-28 17:50:51 +02:00
merlokk 18225c7c7f some fix 2018-12-28 17:48:52 +02:00
merlokk 6afda099db added test/ not works 2018-12-28 17:46:57 +02:00
merlokk 625b696291 roca works 2018-12-28 17:25:11 +02:00
merlokk 67b7edeb44 extract keys works 2018-12-28 17:07:58 +02:00
merlokk b0c1828c1d load params 2018-12-28 16:58:11 +02:00
merlokk 8e5133582d emv roca select app 2018-12-28 16:43:15 +02:00
merlokk ab41b4a991 emv_rocacheck 2018-12-28 16:40:53 +02:00
merlokk 9804526dca small fix for unsigned int 2018-12-28 14:52:24 +02:00
merlokk b1145ba577 mpi_get_uint 2018-12-28 14:50:23 +02:00
merlokk 88d42a1af5 make 2018-12-28 13:46:52 +02:00
iceman1001 92fadc2a9f ADD: 'amiitool' - Added @socram8888 's great tool for manipulating amiibo tags. The idea is to build it in the pm3 client. It compiles as is, but the hookup in client is not done. *WORK IN PROGRESS* 2018-12-27 19:45:53 +01:00
Chris c6089d7fdb chg: more definitions 2018-12-26 17:54:29 +01:00
Chris ed68068107 chg: 'emv roca' -now compiles 2018-12-26 12:50:11 +01:00
Chris 33f6439d38 add 'emv roca' - new command, will be able to test for ROCA 2018-12-26 11:02:00 +01:00
Chris ab9048f7c5 CHG: 'sc brute' loop 31, 255 2018-12-25 18:18:48 +01:00
Chris ddfe584582 CHG: 'sc brute' - nicer output, rearrange code 2018-12-25 18:16:47 +01:00
Chris 5140db2ac6 CHG: some more descriptions 2018-12-25 18:13:41 +01:00
iceman1001 acb41a7376 CHG: 'sc brute' - now is interruptable, optional tlv decode, 2018-12-23 09:48:46 +01:00
Oleg Moiseenko a47fa470c1
Merge branch 'master' into atrzerocheck 2018-12-20 23:07:30 +02:00
merlokk d64a48b7fc added check Fi and Di 2018-12-20 23:05:02 +02:00
iceman1001 ddb4fc33c9 CHG: 'sc info' - textual 2018-12-19 23:46:19 +01:00
iceman1001 a9b3fd7138 chg: 'sc brute' - now works :) 2018-12-19 23:21:59 +01:00
iceman1001 0143d3f0e0 chg: 'sc raw' - some more love 2018-12-19 22:50:32 +01:00
merlokk f0c3482799 add T=0 to sc raw command 2018-12-19 20:31:20 +02:00
iceman1001 e567b74fa0 chg... 2018-12-19 08:57:59 +01:00
mazodude dab854e0f0 Fix detection of MADs so that is checks the correct byte 
also set up some code for later
 2018-12-19 16:51:27 +10:00
iceman1001 94e0d43502 CHG: coloring of ERR 2018-12-18 18:43:49 +01:00
iceman1001 4ef59c3771 CHG: uniform output. 2018-12-18 18:43:27 +01:00
Iceman c0b72bb95c
Merge pull request #72 from merlokk/le_fix 
fix sending Le over 7816 T=0
 2018-12-18 18:03:10 +01:00
iceman1001 60b7dbe525 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-12-18 17:57:56 +01:00
iceman1001 5489d4e552 add: magic uid 15 helper script 
chg:  keys
 2018-12-18 17:57:22 +01:00
merlokk b42709837f fix sending Le over 7816 T=0 2018-12-18 18:55:46 +02:00
merlokk 8ab9b6d0ea sw 0x6cxx works 2018-12-18 16:14:52 +02:00
merlokk f32088e25c fix states and get rid of INS code in receive (that code checks by controller) 2018-12-18 14:33:28 +02:00
merlokk a759e94af0 add client side and get rid of reset 2018-12-17 23:48:56 +02:00
iceman1001 a963a7834c FIX: 'mem load' - bad memory allocation 
CHG: calloc fixes
 2018-12-17 14:01:18 +01:00
iceman1001 cecf709fe7 chg: 'script run mifare_ad' - minor fix 2018-12-14 20:27:11 +01:00
mazodude d36f3d876b Remove unneeded function and place code in main 2018-12-14 20:14:47 +10:00
mazodude f77bb94a86 Add changes to script as per iceman's suggestions 2018-12-14 16:57:51 +10:00
mazodude edcb029af3 Add script to test for MADs 2018-12-14 15:31:50 +10:00
iceman1001 1ffddb2578 CHG: 'hf mfu dump' - simplify bin saving and added JSON dump format 2018-12-13 23:34:30 +01:00
merlokk b06054732b code format 2018-12-10 15:04:03 +02:00
merlokk ec17cade36 added TA1 decoding 2018-12-10 15:01:00 +02:00
iceman1001 16bfd49b8d CHG: 'hf 14a' - update to vendors list. (thanks to @horrordash for pointing it out) 
See also:
http://isotc.iso.org/livelink/livelink?func=ll&objId=10432471&objAction=Open&nexturl=%2Flivelink%2Flivelink%3Ffunc%3Dll%26objId%3D8915579%26objAction%3Dbrowse%26viewType%3D1
 2018-12-10 08:48:39 +01:00
Chris 7ceac11308 chg: Added some more Mifare sector trailer decoding (@Fl0-0) 2018-12-07 20:11:40 +01:00
RFID Research Group 749f0f6f3a
Merge pull request #68 from merlokk/sc_atr 
added basic atr decode
 2018-12-07 19:19:23 +01:00
merlokk 384a277b43 added basic atr decode 2018-12-07 19:58:22 +02:00
RFID Research Group 04b7860096
Update default_pwd.dic 
from https://github.com/Proxmark/proxmark3/pull/735/
 2018-12-07 17:36:50 +01:00
merlokk 80d07bcaac added code if AIP not found 2018-12-06 20:04:28 +02:00
merlokk 17d0194aea small fix and block scan command 2018-12-06 19:47:57 +02:00
merlokk 34b53a5b48 exchange works 2018-12-06 14:44:55 +02:00
merlokk ec3acc7d8a some of emv commands works in test mode 2018-12-05 19:23:13 +02:00
merlokk 312ec79e48 added sketch sc apdu 2018-12-05 17:27:28 +02:00
merlokk 4c7e5757f3 added channel parameter 2018-12-03 19:29:31 +02:00
merlokk 01a10bade7 Mastercard compute cryptographic checksum result will print anyway 2018-12-03 18:49:54 +02:00
merlokk 2245673262 fix search big loop 2018-12-03 18:46:11 +02:00
merlokk e8671e6c18 fix emv command's help 2018-12-03 18:21:05 +02:00
merlokk 47d954c79f move emv commands to root 2018-12-03 18:16:25 +02:00
iceman1001 259dbadbe9 chg: output unified 2018-12-02 10:05:31 +01:00
iceman1001 2eee1663df chg: iso15693 small fix... 2018-11-30 21:04:32 +01:00
iceman1001 0372cb8a04 chg: iso15693 lua lib works. 2018-11-30 20:58:47 +01:00
merlokk 7c8377839e 4k fix 2018-11-30 20:33:46 +02:00
merlokk 2d932e49ac https://github.com/Proxmark/proxmark3/pull/725 2018-11-30 20:28:34 +02:00
merlokk 9f77f2741f added trailer decoding 2018-11-30 14:16:34 +02:00
iceman1001 a5898158c5 FIX: basic fixes for lua reader14a, reader14b, reader15 
ADD: utils got iso15693 crc support
 2018-11-30 01:41:39 +01:00
iceman1001 ccb0cd23f5 FIX: 'lua calc of iso15692 crc' - works better now 2018-11-30 01:19:57 +01:00
iceman1001 bd7ac487cd FIX: 'hf mf hardnested' - output misalignment 2018-11-29 23:44:50 +01:00
merlokk 9584074c00 fix memory error 2018-11-29 22:06:49 +02:00
iceman1001 0b5ee43392 FIX: remove linker directive warnings used with compiler in CLANG, OS X. 2018-11-29 17:59:46 +01:00
iceman1001 3c88bb5e59 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-11-29 17:53:57 +01:00
iceman1001 b64fdafc40 ADD: basic iso15693 comms in lua support. Not fully functional 2018-11-29 17:53:24 +01:00
Iceman 55dff20530
Merge pull request #54 from merlokk/json_loclass 
`hf mf csave` and `hf mf cload` works with json.
 2018-11-29 16:50:27 +01:00
merlokk 4dece3e30d del line 2018-11-29 17:13:00 +02:00
merlokk efabdde248 small fixes. done 2018-11-29 17:09:37 +02:00
merlokk 6baf579fe0 hf mf cload works 2018-11-29 16:56:57 +02:00
merlokk 955ced6c28 hf mf csave works 2018-11-29 16:05:57 +02:00
merlokk e6d7a05721 csave works 2018-11-29 13:42:07 +02:00
merlokk 0ffddd8470 raw load file 2018-11-29 13:21:38 +02:00
merlokk 5d5e273982 jansson update. 2.11 to 2.12 
fix warnings
 2018-11-29 12:00:23 +02:00
iceman1001 91809c6d94 FIX: part of https://github.com/Proxmark/proxmark3/pull/723 (@Fl0-0) 
CHG: remove some warnings when compiling on 32/64 bit systems.  Messy messy
 2018-11-28 23:53:31 +01:00
merlokk 21118ed6b8 Merge branch 'master' of github.com:merlokk/proxmark3i into json_loclass 2018-11-28 00:09:11 +02:00
merlokk 04b436ce5e del annoying comment 2018-11-27 19:44:03 +02:00
merlokk f8cac71aa0 Merge branch 'master' of github.com:merlokk/proxmark3i into json_loclass 2018-11-27 19:40:30 +02:00
Oleg Moiseenko 4e89ef7c24
Merge branch 'master' into fido2 2018-11-27 19:37:08 +02:00
merlokk c51e0a58f4 added allowList to authenticatorGetAssertion command 2018-11-27 19:33:51 +02:00
merlokk 305c0c099b refactoring 2018-11-27 15:59:28 +02:00
merlokk d253364d2c added numberOfCredentials 2018-11-27 15:47:17 +02:00
merlokk ac5448a117 GetAssertion works 2018-11-27 14:57:00 +02:00
merlokk a0a979abc6 added show GetAssertion results 2018-11-27 14:34:51 +02:00
merlokk f26d3396e8 get credential 2018-11-27 14:01:47 +02:00
merlokk 317ea30529 refactoring and GetAssertion works 2018-11-27 13:45:29 +02:00
merlokk 26cf350713 refactoring 2018-11-27 12:34:28 +02:00
merlokk a9be05dbf7 refactoring 2018-11-27 12:31:39 +02:00
merlokk 5efc2eced6 refactoring 2018-11-27 12:28:36 +02:00
merlokk ee92b8a097 refactoring make credentials and add some sketch to get assertion 2018-11-27 12:24:55 +02:00
merlokk bad7b80036 added file name to fido2 command 2018-11-27 12:07:33 +02:00
merlokk fc9558b18f get assertion command sketch 2018-11-27 00:18:44 +02:00
merlokk 890173a623 verify signature OK, 
added some logging options
 2018-11-27 00:11:53 +02:00
merlokk 66d994920f added command and some parameters 2018-11-26 20:17:50 +02:00
merlokk d36bfd5829 add some cose key checks 2018-11-26 19:49:41 +02:00
merlokk 065773377d get cose public key and fix some printing 2018-11-26 19:42:37 +02:00
merlokk 0a2f874ac3 added cose_key descriptions 2018-11-26 19:22:44 +02:00
merlokk f7354c705d extract some descriptions from cose_key 2018-11-26 19:16:47 +02:00
merlokk 56c9270574 added json save values 2018-11-26 18:57:44 +02:00
merlokk 1f3086a028 added json save 2018-11-26 18:39:31 +02:00
merlokk b0e0ccb05f added showCBOR 2018-11-26 18:37:21 +02:00
merlokk b9c4bd1e0c added showing cose_key in cbor text type 2018-11-26 18:30:14 +02:00
merlokk 44ed826840 added hints 2018-11-26 17:54:50 +02:00
merlokk 705d0b7a6b added signature verify 2018-11-26 17:52:02 +02:00
merlokk b67bcac28e check rpIdHash and unpack signature ok 2018-11-26 17:38:45 +02:00
merlokk 1099c6923d added COSE algorithms 2018-11-26 16:12:28 +02:00
Chris bf7f33b0a7 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-11-25 14:36:19 +01:00
Chris 3beb14a25c chg: 'hf iclass lookup' - its not an online command... 2018-11-25 14:35:47 +01:00
merlokk 9e89da3c0c remove debug 2018-11-25 00:12:06 +02:00
merlokk 1a0f7e93de refactoring and some functions in cbortools 2018-11-24 23:36:02 +02:00
merlokk 6c63e74ffb decode DER certificate 2018-11-24 15:05:08 +02:00
merlokk 376abd2d92 get DER works 2018-11-24 14:57:55 +02:00
merlokk 0bbdc7f150 added CborGetArrayBinStringValue 2018-11-24 14:57:36 +02:00
merlokk c57a2c2c41 added map credential parsing. not completed 2018-11-23 19:48:17 +02:00
merlokk a37082a825 added some cbor tools 2018-11-23 19:47:30 +02:00
Jean-Michel Picod 7943ba7d91
Fix logic op being used instead of bitwise op 2018-11-22 23:57:30 +01:00
merlokk 156f9b677c refactoring 2018-11-22 13:41:44 +02:00
merlokk 7bb24819ad small fix 2018-11-21 20:39:26 +02:00
merlokk e33ddad40c added options and some refactoring 2018-11-21 20:35:57 +02:00
merlokk 979a14d978 added CBOR description for queries 2018-11-21 20:11:41 +02:00
merlokk f705402b7a make credentional command works. and refactoring 2018-11-21 19:46:57 +02:00
merlokk da45b1db39 added jsontocbor function 2018-11-21 19:46:09 +02:00
merlokk dae4ecc60f removed ismap and added not-writable parameters 2018-11-21 19:45:11 +02:00
merlokk 7b943a4a16 add check string - if string is hex 2018-11-21 19:44:31 +02:00
merlokk ea3472b0e0 load json OK 2018-11-20 19:31:08 +02:00
merlokk 38e0d7de32 add load json 2018-11-20 19:21:36 +02:00
merlokk 9df1d14ca4 printandlogex in hf emv commands 2018-11-20 17:29:17 +02:00
merlokk d7d681ab51 cmdhf apdu move to argtable 2018-11-20 17:28:41 +02:00
merlokk 6d896ca603 cmdemv merge 2018-11-20 16:26:54 +02:00
merlokk fb14d665dd emvcore 2018-11-20 16:26:35 +02:00
merlokk b1091c486b emv_pki 2018-11-20 16:25:54 +02:00
merlokk e3aebd7985 get card data 2018-11-20 16:25:19 +02:00
Chris f8c33af1da CHG: FPC connector tests. Device -> Client communications works. 
Adjust  armsrc/Makefile   and client/Makefile  to include  the  -DWITH_FPC  flag to compile with FPC enabled.
 2018-11-20 10:58:32 +01:00
merlokk 6d4552540b added fido2 test json 2018-11-18 19:18:18 +02:00
merlokk dcfd75d1d0 added command sketch 2018-11-18 00:03:28 +02:00
merlokk dc9b3c3a0e added fido2 base commands 2018-11-17 23:52:36 +02:00
merlokk 12b1289191 fido info command completed 2018-11-17 18:39:21 +02:00
merlokk 23ef267100 added fido2 error codes description 2018-11-17 18:11:46 +02:00
merlokk 8f1c67d512 added fidocore 2018-11-17 16:19:09 +02:00
merlokk f4bb63a728 sketch for get cmd code name 2018-11-17 01:55:29 +02:00
merlokk 8201526f6e fix fido2 response structure 2018-11-17 01:40:27 +02:00
merlokk 563086c935 cbor print ok 2018-11-17 01:31:08 +02:00
merlokk 87f3e1facf simple cbor print 2018-11-16 19:47:41 +02:00
merlokk 2d17fb172a added cbor print sketch 2018-11-16 18:33:10 +02:00
merlokk cbdb42560c added make 2018-11-16 17:06:13 +02:00
merlokk f8c0ec53bd added tinycbor 2018-11-16 17:05:48 +02:00
merlokk 89e2f391ca small fix 2018-11-15 18:42:22 +02:00
merlokk f4c21da26b small fix 2018-11-15 18:35:13 +02:00
merlokk da6e2ea7c1 added to hf fido reg option -t to show DER certificate in TLV 2018-11-15 18:20:37 +02:00
merlokk 736840cce7 fix integer representation 2018-11-15 18:14:45 +02:00
merlokk 164b64a611 add some OIDs from Yubikey 2018-11-15 17:42:41 +02:00
merlokk 638890cb6a asn.1 description from json works 2018-11-15 17:15:37 +02:00
merlokk 9f75ce2a7e added sketch for loading OID's descriptions from file 2018-11-15 16:38:17 +02:00
merlokk 6cd6275361 refactoring 2018-11-15 14:37:38 +02:00
merlokk bd91490461 added tags and all data deserializers works 2018-11-15 13:26:33 +02:00
merlokk 9d42048901 added octet string an dstring datetime 2018-11-15 11:47:09 +02:00
merlokk 5eb3181263 added ASN.1 decoder 2018-11-14 20:44:32 +02:00
merlokk 46769838f2 fix tlv.c 2018-11-14 19:26:19 +02:00
merlokk 5e3fa42c23 add der print sketch 2018-11-14 18:44:17 +02:00
merlokk cc6cd93ea7 save raw 2018-11-14 18:11:05 +02:00
Chris 64df44d186 cleaning 2018-11-14 15:14:31 +01:00
Chris 3e53c3a5e7 chg: some more default keys in the general list. 2018-11-14 15:14:05 +01:00
Chris 25292eab2e fix: more warnings. 2018-11-14 15:13:17 +01:00
Chris 526f50aa9d fix: 'hf iclass loclass' - remove warning on gcc4.9.2 mingw. 
don't like the declaration.   mbedtls_des_context ctx_dec = {0};
chg: 'hf iclass loclass t' - added some path tests for key file.
 2018-11-14 15:11:30 +01:00
RFID Research Group ef366dfd9b
Merge pull request #53 from merlokk/des 
get rid of polarssl's Des
 2018-11-14 13:48:33 +01:00
merlokk 65923701f3 delete old files 2018-11-14 11:44:33 +02:00
merlokk 84efb3256b makefile 2018-11-14 11:41:18 +02:00
merlokk 500645badf elite_crack 2018-11-14 11:41:03 +02:00
merlokk 82b6a2cd5b ikeys 2018-11-14 11:34:20 +02:00
merlokk 0ef9b609dc mfu 2018-11-14 11:33:59 +02:00
merlokk 586cbd2137 hiclass 2018-11-14 11:33:45 +02:00
merlokk b9974e1224 mfu 2018-11-14 11:24:21 +02:00
Chris 73230c8d15 chg: 'trace list 7816' - missing command 
chg: 'sc raw' - inverted select logic
 2018-11-13 22:29:33 +01:00
RFID Research Group 6faec7e981
Merge pull request #50 from merlokk/fido 
fido authenticators comands
 2018-11-13 18:32:09 +01:00
merlokk 1b4e26fc9c checking certificate works + some changes in print messages 2018-11-13 19:22:10 +02:00
merlokk 7b64e8d38f small fix 2018-11-13 19:06:30 +02:00
merlokk 7214c70720 fido commands hash checks works. 2018-11-13 19:02:02 +02:00
Chris fd9fe81ba4 fix: 'sc list' - the iso7816-4 annotation now prints. 2018-11-13 14:08:01 +01:00
merlokk 679b5eec5b small fix. now works 2018-11-13 14:55:02 +02:00
merlokk d7d409d9eb added check signature in hf fido auth command 2018-11-13 14:05:14 +02:00
Chris ac12d715f0 chg: 'sc raw' - no need to tvl decode twice 2018-11-13 12:34:09 +01:00
Chris 25b07682dc CHG: 'mem load' - adapted loading files to use new load function. 
loading binary file can be called with NULL pointer,  don't forget to free it.
 2018-11-12 22:55:19 +01:00
Chris eb4310395e CHG: 'LF T55XX DETECT' - swapped some demod order. From FSK-PSK-ASK, to FSK-ASK-PSK since PSK is the leasted used modulation 2018-11-12 22:19:54 +01:00
Chris 6a21df3443 FIX: 'hf mf cload' - showing helptext instead of loading file. 
Added support for easy loading of bin/eml files in this patch aswell.
 2018-11-12 22:17:49 +01:00
merlokk 7043435174 added x9.62 signature decode and ecdsa signature verify 2018-11-12 19:05:05 +02:00
merlokk 5dda51ed1c added FillBuffer function for fill buffers in hash checks 2018-11-12 19:03:58 +02:00
merlokk efa76c7be4 fix some strange behavior 2018-11-12 16:26:51 +02:00
merlokk 7820be1b8a exchange apdu14a works with chaining 2018-11-12 16:17:31 +02:00
Oleg Moiseenko b7fa407830
Merge branch 'master' into fido 2018-11-12 15:06:21 +02:00
merlokk ab196ad2ee added jansson 2018-11-12 15:00:35 +02:00
RFID Research Group d2f3a9fd68
Merge pull request #48 from merlokk/mbedtls 
include Mbedtls
 2018-11-11 15:42:17 +01:00
David Cumps dc69357820
skip first 4 bytes of legic writing 2018-11-11 12:34:59 +01:00
David Cumps 00fdac0986
fix legic reading and writing 2018-11-11 01:18:14 +01:00
merlokk 074c138de7 all works except of jansson private symbols linking 2018-11-08 19:55:51 +02:00
merlokk f03261be9a compiled. not linking.... 2018-11-08 19:14:30 +02:00
merlokk 4fed815b88 added core files. 
need to add:
1. jansson (maybe needs jansson-devel)
2. arm and client side of exchangeapdu14a
 2018-11-08 17:29:58 +02:00
Chris affee79b69 fix 'sc raw' - now raw command automatically adjust when getting a 0x6C response code and resend command. 2018-11-08 13:45:57 +01:00
Chris 3731ca19d2 chg: 'hf mf fchk' - filename 2018-11-08 01:16:27 +01:00
merlokk ec1e04342c compiles 2018-11-07 18:31:36 +02:00
merlokk d0c6889c71 fix warning in emv_tags.c 2018-11-07 18:27:22 +02:00
merlokk f0741798e6 fix scripting 2018-11-07 18:20:24 +02:00
merlokk aaf7b25c01 cmdflashmem fixed for mbedtls 2018-11-07 18:17:17 +02:00
merlokk 6ab12db7a0 mbedtls added 2018-11-07 18:05:02 +02:00
RFID Research Group ce30c29f47
Merge branch 'master' into master 2018-11-07 12:12:47 +01:00
bogiton db37458545
Added lua script to read stored pwds in flashmem 2018-11-06 13:37:34 +00:00
Chris d58786ed74 chg: 'hf iclass chk' - remove some printing 2018-11-05 22:30:46 +01:00
Chris ecc7983866 fix: hf mf hardnested - access out of malloc mem. (@vdwel) https://github.com/RfidResearchGroup/proxmark3/issues/46 
looks like increasing size removes the problem.
 2018-11-05 22:29:31 +01:00
Chris 4d500dff2f textual 2018-11-05 21:20:03 +01:00
Chris b3ebf73ecc chg: lua - Swapping param order to make it more clear. From (length,offset) to (offset,length) 2018-11-05 18:45:46 +01:00
Chris e26e9aa710 ADD: added support for lua-script to download from Flashmemory. 2018-11-05 18:32:53 +01:00
Chris e60d4b3892 add: emv json file (@merlokk) 
chg: compiler warning
 2018-11-05 17:48:58 +01:00
Chris 3e7d9fde01 CHG: 'hf mf hardnest' auto detect supported cpu-commandset. See helptext for more info. (@piwi) 2018-11-05 17:46:32 +01:00
Chris 92d89dd539 fix: readline not installed on mac by default.. 2018-11-03 11:10:55 +01:00
Chris 12af27967b fix: remove gcc7.3.0 warning 2018-11-02 20:47:19 +01:00
Chris d30454fc5a fix: fflush(stdout), should sort out the blocking pipe problem 
add:  line length (@merlokk)
 2018-11-02 18:27:42 +01:00
indigowor2 f29c94954f merge 2018-10-31 17:39:32 +00:00
merlokk af278d977b added SetVerboseMode 6bb33f377663126fbf645d8faaf00d4a1734f924 2018-10-26 14:19:10 +03:00
merlokk 7467368fbc added cmac test 2018-10-26 14:17:08 +03:00
merlokk 8bb192fc75 added some crypto 2018-10-26 14:12:20 +03:00
merlokk b08ce3a1f7 changed logs 2018-10-24 19:19:55 +03:00
merlokk 122cbe7d1d info and some fix in exchange 2018-10-24 19:19:15 +03:00
merlokk 0af06c0b63 mifare4 logging 2018-10-24 19:05:30 +03:00
merlokk 8720d10da9 changed logs 2018-10-24 19:02:14 +03:00
merlokk 61ea3109c9 start merge 2018-10-24 18:18:05 +03:00
Pavel Zhovner 4784cfd3fd Added new keys from MifareClassicTool project. Remove two dups 2018-10-22 22:03:58 +03:00
Pavel Zhovner 58ea9caeae Added full key set of russian Troika card. Dupicates removed, added missed commas 2018-10-21 18:56:27 +03:00
Chris 3690914405 another cloner 2018-10-19 21:52:23 +02:00
Chris bd34d145f1 fix: error enum rename 2018-10-14 12:05:45 +02:00
Chris 2be56183c0 fix: error enum rename 2018-10-14 12:02:26 +02:00
RFID Research Group 13e89cb61c
Merge pull request #33 from merlokk/auth144434 
Auth14443-4
 2018-10-14 11:44:45 +02:00
Chris 375aada810 more keys 2018-10-13 11:26:40 +02:00
merlokk 4563210a96 forgot h file 2018-10-11 16:55:21 +03:00
merlokk de31f05284 ok, compiles) 2018-10-11 16:54:50 +03:00
merlokk ab5233d29f now it needs to resolve issues in reveng 2018-10-11 11:48:46 +03:00
Chris 3d31272340 fix gcc8.2.0 2018-10-07 16:19:45 +02:00
Chris 6e1f757047 fix: warning about %lu in gcc 8.2.0 2018-10-07 16:17:25 +02:00
Chris 29982a6cdc CHG: 'make control widget smaller' 2018-10-07 12:32:14 +02:00
Chris 769dee7e7a Fix: ControlWidget placement 
https://github.com/iceman1001/proxmark3/pull/258
 2018-10-07 12:17:21 +02:00
Chris 1fb121474e osx: fix annoying focus behaviour (@anticat) 
https://github.com/Proxmark/proxmark3/pull/689

OS X has a global menu bar and a per app dock icon. Therefore, all
GUI applications launched from a terminal will become focused - even
if they don’t show any windows. Thereby the terminal loses focus.

Since is it very annoying to re-focus the terminal after each proxmark
client launch, this change makes the client unfocusable during launch
and restores the regular behaviour when a window is created.
 2018-10-07 09:01:24 +02:00
Chris 61d7f74ab9 chg: code clean up 2018-10-06 14:53:21 +02:00
Chris 2a24f97355 chg: using three spaces instead of tabs for intendention 2018-10-06 14:52:50 +02:00
Chris 7d09a466fb FIX: OSX disable app-nap during serial comm (@anticat) 
https://github.com/Proxmark/proxmark3/pull/687
 2018-10-06 13:29:20 +02:00
Chris 97c0729289 fix: 'sc raw t' - tlv decoding work again 
chg: 'sc brute' - now decodes TLV by default the found SFI
chg: 'sc raw' - better detection on armside when failing
 2018-09-25 02:54:51 +02:00
Chris 50143e460d syntax 2018-09-23 20:41:29 +02:00
Chris dbed5d5855 ADD: 'sc brute' - a naive sfi bruteforcer for smartcards. When a SFI is found, it is read/printed 
A first attempt,  work-in-progress.
 2018-09-23 20:40:37 +02:00
Chris 4fa0835d5f FIX: APDUCodeTable has more items than 100 2018-09-23 20:18:27 +02:00
Chris f3d1c9ea77 chg: 'sc raw' - added response code annotation 2018-09-23 17:05:29 +02:00
Chris 125884c3d5 CHG: 'sc raw' - now requests response if inital command got 0x61 response 2018-09-23 16:35:40 +02:00
Chris dc67b5d7c9 chg: revert fpga_major mode in LF. 
chg: 'lf t55xx deviceconfig'  - persistence to flashmem is now option with param P
 2018-09-23 05:29:55 +02:00
Chris b89b62164d added emv tag (@merlokk) 
https://github.com/Proxmark/proxmark3/pull/676
 2018-09-18 20:28:54 +02:00
Chris 5c0517526a CHG: 'hf mf csave' 
CHG: 'hf mf esave'  -
 2018-09-16 23:05:09 +02:00
Chris 151ad3b31f CHG: missing declaration 2018-09-16 22:40:09 +02:00
Chris a965dff52c CHG: 'lf t55xx deviceconfig' - better helptext. Command takes timing values in FIELD CLOCK, which is converted to (US) on device. 2018-09-16 20:54:08 +02:00
Chris 5a95cee5ed clean 2018-09-16 20:49:29 +02:00
Chris df70619888 chg: turn off FPC specific functions (still work in progress) 2018-09-15 18:33:16 +02:00
Chris 1d322686bb CHG: added possible SE credential identification text 2018-09-15 12:58:50 +02:00
Chris 9d1c3a3538 FIX: crash on Bionic libc if CloseProxmark is called twice. (@micolous) 
https://github.com/Proxmark/proxmark3/pull/672
 2018-09-15 12:00:53 +02:00
Chris b7a1674bf6 helptext 2018-09-14 08:12:03 +02:00
RFID Research Group 63260df31e
Merge pull request #23 from xilni/master 
feature: Handle Kastle format 32 bit cards
 2018-09-14 08:03:21 +02:00
Chris 1fff6ae09a chg: rename variable 2018-09-12 08:01:35 +02:00
Chris dcd0300913 chg: helptext 2018-09-11 22:14:41 +02:00
Chris ba2543b627 ADD: 'lf t55xx deviceconfig' - command that allows for setting t55xx timings via the client. If run on a RDV40, it also saves the config to flashmemory. This gives you option to have custom timings for your custom antenna in order for your RDV40 to work optimal against a t55xx tag and with your custom antenna. (@iceman) 2018-09-11 18:35:07 +02:00
Chris 5959cdf62c chg: remove some warning of unused variables 2018-09-10 22:49:29 +02:00
Chris 0a648d482d chg: remove warning unused variable 2018-09-09 23:16:47 +02:00
Chris b66a481581 cleanup 2018-09-09 19:56:25 +02:00
Chris fef85d4caa chg: 'data load' , 'data norm' etc all commands that manipulate graphbuffer need to update signalproperty struct. But its not based on the signed data. 2018-09-09 19:56:11 +02:00
Chris 0a548c5da0 clean up 2018-09-09 18:08:20 +02:00
Chris c4b3edef89 fix: double free bug on MacOS (thanks @drandreas) 2018-09-09 18:03:49 +02:00
Chris 6176103023 cleanup 2018-09-09 12:36:44 +02:00
Chris be57354478 chg: seems to be a free bug on macos 2018-09-09 12:36:16 +02:00
Chris d774e4c84f Chg: step2 in the signed vis unsigned graphbuffer signal processing. 
It will break some tone-based demods like ti etc.
 2018-09-09 12:34:43 +02:00
Chris 56f3ef2a55 chg: helptext (@drandreas) 
chg: 'hf legic esave'  now saves to both BIN / EML
 2018-09-08 12:38:36 +02:00
Chris 65b29410d4 chg.. space.. 2018-09-08 11:23:17 +02:00
Chris 0e2dbe7424 chg: code cleanup 2018-09-08 11:18:10 +02:00
Chris 0b673683d9 fix: 'hf legic sim' no assign... (Thanks to @625) 2018-09-08 11:17:31 +02:00
Chris 51fdde0bbf code clean 2018-09-07 23:46:44 +02:00
Chris b7d0786ab8 code clean 2018-09-07 23:45:52 +02:00
Chris 24eaac8681 CHG: the thread comms refactoring from offical pm3 repo 
chg: FPC com speed limited to 115200 when compiled with FPC
chg: USART remake (@drandreas)
 2018-09-06 21:43:20 +02:00
RFID Research Group eb0b5116a2
Merge pull request #25 from drandreas/rdv4-legic 
Legic Tag Simulator
 2018-09-06 20:26:39 +02:00
Colin J. Brigato c74dbb63b8 Pass 2; commit 2; 2018-09-06 05:24:50 +02:00
AntiCat 2c6c4e5bc6 Legic: Implemented trace log 2018-09-05 23:03:05 +02:00
AntiCat 61e4eac2b2 Legic: Moved card simulator into separate file & cleaned interface. 
Reader and card simulation have almost no common code. Moreover the sim
uses an SSP Clock at 212kHz for all timings to prevent any drifting from
the PRNG. This clock speed is not available in reader simulation mode (SSP
runs at up to 3.4MHz, and changes speed between TX and RX). For these
reasons having the code in separate files makes it significantly cleaner.
 2018-09-05 23:03:04 +02:00
Colin J. Brigato 76e2d7502a Merge remote-tracking branch 'upstream/master' 2018-09-05 20:39:56 +02:00
Chris 972d30474d Add 'rem' - new command that adds a line to the log file (@didierStevens) 2018-09-05 20:31:10 +02:00
Chris 4200ed5dc9 fix: justnoice 2018-09-05 19:16:49 +02:00
Chris fb49ca9735 FIX: em410xdemod empty tag id 
Code cleanup
 2018-09-05 18:56:21 +02:00
xilni ecb0f21184 feature: Handle Kastle format 32 bit cards 2018-09-04 22:23:49 -04:00
Chris b80d683ce6 Added new support str function 2018-09-04 20:39:15 +02:00
Colin J. Brigato 8d673fa1bf First pass rewrite of flashmem driver for optimization. Lot of changes here. Provides PoC of saving and recalling a tag in Standalone mode. Added some printing passthrough to client to azccomodate for vt100 eye-candyness. FastREAD mode implemented for flashmem, testable from client. Beta but functionnal. Reading the whole flash with 1Kb to 32kb buffers was ~730ms, now 380ms Max (even at 24Mhz spi baudrate) 2018-09-03 00:02:44 +02:00
Garret Kelly a665e170cd Populate emulator keys from hf mf fchk 
Just like `hf mf chk`, when the 't' option is provided make fchk put the
found keys into emulator memory.
 2018-08-23 14:07:48 -04:00
Chris 4edcd908a7 FIX: ntag215 is 7.. Thanks @axfla for pointing it out. 2018-08-22 22:36:41 +02:00
Chris af89c35e43 CHG: 'hw tune' - bigger array 2018-08-19 21:19:58 +02:00
Chris 24598694e8 CHG: 'hw tune' - bigger array 2018-08-19 21:19:11 +02:00
Chris b837eb0089 CHG: 'hw tune' - colors 2018-08-19 21:17:46 +02:00
Chris 206ea46483 update text 2018-08-18 12:12:28 +02:00
TomHarkness 81cbce9f6f Added some keys 2018-08-18 12:10:28 +10:00
Chris 8c0aa0c86d FIX: 'hf mf chk' - chkkeys param error fix #1 2018-08-13 22:37:44 +02:00
Chris cfbd67d082 Fix: 'hf emv' - some cards need to have Le=0x00, some need to not to have... (@merlokk) 2018-08-13 13:56:48 +02:00
Chris 5f77121694 initial commit to be in sync the-soon-defunct repo pm3rdv40. 2018-08-12 21:54:31 +02:00
Andreas Dröscher 0d0b651246 change: re-added trace log 2018-08-12 12:51:45 +02:00
Iceman 9b03cd9cd6
Update cmdhfmf.c 
fix #225
 2018-08-10 18:28:51 +02:00
grauerfuchs 910c86a30f fixed: "lf t55 config d" won't accept modulations with length > 4 chars (FSK2a, etc.) 2018-08-04 20:49:20 -04:00
Chris bacf8aff0f add: FPC connector skeleton usart. Not working but if will be a starting point for those who might want to help out with it. 2018-07-30 09:54:44 +02:00
iceman1001 506da3ff4c textual 2018-07-29 16:30:36 +02:00
iceman1001 513d0aca44 upd: RevEng v1.5.3 2018-07-29 07:37:23 +02:00
iceman1001 1dd01fd738 chg: making LCD related code optional 2018-07-28 22:02:12 +02:00
iceman1001 d393b6c60b fix: 'hw version' buffer overflow 2018-07-28 14:39:21 +02:00
iceman1001 4d8488e14b CHG: https://github.com/Proxmark/proxmark3/pull/631 from offical repo. (piwi) 
CHG: textual adjustments
 2018-07-28 14:25:12 +02:00
iceman1001 03e8d39e17 ADD: amiboo stuff 2018-07-28 12:33:27 +02:00
iceman1001 7c56c2ce2c chg: adaptations 2018-07-28 12:32:22 +02:00
iceman1001 32a0bfff5f textual 2018-07-28 12:31:33 +02:00
iceman1001 edfbe327b4 chg: 'hw tune' color output consistent. 2018-07-28 12:25:11 +02:00
iceman1001 2919a35665 chg: adaptation.. made shortcut for Hexlify for ConvertAsciiToHex 2018-07-27 09:36:47 +02:00
iceman1001 6d4d58659f chg: parse14a also returns data, adaptation for amiibocyou 2018-07-27 09:08:36 +02:00
iceman1001 1629287291 fix: lua bit32 can actually take several values. How did I miss this? 2018-07-27 09:07:53 +02:00
iceman1001 3f9024eeaf add: amiibo script [adaptation amiibocyou] 2018-07-27 07:55:49 +02:00
iceman1001 22f10016ba chg: outside limits, [adaptation amiibocyou] 2018-07-27 07:52:21 +02:00
Andreas Dröscher 266cfa4442 chg: cleaned up documentation 2018-07-22 16:56:45 +02:00
Andreas Dröscher 6e8775540e fix: GetFromDevice with BIG_BUF_EML 
dl_it was expecting CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K
but got CMD_DOWNLOADED_EML_BIGBUF resulting in an upload
silently failing.
 2018-07-22 16:56:35 +02:00
Chris 052c8f0998 chg: 'trace'-commands can load / save tracefiles, which should allow it to run offline. 2018-07-22 08:09:50 +02:00
j8048188 b88a5936f8
more keys 2018-07-21 01:08:59 -05:00
j8048188 2a5ffca9c5
Add more keys 2018-07-14 03:56:41 +00:00
Chris db7cb4189b chg: more found keys from pastebin 2018-07-11 00:32:35 +02:00
Chris 4916042cb4 chg: 'sc raw' ...annoying.. 2018-07-09 15:39:26 +02:00
Chris 7394bb14a0 chg: 'sc raw' reading byte to the end of line now exists correct 2018-07-09 14:13:38 +02:00
Chris 4a8e048694 chg: 'sc raw' added 't' param, for decoding apdu response 
chg: i2c,  max timeout fitting for 256bytes frames
 2018-07-09 13:15:28 +02:00
Chris 684a692bb0 chg: i2c clean up 2018-07-09 12:10:21 +02:00
Chris 2102b19d11 add: 'sc setclock' 0,1,2, allowed setting sim clocks.. 2018-07-09 11:51:19 +02:00
Chris 714de99f82 chg: i2c fixes. all working. 
chg: 'sc info'  now prints url to atr decoder.
chg: 'sc reader' has more options  A, S
 2018-07-09 11:22:51 +02:00
Chris c8e1eb11f2 chg: 'sc raw' adjusted output 2018-07-08 21:54:22 +02:00
Chris 99eaef27fd chg: 'sc' more debug 2018-07-08 20:34:47 +02:00
Chris df4c0014f6 chg: i2c fixes 2018-07-08 13:52:30 +02:00
Chris b49eea5637 chg: 'sc raw' -i2c correct lenght? 
chg: 'sc upgrade' - warning message
chg: 'sc reader' - print right amount of bytes
 2018-07-08 12:03:35 +02:00
Chris f9ba0e59fa chg: 'sc list' - hooked up list command (runs 'trace list 7816' ) 
chg: 'sc reader' - added 's' silent parameter
chg: 'sc info' - added 's' silent parameter
 2018-07-08 11:19:26 +02:00
Chris bcffde1198 chg: smartcard - wait until SCL goes high 2018-07-06 11:16:46 +02:00
Chris f130b97051 chg: 'sc' textual 2018-07-05 21:16:14 +02:00
Chris 36d774506c chg: 'sm raw' - implemented 'r' don't read reply 2018-07-05 21:10:21 +02:00
Chris 1a2ef57c0c chg: 'sm raw' - allowing hex bytes to be with & without space. 112233 and 11 22 33 2018-07-05 20:53:50 +02:00
Chris fca841122f chg: 'sc reader' - hooked up atr. 2018-07-05 16:32:10 +02:00
Chris 89352c47c1 chg: removed smart card test things. 2018-07-05 15:07:41 +02:00
Chris ee006c6a7b add: sc upgrade - beta test 2018-07-05 14:38:31 +02:00
Chris f70b8be5de add: 'sc' - smart card commad [rdv40] 
chg: test to read out firmware
 2018-07-05 10:48:24 +02:00
Chris 26ff7fa297 chg: clean up 2018-07-04 15:26:39 +02:00
Chris f2ad37aa00 chg: hexlen is half size.. 2018-07-04 14:33:59 +02:00
Chris e536cb082f chg: removed warning 2018-07-04 13:08:59 +02:00
Chris dfa4f62ab6 chg: 'hf iclass chk' textual info 2018-07-01 11:56:08 +02:00
Chris 942e64706d chg: textual, and increase cmds receive buffer to 100. 2018-06-30 22:54:30 +02:00
Chris 2b294912ee chg: 'hf iclass chk' - enabled credit/debit key selction 
chg:  'hf iclass lookup'  - enabled credit/debit key selction
fix: first item in dictionary file now correct identified
chg: code cleanup
 2018-06-30 22:47:07 +02:00
Chris cd3fc9242e chg: iclass output 2018-06-30 18:34:58 +02:00
Chris 6967fe667d chg: test for smartcard client support 2018-06-23 06:44:44 +02:00
Chris f443ddb880 chg: force flushing after dbg printing 2018-06-23 06:34:35 +02:00
Chris f62c231830 chg: missing tab 2018-06-23 06:33:48 +02:00
Chris 5e1a3b7168 chg: cleaning up 2018-06-23 06:33:20 +02:00
Chris 1b0a49c8ab chg: from offical 2018-06-17 13:07:00 +02:00
Chris 9d91856811 chg: from official 2018-06-17 12:55:32 +02:00
Chris 3fd1854b8a chg: from offical 2018-06-17 12:55:09 +02:00
iceman1001 49c8ec65f5 typoo 2018-06-03 23:39:55 +02:00
iceman1001 a2c7158f78 fixes from #616 2018-06-03 23:32:02 +02:00
iceman1001 d2d126878e helptext, syntax 2018-05-28 21:34:58 +02:00
iceman1001 c15e755e5f add: base64 support 2018-05-23 10:37:11 +02:00
iceman1001 5d86eb5b69 add: another one 2018-05-23 09:32:42 +02:00
iceman1001 f3f7245fc0 add: 'mem read' - read / prints flahsmemory from device (not downloading) 
chg: 'mem info' - added possibility to verify signature
 2018-05-23 09:30:33 +02:00
iceman1001 e6b18888e7 chg. textual 2018-05-22 12:10:56 +02:00
iceman1001 ad819efbdc fix: typo 2018-05-13 07:24:49 +02:00
iceman1001 56f00cb2ac fix #214 - typo (thanks to @tautcony for noticing) 2018-05-12 19:13:02 +02:00
iceman1001 99d7546ca4 @micolous changes 
CHG: - Make all examples platform-specific
CHG: - Remove ModemManager rant on non-Linux platforms

Ref:  e2aa5eb47c
 2018-05-06 22:43:46 +02:00
iceman1001 110a7b28cb chg: 'hf 14a sim' - possibility to simulate FM11RF005SH (@maozhenyu123) 
chg: 'hf 14a info' - tag identification for FM11RF005SH (@maozhenyu123)

Fudan FM11RF005SH , has 512bit mem,  16blocks w 4bytes / block.
Support REQA, READ, WRITE, AUTH.   Unknown how the auth is done.

The ATQA/SAK ,  or a trace from one of these tags would be intersting to look at.
 2018-05-06 09:24:28 +02:00
iceman1001 adb1b90580 chg: friendly exit message (@marshmellow42) 2018-05-05 19:00:08 +02:00
iceman1001 9581317d3a chg: some more commands 2018-05-05 18:59:31 +02:00
iceman1001 d815ebdd4e fix: 'hf mfu dump' - partial dump detection 2018-05-03 23:01:30 +02:00
iceman1001 32a1bb4c01 fix: 'hf mfu dump' - increased timeout in order to read ntag216 tags 2018-05-03 21:54:53 +02:00
iceman1001 faa6ece881 chg: converting some more malloc calls -> calloc 2018-05-03 19:45:59 +02:00
iceman1001 939b727c42 chg: converting malloc calls -> calloc which zeros out the allocated memory 2018-05-03 19:42:16 +02:00
iceman1001 e50fef6607 fix: 'mem load' - wrong offset when uploading 2018-05-03 16:10:38 +02:00
iceman1001 3ef9102c17 chg: WARNING, wrong prefix 2018-05-03 12:45:27 +02:00
iceman1001 93d154f58c chg: 'mem load' added a max filesize check. 2018-05-03 12:22:17 +02:00
iceman1001 021c0a1349 ADD: 'mem' commands. For RDV40 devices only. 
If you don't have one,  comment out inside client/Makefile this line

CFLAGS += -DWITH_FLASH
 2018-05-03 12:15:03 +02:00
iceman1001 d0b9d12bde chg: added some colors 2018-05-03 12:12:55 +02:00
iceman1001 45e6c96bda .... 2018-05-03 11:04:51 +02:00
iceman1001 0e7d8faf59 chg: 'hf mf csave' 
chg: 'mem save'
chg: 'hf 15 dump' - no extra newline after last block in emlfile
 2018-05-03 11:02:50 +02:00
iceman1001 53feba2bbe fix: 'hf iclass eload 'should increase data array to upload... 2018-05-03 11:00:15 +02:00
iceman1001 1d8d611737 chg: unified download 2018-05-02 19:54:06 +02:00
iceman1001 6f7d0dffdc chg: unified download 2018-05-02 19:52:31 +02:00
iceman1001 baf6beec2e chg: unified download 2018-05-02 19:51:10 +02:00
iceman1001 295054c190 chg: unifying some different download functions from device. 2018-05-02 19:37:51 +02:00
iceman1001 b279d04c85 chg: moving around includes 2018-05-02 19:37:20 +02:00
iceman1001 65c1a6b2c1 remove old data.c files. Code now in cmdmain.c 2018-05-02 18:10:17 +02:00
iceman1001 d9045635fb whitespace 2018-05-02 18:09:46 +02:00
iceman1001 7d5322fc6e whitespace 2018-05-02 18:08:47 +02:00
iceman1001 be4c5118b1 chg: remove obsolete data.c 2018-05-02 08:16:59 +02:00
iceman1001 a8dbbc1609 chg: forgot one 2018-05-02 08:13:23 +02:00
iceman1001 207fa2b574 add: potential fix for OSX uses, by @piwi 
chg:  adapting fix to support iceman forks extended commands.
 2018-05-02 08:11:29 +02:00
iceman1001 886f7fbdad chg: 'hf search' textual 
chg: 'lf search' textual
 2018-04-27 17:38:41 +02:00
iceman1001 cff2473cf8 testing. RDV40 Flashmemory upload / download working. 2018-04-27 16:51:08 +02:00
iceman1001 fe339872d8 chg: 'data bitsamples' - getfrombigbuf has now timeout 
chg: 'data hexsamples' -  getfrombigbuf has now timeout
chg: 'data samples' -  getfrombigbuf has now timeout
 2018-04-27 16:50:22 +02:00
iceman1001 69346852a6 chg: 'hf felica dumplite' - getfrombigbuf has now timeout 2018-04-27 16:49:34 +02:00
iceman1001 9577dad1aa chg: 'hf iclass reader - getfrombigbuf has now timeout 2018-04-27 16:48:59 +02:00
iceman1001 cc0fac016b chg: 'lf cotag - remove unneeded variable 2018-04-27 16:48:12 +02:00
iceman1001 d7e6b5d6a1 chg: 'lf hitag list' - getfrombigbuf has now timeout 2018-04-27 16:47:29 +02:00
iceman1001 511cae77f1 chg: 'lua scripting' - getfrombigbuf has now timeout 2018-04-27 16:46:38 +02:00
iceman1001 a42580317c chg: 'trace list' - getfrombigbuf has now timeout 2018-04-27 16:45:49 +02:00
iceman1001 fec833de03 chg: 'lf t55 resetread' - getfrombigbuf has now timeout 
chg: 'lf t55 '   - (aquiredata)  getfrombigbuf has now timeout
 2018-04-27 16:45:02 +02:00
iceman1001 c7067d0057 CHG: added extra out-of-bounds check when downloading data from device. 2018-04-27 12:36:53 +02:00
iceman1001 271cb3e1cc chg: \r didn't work well with printandlogex 
chg: spaces
chg: cleaning
 2018-04-27 12:15:26 +02:00
iceman1001 c41013d394 chg: printandlogex now deals with string which has inital newline char. 2018-04-27 11:22:30 +02:00
iceman1001 cd93f3a134 ADD: sample buffer size variable, to keep track of possible download lengths which is reserved on client. 2018-04-27 10:09:14 +02:00
iceman1001 7a17e7e753 chg: 'lf search' - remove some block prints for AutoCorrelate 
chg:  textual
 2018-04-26 14:39:11 +02:00
iceman1001 8730b020b3 chg: space? 2018-04-26 14:26:28 +02:00
iceman1001 ef867794d1 chg: ...textual 2018-04-26 14:19:33 +02:00
iceman1001 e4bf5d3c66 chg: might fix timing issues between threads. 2018-04-26 12:13:03 +02:00
iceman1001 4f1e2f80c5 fix: 'hf mf esave' - no extra newline in the end of the file 2018-04-26 12:05:18 +02:00
iceman1001 e119db8683 chg: textual 2018-04-26 08:46:17 +02:00
iceman1001 96a5cefe97 fix: wrong string used. 2018-04-25 18:13:28 +02:00
iceman1001 fcad4054b6 CHG: PrintAndLogEx, prints prefixes on without the \n in string 2018-04-25 09:28:27 +02:00
iceman1001 f5257f5380 fixes: 'script run mifareplus' behaves better now. 2018-04-25 09:22:41 +02:00
iceman1001 409c7b1029 chg: added some nedap blocks 2018-04-20 16:09:40 +02:00
iceman1001 cc181c3f91 chg: downloading of flashmemory to client. 2018-04-20 15:26:34 +02:00
iceman1001 a746699f5f chg: reading / writing flashmem works better now. 2018-04-19 00:27:44 +02:00
iceman1001 fd52946ef8 chg: missing import, added sample to helptext and better length checks. (@neuromancer) 2018-04-18 22:21:16 +02:00
iceman1001 2e6699273e chg: cleanup from offical repo 2018-04-18 20:17:00 +02:00
iceman1001 646ff0ce68 add: 'script run mifare_access' script which tries to decode Mifare Classic access bytes. (thanks to @neuromancer) 2018-04-18 19:20:13 +02:00
iceman1001 ec54fa5b30 fix: crc16 ccitt in utils.lua has been adapted for the new crc16. 2018-04-18 16:08:46 +02:00
iceman1001 a968ea8c53 chg: latest fixes 2018-04-17 13:26:28 +02:00
iceman1001 e09f26c862 chg: extra space 2018-04-06 23:53:33 +02:00
iceman1001 e8be06dd31 fix: 'data plot' - plot window now hides when keypress Q 2018-04-06 23:52:55 +02:00
iceman1001 190be2bd43 chg: 'data plot' - keypress Q doesn't hide / close window.. still unsolved. 2018-04-06 23:11:26 +02:00
iceman1001 eb2e3ce681 chg: to debug.. 2018-04-06 23:02:56 +02:00
4m4rOk 2c490063da
Fixed undeclared identifier 
Building the client fails because the identifier "ERROR" is undeclared. Changing it to "ERR" fixes this.
 2018-04-06 22:53:37 +02:00
iceman1001 2aa9372534 CHG: rename of global variable 
CHG: adjusted outputs.
 2018-04-06 09:25:34 +02:00
iceman1001 2e3308b257 add: 'script run mifareplus' - a script to communicate with Mifare Plus tag. (@dceliano) 
chg: added a bunch of gitignores for my dev-env.
 2018-04-05 11:57:44 +02:00
iceman1001 395fd82935 add: information on loclass binary files 2018-04-05 11:41:48 +02:00
iceman1001 0aa6568bf9 fix: 'hf mfu' increase array 2018-04-04 12:28:30 +02:00
iceman1001 6b63f704cc chg: adding spaces 2018-04-03 11:58:35 +02:00
iceman1001 967dbce1f2 chg: 'script run ul_uid' - tried to add suppor to for brickable magic tags which must be written in one session. 2018-04-03 11:24:58 +02:00
iceman1001 4b2a746ef5 ADD: 'hf mfu' detection of Mifare Ultralight NANO tags. 
Interesting tag with two new commands.  LOCK_SIG  / WRITE_SIG.   Need to add support for it.
https://www.nxp.com/docs/en/data-sheet/MF0UN_H_00.pdf
 2018-04-03 09:57:20 +02:00
iceman1001 089beed4f4 fix: 'script lf_bulk' - parity fixes (@pwpiwi) 2018-03-29 13:20:00 +02:00
iceman1001 d0b3f1311e chg: using_history? (suggestion of @pwpiwi) 2018-03-28 20:29:34 +02:00
iceman1001 37ff9275f1 reverted 2018-03-28 15:06:27 +02:00
iceman1001 90e63e10fb chg: wrong variable name 2018-03-28 13:05:23 +02:00
iceman1001 31bc214137 chg 2018-03-28 13:00:44 +02:00
iceman1001 230c279124 fix: 'lf indala' Commit 1dae981 extended the amount of 
fixed bits searched for when decoding 64-bit Indala. These additional
bits come from the end of one UID, and therefore need to be skipped past
when actually retrieving the UID.  (@megabug)
b05611a30b
 2018-03-28 12:53:27 +02:00
iceman1001 8f9da28a93 fix: reverting LF adjustment, will enable some LF to work properly again. 2018-03-26 12:02:22 +02:00
iceman1001 9f7d9a5d7f chg: 'trace save' - removed redundant message 
chg: 'trace load' - add check if file is too small to be useful
 2018-03-21 08:33:41 +01:00
iceman1001 4dd7c19be1 fix: causes readline to crash a lot on ubuntu 2018-03-21 08:13:07 +01:00
iceman1001 b5545f4c35 chg: 'trace save' - now uses fileutils.c instead. 2018-03-20 08:23:54 +01:00
iceman1001 3d92a616b7 fix: to_lower -> tolower 2018-03-19 19:24:52 +01:00
iceman1001 c814615e1b chg: helptext now shows correct sample key. (thanks @Dmanufacturer for pointing it out) 2018-03-19 19:19:57 +01:00
iceman1001 4ea466ac56 space 2018-03-19 18:17:04 +01:00
iceman1001 0abb85a411 chg: 'hf mfu dump' - renamed filename parameter from 'n' to 'f', since 'f' is used on other command (iClass) 
chg: generic to_lower can remove some cases
 2018-03-19 18:16:33 +01:00
iceman1001 15d258a30a fix: tracebuffer, and messages 2018-03-19 16:13:31 +01:00
iceman1001 e182d12ba8 chg: textual 2018-03-18 21:49:48 +01:00
iceman1001 52a0acd7f1 chg: 'trace save' better checks 
chg: 'trace load' closing filehandles..
 2018-03-18 21:47:16 +01:00
iceman1001 c30e282f5e chg: 'trace list' - allocating memory 2018-03-18 21:18:26 +01:00
iceman1001 7ecd35943c chg: 'trace load' 
chg: 'trace save'

all from @pwpivi PR in offical pm3 repo https://github.com/Proxmark/proxmark3/pull/577

Adapted for bigger filesizes and offline/online detection.
Currently a bug somewhere....
 2018-03-18 19:58:22 +01:00
iceman1001 71ce6e07ee CHG: moved trace commands into its own category (from hf) 
'trace list'

there will also the load / save of trace buffer come.

For backwardfunctionality the old commands still works.
 2018-03-18 18:00:41 +01:00
iceman1001 4c666e3832 add: OSX readline fixes ( @micolous ) 
0763239363
 2018-03-17 14:35:34 +01:00
iceman1001 0656edbb85 chg: 'hf mfu dump' message 2018-03-17 14:34:55 +01:00
iceman1001 b0eaa730c0 FIX: 'hf mfu dump' - partial reads leads to overwritten data on wrong blocks. 2018-03-16 16:31:10 +01:00
iceman1001 0eca7e3977 chg: #define rename 2018-03-16 08:58:07 +01:00
iceman1001 7a71df3aec syntax sugar 2018-03-15 22:35:11 +01:00
Johnny Bengtsson fdda1d2961
Minor warning correction. 
This fix resolves the warnings as printed below. 

ui.c: In function ‘PrintAndLogOptions’:
ui.c:40:45: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 4 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
        snprintf(format, sizeof(format), "%%%us%%%us", space, counts[j]);
                                             ^
ui.c:40:50: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 5 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
        snprintf(format, sizeof(format), "%%%us%%%us", space, counts[j]);
                                                  ^
ui.c:42:54: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 4 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
                 snprintf(format, sizeof(format), "%%%us%%-%us", space, counts[j]);
                                                      ^
ui.c:42:60: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 5 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
                 snprintf(format, sizeof(format), "%%%us%%-%us", space, counts[j]);
 2018-03-15 13:59:43 +01:00
iceman1001 fd7acc78f3 fix: 'hf 14a info' - ATS length sanity check added 2018-03-13 23:16:48 +01:00
iceman1001 24482211ad chg: the dot progress is not logged anymore. Force fflush afterwards. 2018-03-05 20:07:29 +01:00
Brian Pow a352dbd93f migrate some usage text to call PrintAndLogOptions() 2018-03-01 23:55:13 +08:00
Brian Pow 88073dc5ce add PrintAndLogOptions 2018-03-01 23:34:14 +08:00
iceman1001 04d4ecddbf FIX: 'data plot + keypress g on empty plot' correct fix. 2018-03-01 14:35:47 +01:00
iceman1001 0eaae0cbae chg: another "." progress 2018-03-01 14:12:17 +01:00
iceman1001 40cc0a402b chG: adjust some "." progress dots, that shouldn't use NORMAL.. 2018-03-01 14:10:52 +01:00
iceman1001 5de4d9d3a6 FIX: 'data plot window' - keypress G in an empty plot crashed the client. Missing parenthis. 2018-02-28 21:53:42 +01:00
iceman1001 802994d30a add: 'hf 14 antifuzz' - the outline for the new functionality which fuzzes the anticollision phase ISO 14443a. 2018-02-28 13:21:47 +01:00
iceman1001 184ab1aeab fix: output from reconnect, seems to get stuck and not continue into cli. 2018-02-28 08:23:49 +01:00
iceman1001 97c029fc55 textual output 2018-02-28 08:12:21 +01:00
Brian Pow e0121a3bfd reformat usage text 2018-02-27 22:59:15 +08:00
Iceman b63e9ab938
Merge pull request #183 from brianpow/hf-15-restore 
implement 'hf 15 restore'
 2018-02-26 21:06:29 +01:00
iceman1001 867a3a8f0c fix: wrong size 2018-02-24 18:11:54 +01:00
Brian Pow d8f0863a2a PrintAndLogEx supports multi-line messages 2018-02-25 00:39:05 +08:00
Brian Pow c0c89a0e7b implement 'hf 15 restore' 2018-02-24 21:45:51 +08:00
Brian Pow a4fa0144eb migrate PrintfAndLog() to PrintAndLogDevice() 2018-02-22 23:17:46 +08:00
Brian Pow 668b44ba26 use PrintAndLogEx() instead of PrintAndLog() 2018-02-22 20:49:39 +08:00
Brian Pow f0314562f7 fix typos 2018-02-22 20:47:23 +08:00
iceman1001 d8281e69fd chg: skip printing debug statements when not debugging. 
chg:  started with a coloring of messages.  Didn't work super well..
 2018-02-21 19:00:42 +01:00
iceman1001 a9c652bb6c no need for formatting 2018-02-21 18:20:50 +01:00
iceman1001 65a4253e7e print.. 2018-02-21 17:56:09 +01:00
iceman1001 b5500c3e54 simple debug.. 2018-02-21 16:48:52 +01:00
iceman1001 db6b1bab7d simpler debug 2018-02-21 16:46:38 +01:00
iceman1001 0248352ea6 chg:simpler debug printing 2018-02-21 16:41:39 +01:00
iceman1001 e69ca55246 chg: more.. 2018-02-21 16:37:20 +01:00
iceman1001 555b261eab simpler debug printing 2018-02-21 16:36:40 +01:00
iceman1001 e29503b368 chg: easier debug printing 2018-02-21 16:31:34 +01:00
iceman1001 7064a2dd71 chg: made debugprintig easier. 2018-02-21 16:30:15 +01:00
iceman1001 a29b2328db fix: g_debugMode - client side global debugvariable, moved to util.c 2018-02-21 15:54:13 +01:00
iceman1001 180e3d4df9 chg: adaptations for global debug var to be accessible 2018-02-21 14:59:06 +01:00
iceman1001 dc22ba144c fix: adapting for g_debug access.. 2018-02-21 14:52:31 +01:00
iceman1001 69aa3bfeed chg: skip printing DEBUG messages if global client debug variable it set to zero. 2018-02-21 14:42:00 +01:00
Brian Pow 731a7db4e6 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 21:03:36 +08:00
Brian Pow 6ba31a5581 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 21:03:36 +08:00
Brian Pow 5d332d38ef use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 21:03:36 +08:00
Brian Pow 26af82879a use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 21:03:35 +08:00
Brian Pow e9185085c7 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 21:02:28 +08:00
Brian Pow 39f44c33a4 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:56:39 +08:00
Brian Pow 7a9612036d use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:56:39 +08:00
Brian Pow 6d6f5f422d use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:56:39 +08:00
Brian Pow ee3da288e3 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:56:39 +08:00
Brian Pow 14c68d47ec use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:56:38 +08:00
Brian Pow d8518f0b00 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:56:38 +08:00
Brian Pow e68055ac65 use PrintAndLogEx() instead of PrintAndLog(), remove uerr() 2018-02-21 20:43:56 +08:00
Brian Pow 0de94cff10 use PrintAndLogEx() instead of PrintAndLog(), tweak messages 2018-02-21 20:43:56 +08:00
Brian Pow dff2a778b1 use PrintAndLogEx() instead of PrintAndLog(), tweak message 2018-02-21 20:43:56 +08:00
Brian Pow 936581b4ac use PrintAndLogEx() instead of PrintAndLog(), tweak messages 2018-02-21 20:43:56 +08:00
Brian Pow 69586e5dd6 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:56 +08:00
Brian Pow 5bd7ba6fd0 use PrintAndLogEx() instead of PrintAndLog(), tweak messages 2018-02-21 20:43:56 +08:00
Brian Pow bfa510cce1 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:55 +08:00
Brian Pow 217647d993 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:55 +08:00
Brian Pow 24274ff2fe use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:55 +08:00
Brian Pow a7f61f7811 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:55 +08:00
Brian Pow b4b26377d8 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:55 +08:00
Brian Pow 6a1c2895e0 use PrintAndLogEx() instead of PrintAndLog(), tweak messages 2018-02-21 20:43:54 +08:00
Brian Pow 72b733b833 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:54 +08:00
Brian Pow 9c574b4920 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:54 +08:00
Brian Pow a84d863fc2 use PrintAndLogEx() instead of PrintAndLog(), tweak messages 2018-02-21 20:43:54 +08:00
Brian Pow bec3b6c468 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:54 +08:00
Brian Pow 4306f85343 tweak messages 2018-02-21 20:43:54 +08:00
Brian Pow 9b7bd49665 tweak messages 2018-02-21 20:43:53 +08:00
Brian Pow 6003d4ffa0 tweak messages 2018-02-21 20:43:53 +08:00
Brian Pow 858224244d tweak messages 2018-02-21 20:43:53 +08:00
Brian Pow 43ec321e53 tweak messages 2018-02-21 20:43:53 +08:00
Brian Pow b1318c6e0c use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:52 +08:00
Brian Pow 618b868daf tweak message 2018-02-21 20:43:52 +08:00
Brian Pow c80c992ff3 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:52 +08:00
Brian Pow 2cea36c3b5 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:51 +08:00
Brian Pow 740a1daaa4 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:51 +08:00
Brian Pow 8e15b3fa22 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:51 +08:00
Brian Pow 8c435c2725 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:51 +08:00
Brian Pow 0f6e779e0d use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:51 +08:00
Brian Pow 8a408088af tweak message 2018-02-21 20:43:51 +08:00
Brian Pow d34e95b9a8 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:50 +08:00
Brian Pow 2a3f670e0c use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:50 +08:00
Brian Pow 621a349e61 tweak messages 2018-02-21 20:43:50 +08:00
Brian Pow 4afe5e6ce0 tweak messages 2018-02-21 20:43:50 +08:00
Brian Pow 6582a2ccb1 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:50 +08:00
Brian Pow cafa0649f5 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:50 +08:00
Brian Pow 02694401e8 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:49 +08:00
Brian Pow b8f106d7a7 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:49 +08:00
Brian Pow 44bd1cd13d use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:49 +08:00
Brian Pow 9aee92f27d use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:49 +08:00
Brian Pow 5b0233854d use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:49 +08:00
Brian Pow ec0fa961a1 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:49 +08:00
Brian Pow 78647f4502 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:48 +08:00
Brian Pow 37b1b9a650 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:48 +08:00
Brian Pow cf7b12a734 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:48 +08:00
Brian Pow 72ce7dc595 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:48 +08:00
Brian Pow d8c8874bdf use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:48 +08:00
Brian Pow 9fa5d23cc5 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:47 +08:00
Brian Pow 7e125b9bfb use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:39:54 +08:00
Iceman 4efb9aba4d
Merge pull request #177 from brianpow/PrintAndLogEx 
add PrintAndLogEx()
 2018-02-21 07:20:43 +01:00
Brian Pow 68fddf00ce simplify PrintAndLogEx() 2018-02-21 14:10:44 +08:00
iceman1001 4e915d2eb4 chg: prng detection now takes in consideration if detection fails. 2018-02-20 21:20:17 +01:00
iceman1001 9512f60227 chg: formatMifare.lua helptext output 2018-02-20 20:20:34 +01:00
iceman1001 5dbfb627fc chg: 'brutesim' - script prints author and checks for being called with no arguments. 2018-02-20 20:18:37 +01:00
iceman1001 5b6a5206df add: 'script run lf_bulk' - the original script is call lf_buld_program but thats a too long name, with adaptations in code. 
chg: some script textual output
 2018-02-20 20:16:30 +01:00
tuxthemadpenguin ce27e5d7e1
Adding MBTA keys - same for every card 2018-02-19 11:02:18 -05:00
iceman1001 e6f51451aa chg: added the mutex lock to printing in communications thread. 2018-02-18 10:36:15 +01:00
iceman1001 41540ae1c1 chg: removed warning of uninitilised 2018-02-15 23:47:16 +01:00
iceman1001 9e1e9af794 chg: 'data autocorr' - adjustment of parameters. 2018-02-15 20:23:54 +01:00
iceman1001 a38904c453 CHG: 'data autocorrelate' - now using proper autocorrelate algo. 2018-02-15 17:57:28 +01:00
Brian Pow 5ea8b4348c add PrintAndLogEx() 2018-02-15 23:32:08 +08:00
iceman1001 a1dd7c2020 chg: 'hf list mf' - adapted the output from 16bytes rows to 18 in order to make output more easily to compare 2018-02-15 11:47:34 +01:00
Federico Cerutti 8d152d24f2 Merge branch 'master' of https://github.com/iceman1001/proxmark3 2018-02-15 00:21:25 +01:00
Federico Cerutti 58ddd53fb0 Removed hf 15 select: broken command 2018-02-15 00:13:27 +01:00
iceman1001 acda2ebc66 fix: 'hf list mf' - decrypting works now. Missed a bit. 2018-02-15 00:03:01 +01:00
iceman1001 326079fbb6 chg: timing text 2018-02-14 23:53:32 +01:00
iceman1001 b8ddb3b384 chg: 'hf list mf' - 10b uid 2018-02-14 23:48:45 +01:00
iceman1001 ad99b4f394 add: 'hf list mf' - old 'hf mf sniff' decoding of data has now been incorporated annotations instead. (@merlokk) 
---most likely broke something.. :)  needs proper testing.
 2018-02-14 23:03:39 +01:00
iceman1001 604aaf5356 fix: missing in header.. 2018-02-14 21:56:28 +01:00
Iceman 2b78b785f3
Merge pull request #173 from brianpow/rename-prnlog-to-PrintfAndLog 
Rename prnlog() to PrintfAndLog()
 2018-02-14 21:47:54 +01:00
iceman1001 b2a3b0f72a chg: 'lf cmdread' @marshmellow42 improvements from https://github.com/Proxmark/proxmark3/pull/570 
chg:  and some adaptations..
 2018-02-14 21:40:52 +01:00
iceman1001 8c5ab9cf18 textual 2018-02-14 16:18:04 +01:00
iceman1001 e09d5385bf chg: clearing some mem.. 2018-02-14 15:27:39 +01:00
iceman1001 97803733ce fix: 'hf 15 raw' - wrong length when using -c param 
https://github.com/iceman1001/proxmark3/issues/174
 2018-02-14 15:24:45 +01:00
iceman1001 46d540490f chg: add response ack. 2018-02-13 15:45:15 +01:00
iceman1001 1709c1ce1a chg: flash_mem - hooked up client - device comms 2018-02-13 15:36:20 +01:00
Brian Pow 8f9c81ae81 Rename prnlog() to PrintfAndLog() 2018-02-13 00:12:50 +08:00
iceman1001 1b8ff6c45c syntax 2018-02-11 17:46:14 +01:00
Iceman 9af8d0e7ac
Merge pull request #164 from brianpow/master 
CHG: 'hf mf dump' now use hf-mf-UID-key.bin and hf-mf-UID-data.bin in…
 2018-02-11 17:42:40 +01:00
Iceman 442ad9f481
Merge pull request #172 from n0ncetonic/patch-2 
Adds default PicoPass 2k Exchange Key
 2018-02-11 14:10:57 +01:00
noncetonic b3c6103f92
Adds key 
Actually adds the key...
 2018-02-09 11:24:25 -08:00
noncetonic fb05042b71
Adds default PicoPass 2k Exchange Key 
PicoPass 2k doc describes loading Kd and Kc via their "encrypted values" composed of the default exchange key  XOR'd with Kd/Kc
 2018-02-09 10:12:40 -08:00
Brian Pow 8b00d6c121 FIX: remove ISO14A_NO_DISCONNECT when reading the UID from mifare card 2018-02-10 00:01:50 +08:00
Brian Pow b1d414c680 CHG: replace 'samples:' with 'Examples:', unify some usage text 2018-02-09 22:56:16 +08:00
Brian Pow a02ec72f50 CHG: 'hf mf hardnested r' now read the corresponding bin file if tag presents, otherwise read nonces.bin 2018-02-09 22:56:16 +08:00
Brian Pow e1bc58692d Improved error detection and message if missing paramters for 'hf mf hardnested' 2018-02-09 22:56:15 +08:00
Brian Pow 35e62e7d1f CHG: 'hf mf hardnested' now use hf-mf-<UID>-nonces.bin by default, with parameter 'u' or 'f' to override. 2018-02-09 22:56:15 +08:00
Brian Pow d9882c9167 ADD: help in 'hf mf ice'. Save to hf-mf-<UID>-nonces.bin by default, with 'f' switch to override the default name 2018-02-09 22:56:15 +08:00
Brian Pow 53540fe206 ADD: 'hf mf restore' now allow user to specify the filename to restore 2018-02-09 22:56:15 +08:00
Brian Pow 756378e3c7 CHG: Added two switches for 'hf mf dump'. 'k' for key filename and 'f' for data filename, 
FIX: Stop dumping/restoreing a tag if failed to generate filename using uid
 2018-02-09 22:56:14 +08:00
Brian Pow 19fc90fa71 FIX: Stop dumping/restoreing a tag if failed to generate filename using uid 2018-02-09 22:54:55 +08:00
Brian Pow 8e04df77ba FIX: GenerateFilename() return broken filename if no tag is detected. 2018-02-09 22:54:55 +08:00
Brian Pow 45c20d62b8 FIX: wrongly assume the max size of UID to 8 bytes. Max size should be 10 bytes. 2018-02-09 22:54:55 +08:00
Brian Pow 551cc5539b Updated header file for better consistency of parameter name 2018-02-09 22:54:55 +08:00
Brian Pow 39d2a92ead CHG: use FillFileNameByUID() for filename generation for 'hf 15 dump' 2018-02-09 22:54:54 +08:00
Brian Pow d050e473b7 CHG: use FillFileNameByUID() for filename generation for 'hf mf dump' and 'hf mf chk * ? d' 2018-02-09 22:54:54 +08:00
Brian Pow 314253c359 CHG: 'hf mf dump' now use hf-mf-UID-key.bin and hf-mf-UID-data.bin instead of dumpkey.bin and dumpdata.bin as default name 2018-02-09 22:54:54 +08:00
iceman1001 f1dcdaef27 fix: 'hf mf fchk' wrong number of vars to format string 2018-02-09 13:40:28 +01:00
iceman1001 5b596f8e82 chg: 'hw tune' - only show plotwindow if LF antenna is connected (ie we get lf values) 2018-02-09 13:39:32 +01:00
iceman1001 ff598db839 textual 2018-02-09 00:28:30 +01:00
iceman1001 76e6683ac4 text 2018-02-09 00:27:30 +01:00
iceman1001 5adb9af78f chg: 'hw tune' - compensating the 3% error marginal. 2018-02-09 00:25:45 +01:00
iceman1001 fe34cac012 FIX: 'hf mf darkside' - no more WDT crashes. plus positive sideeffects (@pwpiwi) 
https://github.com/Proxmark/proxmark3/pull/569
 2018-02-08 19:11:35 +01:00
noncetonic 20af8e78ad
Adds PicoPass 2k Kd 
Found in documentation when describing how the exchange key is used with default Kd to send encrypted Kd. Kc also referenced but not sure if it's super useful
 2018-02-08 06:05:31 -08:00
iceman1001 39de74cb78 fix: wrong block 2018-02-08 12:39:35 +01:00
iceman1001 357cf59f1b textual 2018-02-08 12:35:59 +01:00
iceman1001 220614ca10 fix: 'hf iclass reader' - drop field when finished. 2018-02-08 12:34:13 +01:00
iceman1001 b31afcfc31 fix: 'hf iclass reader' - missing CC 2018-02-08 12:18:40 +01:00
iceman1001 2847a147b5 fix: 'hf iclass dump', missing CC 2018-02-08 12:15:47 +01:00
iceman1001 f6d314d09e chg: iclass dump textual.. 2018-02-08 11:03:11 +01:00
iceman1001 28e73824e1 chg: 'hf iclass dump' - more texts 2018-02-08 10:49:44 +01:00
iceman1001 30e9395590 fix: 'hf iclass lookup' - exit when failed to load dictionary file 2018-02-08 10:32:14 +01:00
iceman1001 7bf6e0d089 fix: 'hf iclass chk' - checking keys outside the first chunk of 128. 2018-02-08 09:30:34 +01:00
iceman1001 fb4b3502ef fix: 'script run mifare_autopwn.lua' - wrong bool comparision 2018-02-07 23:54:11 +01:00
iceman1001 c808eb0e87 chg: 'hf mf nested' - adjusted the candidate loop to handle all keys, not only max 85 keys. 2018-02-07 23:13:54 +01:00
iceman1001 c9479276dc textu 2018-02-07 22:02:04 +01:00
iceman1001 134d04cb7a FIX: 'hf mf darkside' - correct behaviour is to copy the key candidates to the list, not only to first position. 
This solves slow execution of command,  since before attack had to repeat until correct key was in pos 1.
 2018-02-07 21:51:45 +01:00
iceman1001 120abf10bc chg: tests with ansi-colors 2018-02-07 14:08:57 +01:00
iceman1001 6371dfc5b6 chg: made DropField function a compiler macro instead. 2018-02-06 22:32:08 +01:00
iceman1001 2820ba5580 chg: 'hf mf nested' 
chg: 'hf mf dump'   change retries to 10 times
 2018-02-06 20:08:42 +01:00
iceman1001 09b2a079ba chg: enable ansi-colors for OSX 2018-02-06 19:21:47 +01:00
iceman1001 88becf8b09 chg: missed a spot.. showBanner should not be shown on apple 2018-02-06 12:45:38 +01:00
iceman1001 843f453491 fix: saveFileEML() does not follow blocksize. Thanks to @brainpow 
ref
271dface40
 2018-02-06 12:43:58 +01:00
iceman1001 124ce7efc6 chg: from loclass demo file 2018-02-06 12:33:27 +01:00
iceman1001 304a59f710 chg: 'hf mf darkside' - .... nothing special... zero parity attack works, doesnt crash, but takes kind of long time 2018-02-05 23:16:09 +01:00
iceman1001 9e8c1d81a4 chg: 'hf mf darkside' - better output for zero-parity attack. 
chg: 'hf mf darkside' - now also honor keyboard interupt attack..
 2018-02-05 21:05:29 +01:00
iceman1001 b8e7f20945 chg: textual.. and moved a helptext 2018-02-05 21:03:51 +01:00
iceman1001 3464fbe1df fix 'hf mf darkside' - adapted solution from @pwpivi 2018-02-05 20:46:14 +01:00
iceman1001 09d8744b84 testual 2018-02-05 16:57:29 +01:00
iceman1001 c02ee39029 practising byte splitting and a startpattern detection for FeliCa... 2018-02-05 16:51:46 +01:00
iceman1001 b90c3db96b rename: 'hf mf mifare' -> 'hf mf darkside' Finally renamed this,... 
adjusted the help-texts
adjusted command tables,  to have separators in order to make it easier to read.  commands now grouped according to relevance.
 2018-02-05 16:50:06 +01:00
iceman1001 274370554f textual 
and only allow escape sequences on linux
 2018-02-05 16:47:57 +01:00
iceman1001 c72548562e chg: remove double exit text 
chg: escape chars didn't work on apple
 2018-02-05 16:38:00 +01:00
iceman1001 debf4e3327 chg: 'analyse hid' moved to 'hf iclass permute' un/permute function is moved. 2018-02-04 17:19:08 +01:00
iceman1001 7c89a191ef textual 2018-02-04 16:58:48 +01:00
iceman1001 6605d92fbb chg: tried making the reselect more stable. 
chg: 'hf iclass readblk'
chg: 'hf iclass writeblk'
chg: 'hf iclass dump'
chg: 'hf iclass clone'
        all commands now has 'v'  verbose parameter for more detailed output.
 2018-02-04 12:25:55 +01:00
iceman1001 6a9ddf6e69 chg 'hf iclass chk' - increased timeout, switch off antenna before each run in order to reset card, three retires. all this make it more stable. 2018-02-04 10:20:38 +01:00
iceman1001 dc25f9212f FIX: 'hf iclass sim 2' 
FIX: 'hf iclass sim 4'
FIX: 'hf iclass loclass' - this fixes the bug where loclass assumes the epurse value is all zeros, while it now should save the epurse value during the simulation if it is updated/read.

I assume a empty valid epurse, while an all zero epurse is too much easy to detect as a anomaly.
 2018-02-04 00:52:29 +01:00
iceman1001 7c8de64c57 textual 2018-02-03 23:15:14 +01:00
iceman1001 1ab498001e fix: 'reveng -g' stack crash by too small array 2018-02-03 23:05:01 +01:00
iceman1001 e95313cc22 fix: reveng needs a macro to compile. 2018-02-03 22:58:43 +01:00
iceman1001 7de458486f adjustments, still breaks on ubuntu, 2018-02-03 22:47:17 +01:00
iceman1001 0234ca5654 scripting, remove free 2018-02-03 22:33:51 +01:00
iceman1001 8a49cb84a2 fix: script run e - if called with param but no value, use default value for width. 
fix: if no models found, return lua error.
textual changes.
 2018-02-03 22:17:07 +01:00
iceman1001 2d2a8b7b1b fix: avoid empty strings. 2018-02-03 21:56:34 +01:00
iceman1001 2b34fbec0c fix: proper exit with script fails to find any crc models. 2018-02-03 21:49:29 +01:00
iceman1001 54f0c188dd add 2018-02-03 15:35:59 +01:00
iceman1001 c025e38d91 fix: remove warning.. 2018-02-02 17:32:02 +01:00
iceman1001 07d7b9424c chg: textual 2018-02-02 13:01:11 +01:00
iceman1001 fff8edd815 chg: textual.. 2018-02-02 12:59:40 +01:00
iceman1001 ccfdd60c09 chg: textual 2018-02-01 21:39:34 +01:00
iceman1001 cfb3654f7b chg: textual 2018-02-01 18:24:38 +01:00
iceman1001 55874d7872 chg: textual 2018-02-01 18:02:24 +01:00
iceman1001 59a461fd2b chg: 'hf iclass sim' ..double 2018-02-01 18:01:44 +01:00
iceman1001 8380743a42 chg: 'hf iclass sim' textual 2018-02-01 17:58:50 +01:00
iceman1001 111b55d850 chg: 'hf iclass sim' textual 2018-02-01 17:53:28 +01:00
iceman1001 e0373212a3 chg: 'hf iclass sim' - sim2, 4 get less default output, set DBG 4 for verbose 2018-02-01 16:10:24 +01:00
iceman1001 3248bb5a56 chg: 'hf iclass sim' - get ride of the "waiting for response" message. 
-- sim 2, 4  - cancel by keypress.
 2018-02-01 15:55:12 +01:00
noncetonic a52024ef3d
Updates command usage 
Updates `usage_hf_iclass_lookup` to match u/U being used for CSN vs c/C.
Updates `usage_hf_iclass_sim` to include "sim 4"
Updates `usage_hf_iclass_writeblock` to remove sample with invalid `n 0` option
 2018-02-01 06:41:44 -08:00
iceman1001 1965927009 chg: https://github.com/Proxmark/proxmark3/pull/558 (@pwpiwi) might solve the mystery crashes. 2018-02-01 15:24:36 +01:00
iceman1001 52d69ed4ee CHG: refactor CRC16 algos. This is a big change, most likely some parts broke, hard to test it all. 2018-02-01 15:19:47 +01:00
noncetonic 092c75961f
Adds HID Master Auth Key 
It's leaked so why not share it
 2018-02-01 04:21:04 -08:00
iceman1001 50e4d60853 chg: 'hf iclass lookup' adjusted helptext and parameters 2018-01-31 16:50:41 +01:00
iceman1001 e66b9c52b3 chg: some referense to "string.h" -> which should be <string.h> or removed. 2018-01-31 12:04:12 +01:00
iceman1001 bf25b1c9ba chg: crc16 got a compute_crc function 2018-01-30 03:31:11 +01:00
iceman1001 eb8e7a1679 intendention 2018-01-30 03:29:59 +01:00
iceman1001 c6207d09e1 chg: 'hf felica reader' is better, almost working good 2018-01-30 03:29:37 +01:00
iceman1001 b39332e938 REM: 'hf 15 debug' removed command, unified with mf_debuglevel instead. The idea is to have ONE debug flag on deviceside. 2018-01-29 15:58:00 +01:00
iceman1001 29c15b3480 cHG.. missing 2018-01-29 13:48:18 +01:00
iceman1001 ed982a4787 textual 2018-01-29 13:42:18 +01:00
iceman1001 c04ac4f9ac ADD: 'hf felica reader' - added pm3 as FeliCa reader 
ADD:  raw commands -  added the basis for sending RAW commands to FeliCa.
CHG: CRC16 rework,  uses table based implementation.  This will change more functions as I go on.
 2018-01-29 13:42:02 +01:00
iceman1001 51a65a0ce3 rem: removed unneeded function 2018-01-28 12:47:08 +01:00
iceman1001 205e4b2300 chg: adjusted the input parameters for crc16 implementations. 2018-01-28 12:19:04 +01:00
iceman1001 e396575424 add: fast reverse 16bit 2018-01-27 23:16:35 +01:00
iceman1001 ede55a1498 add: fast 8bit reversal. 2018-01-27 22:20:56 +01:00
iceman1001 dcdac209d4 fix: gcc7 warning 2018-01-26 20:44:57 +01:00
iceman1001 374c1b16f6 chg: remove gcc 7.0 warnings 2018-01-26 20:17:56 +01:00
iceman1001 13e521668f FIX: https://github.com/Proxmark/proxmark3/pull/555 (Thanks @arnie97) 2018-01-26 19:31:13 +01:00
iceman1001 4671b81115 chg: skip pointers and make a small number instead. 2018-01-25 20:54:15 +01:00
iceman1001 0582fdf934 chg: pointer should be unsigned 2018-01-25 20:29:22 +01:00
iceman1001 d3db40b7dd chg: remove warning 2018-01-25 20:12:33 +01:00
iceman1001 f01bc31486 CHG: removed warnings %zu size_t 2018-01-25 19:51:10 +01:00
iceman1001 20e9931b63 syntax sugar 2018-01-25 18:45:13 +01:00
iceman1001 f0e328a64b chg: since we now uses c99 as standard, we can use string formatter %zu 2018-01-25 18:41:59 +01:00
iceman1001 009e4f9d99 chg: use return value instead 2018-01-25 18:11:07 +01:00
iceman1001 681f2cc83d fix: bad compare. 2018-01-25 18:10:34 +01:00
iceman1001 f6b98acbf6 chg: turn off antenna when failed. 2018-01-25 18:02:49 +01:00
iceman1001 b10dca061a fix: too many arguments to function 2018-01-25 18:01:40 +01:00
iceman1001 c1b4411268 FIX: array-out-of-bounds 2018-01-25 17:59:11 +01:00
iceman1001 a13ecc4a4e CHG: applied https://github.com/Proxmark/proxmark3/pull/553 (@arnie97) and in some more places 2018-01-25 09:51:49 +01:00
iceman1001 aad1e65b97 FIX: cherrypick some fixes from https://github.com/Proxmark/proxmark3/pull/550 (pwpiwi) 2018-01-23 17:41:47 +01:00
iceman1001 be82f9f018 DEL: 'hf mf sniff' - since it is very similar to 'hf 14a sniff' , I removed this command. The desired functionality will become a new 'hf list mf' option in the future. 2018-01-18 14:11:22 +01:00
iceman1001 21dd3f68ea chg: 'hf mf sniff' - adjustments 2018-01-17 00:34:15 +01:00
iceman1001 d60721d131 chg: clean up 2018-01-17 00:30:43 +01:00
iceman1001 9a162c9a79 CHG: 'hf mf sniff' - output adjustments 2018-01-17 00:29:41 +01:00
iceman1001 1b20ff8243 chg, 'hf mf sim' is ok to call without parameter 2018-01-11 22:07:26 +01:00
iceman1001 8f6253c5ed chg: textual 2018-01-11 21:50:05 +01:00
iceman1001 706287619a FIX: 'hf mf sniff' - possible mf frame sizes for Desfire is 256 or more 2018-01-11 21:49:27 +01:00
iceman1001 5ea8f73547 FIX: cmd_send has wrong varible definitions, leading to loss of values. 2018-01-11 21:47:27 +01:00
iceman1001 1b61e01f0e chg: removed whitespaces. 2018-01-09 19:17:21 +01:00
iceman1001 2b093f8059 chg: 'hf iclass' textual 2018-01-09 16:31:54 +01:00
iceman1001 8103f8c7d0 syntax sugar 2018-01-09 16:30:30 +01:00
iceman1001 1d04e8822c chg: 'hf mf fchk' textual 2018-01-09 16:29:43 +01:00
iceman1001 f865b593d7 chg: 'hf mf fchk' helptext 
chg: 'hf mf sniff' textual
 2018-01-09 16:25:58 +01:00
iceman1001 eed271af5c CHG: 'hw tune' tuning antenna now can handle bigger antennas than 65v, with shifting 9, it can measure up to 130v. 
CHG: 'hw tune'  -  command output and layout changes.  I think this is easier to read.
 2018-01-09 14:53:17 +01:00
iceman1001 b578e55d17 chg: 'hf 14b snoop' renamed 'hf 14b sniff'... 
In order to use one command for SNIFFING..   All snoop names will be renamed.
 2018-01-06 21:12:28 +01:00
iceman1001 5dc1761943 FIX: solution one, for more avx, avx2, avx512 
ab0582d672
 2018-01-06 18:52:28 +01:00
iceman1001 cd1f5a58f5 ADD: 'script run ntag_3d.lua' - script to program xyz related ntag213f / magic ntag 2018-01-06 09:54:46 +01:00
iceman1001 07d51ec4a4 fix... don't even mention it... 2018-01-06 00:19:52 +01:00
iceman1001 1a2973a319 fix: 'hf mf hardnested' - crashes on SSE2 with mingw / windows, Huge thanks to @merlokk @pwpiwi for bug and fix! 
https://github.com/Proxmark/proxmark3/issues/404
 2018-01-05 18:01:59 +01:00
iceman1001 647d275d18 chg: 'hf felica litedump' - now turns off device when aborted via keyboard, or buttonpress 2018-01-05 17:57:50 +01:00
iceman1001 9a8331b882 textual 2018-01-05 17:42:21 +01:00
iceman1001 0fda0329eb textual 2018-01-05 17:41:11 +01:00
iceman1001 82dbfba827 chg: 'hf felica litedump' - more stable impl. Will not break when run twice in a row. Still device can be in a loop if 100sec timeout occures. :( 2018-01-05 17:39:04 +01:00
iceman1001 f0a5d10354 chg: 'hf iclass eload' better filename handling 2018-01-02 13:02:55 +01:00
iceman1001 fe9416db23 chg: 'hf iclass' - work in progress. running default_iclass_keys.dic against reader (pm3 as simulation) 2018-01-02 11:17:31 +01:00
iceman1001 c328f68640 fix: part of @pwpiwi 's #534 fixes 2018-01-01 18:57:37 +01:00
iceman1001 d9089e74b4 chg: textual 2018-01-01 18:54:01 +01:00
iceman1001 f92a6ddf7d FIX: 'hf iclass' - sneaky fread bug. thanks to @bettse who found it 2018-01-01 14:28:53 +01:00
Chris d5ce45bae7 FIX: 'hf mf chk' / 'hf mf fchk' - t/d param bug. Now it is not place dependent and can also read several dictionary files :) 2017-12-31 19:36:12 +01:00
iceman1001 2abcce598a lastone 2017-12-27 20:47:34 +01:00
iceman1001 97c176c10e additions of keys 2017-12-27 20:36:46 +01:00
iceman1001 7d25ab4561 Update loclass license conditions, https://github.com/Proxmark/proxmark3/issues/527 2017-12-27 10:34:51 +01:00
iceman1001 36eb64cef4 fix: making it strings 2017-12-24 11:04:13 +01:00
iceman1001 61b8594cb4 working progress.. 2017-12-24 10:59:24 +01:00
iceman1001 4e6140570e fix: add dummy 2017-12-24 10:57:21 +01:00
iceman1001 dc890104aa fix: spaces, and remove tabs 2017-12-24 10:56:17 +01:00
iceman1001 289b5fcb0f chg: adapting to path 2017-12-24 10:51:42 +01:00
iceman1001 e873c1decd chg: 'hf 15' updated some helptexts 2017-12-24 10:33:14 +01:00
iceman1001 f1e631ef56 chg: adapting path changes. 2017-12-24 10:32:15 +01:00
iceman1001 40b1922187 chg: added emv4 changes. 
broke out the includes into a variable instead. was getting long
 2017-12-24 10:29:50 +01:00
iceman1001 fefac686e8 chg: adapting to new locations, and changes in makefile. 2017-12-24 10:28:46 +01:00
iceman1001 590fd15c3a chg includes 2017-12-24 10:27:52 +01:00
iceman1001 ba17fe8130 chg: some iclass changes in the making. 2017-12-24 10:27:18 +01:00
iceman1001 a3ec7fd21f chg: 'hf emv' changes from @merlokk EMV4 commit 2017-12-24 10:26:47 +01:00
iceman1001 1deb171573 add dummy. 2017-12-24 10:07:44 +01:00
iceman1001 ac4ef684e5 fix: cherry picked fix LF SNOOP not working. 
https://github.com/Proxmark/proxmark3/pull/528
https://github.com/Proxmark/proxmark3/issues/514
 2017-12-23 22:17:30 +01:00
iceman1001 77bc60bc52 remov function 2017-12-23 11:24:10 +01:00
iceman1001 18a828d2fd chg: try to use native byteswapping functions when possible. 
chg:  bits_to_array  new function
 2017-12-23 09:51:20 +01:00
iceman1001 40dbb6b813 fix: one less block 2017-12-22 12:38:30 +01:00
iceman1001 6327b767fc fix: 'hf 15 read' - the correct comparison helps out a lot. 2017-12-21 16:02:19 +01:00
iceman1001 c8f087eeb9 fix: 'hf 15 dump' the crc now calcs over the right number of bytes in order to be compared with the check 2017-12-21 15:44:23 +01:00
iceman1001 d894e36b95 chg: textual 2017-12-21 14:30:24 +01:00
iceman1001 231b0df578 CHG: 'hf iclass reader' - the select / which blocks to read / before saying it succeded was corrupt 2017-12-21 13:48:06 +01:00
iceman1001 3634327bef chg: code cleaning. 2017-12-21 12:42:32 +01:00
iceman1001 70542749bf chg: moving 2017-12-21 10:15:10 +01:00
iceman1001 b2a5c8e33c chg: 'hf mf chk' - textual 2017-12-21 10:14:10 +01:00
iceman1001 5eafdbf872 ADD: 'hf iclass check' - increased speed in check keys with new algo. 
ADD: 'hf iclass' - trying to add the timeout-limits for commands in order to get a more stable iclass communication
 2017-12-21 10:13:40 +01:00
iceman1001 c2725bfa99 chg: enhanced rtrim for command prompt. 2017-12-21 10:08:07 +01:00
iceman1001 80722fe067 chg: detect_classic_prng should only report back true/false 
chg:  scripting.c  got some code cleaning.
 2017-12-18 15:43:45 +01:00
iceman1001 8ffe97c75b chg: reseting values 2017-12-18 12:15:03 +01:00
iceman1001 bc639bc3ec fix: adapting to run all strategies. 2017-12-18 12:14:02 +01:00
iceman1001 e6f0672015 chg: strange behavior when running checks with hardnested 2017-12-18 11:29:34 +01:00
iceman1001 7aaa335ab1 chg: 'hf iclass chk' - added option E to target elite keys. added option R to interpret dictionary file as raw (diversified keys) instead. 2017-12-16 19:13:10 +01:00
iceman1001 76fc2cbc2b chg: 'hf iclass chk' - different output and break the twice-loop when found. 2017-12-15 15:37:00 +01:00
iceman1001 741bb1f485 add: 'hf iclass chk' - empty default keys file for iClass keys 2017-12-14 13:04:21 +01:00
iceman1001 c10d561947 chg: added some more keys from pastebin 2017-12-14 09:58:19 +01:00
iceman1001 982ece97c6 fix... 2017-12-13 20:02:56 +01:00
iceman1001 b734fe5e18 chg: textual, to fit in @uzlonewolf 's PR texts 2017-12-13 19:58:09 +01:00
iceman1001 79ed9c3887 fix: for netbsd ppl, executable dir could be null, (@khorben) 
8e51b68e83
 2017-12-13 19:38:07 +01:00
iceman1001 8d02f4aabc fix: for netbsd ppl.. 6f4b0fce3a (@khorben ) 2017-12-13 19:35:52 +01:00
iceman1001 51d1bb2aaa chg: 'hf iclass chk' - unsigned long long. 2017-12-13 10:44:21 +01:00
iceman1001 c50c0e49d6 chg: 'hf iclass chk' - adjustments to output 2017-12-13 10:40:20 +01:00
iceman1001 0773e1a663 add: 'hf iclass chk' - iclass check keys functionality. uses input from a default_iclass_keys.dic 2017-12-13 10:18:38 +01:00
iceman1001 8526e74af8 chg: 'hf mf chk' - break on keypress. 
chg:  'hf mf fchk' - break on keypress.
 2017-12-13 10:17:30 +01:00
iceman1001 972fb2e167 chg: micro opt.. 2017-12-12 22:08:55 +01:00
iceman1001 453831268a chg: 'script run mifare_autopwn' - when used with -k parameter, exit after one run. 2017-12-12 20:07:02 +01:00
iceman1001 7f706e1466 chg: 'script run 14araw' - if empty args, show help 2017-12-12 20:06:20 +01:00
iceman1001 4781ee78e8 chg: extracted check-key-fast into its own. 
chg: added fast check inside nested.
 2017-12-12 20:05:36 +01:00
iceman1001 033bc12933 chg: 'hf mf fchk' - adapttions to depth first exits 2017-12-11 22:33:50 +01:00
iceman1001 dd024b5300 chg: 'hf mf fchk' - depth first search 2017-12-11 21:43:29 +01:00
iceman1001 da57e74140 CHG: 'hf mf fchk' - two strategys. depth first for sector 1, AB. and width first with all sectors. 
first run strategy 1. then 2.
 2017-12-11 01:44:55 +01:00
iceman1001 b0f84f1391 chg: 'hf mf nack' - trying a different output 2017-12-10 20:29:59 +01:00
iceman1001 f148d34bc3 chg: 'hf mf chk' - added param h for help 
chg:  'hf mf fchk' - added param h for help
 2017-12-10 09:44:49 +01:00
iceman1001 8fbea68295 fix: 'script run mifare_autopwn' - out of context,... 2017-12-10 09:25:26 +01:00
iceman1001 e5f2198653 FIX: scripting, faulty command vaule for darkside attack. 2017-12-10 09:18:16 +01:00
iceman1001 21d4c5a530 FIX: scripting, darkside attack used faulty value instead of MIFARE_AUTH_KEYA... 2017-12-10 09:15:22 +01:00
iceman1001 97137b80df chg: 'script run mifare_autopwn' - forgot a lib 2017-12-10 09:07:35 +01:00
iceman1001 79494182cd chg: 'script run mifare_autopwn' - added a option to use a key. 2017-12-10 09:05:30 +01:00
iceman1001 c0d1fdff75 chg: added default keys 2017-12-09 07:15:54 +01:00
iceman1001 732fe340cb fix: 'hf search' - 14a detection was wrong. thanks @doegox for point it out. 2017-12-08 22:27:55 +01:00
iceman1001 44280abf62 chg: reverting back to more or less offical pm3 version. 2017-12-07 15:02:15 +01:00
iceman1001 e1a01dd2ff CHG: uniformed output for failed key retrivals. Now denoted with ------- 2017-12-06 23:56:07 +01:00
iceman1001 d34d42b0b8 textual 2017-12-06 21:58:08 +01:00
iceman1001 2bc60a87aa CHG: 'hf mf chk' - adding default_key array refactoring (@merlokk) 2017-12-06 20:14:18 +01:00
iceman1001 8a69488582 fix: 'hf mf mifare - wrongly executed the parity-zero when not needed. 2017-12-06 19:53:41 +01:00
iceman1001 c6a7cbfc1e fix: 'hf mf mifare' -1 bug... 
fix:  some better timeouts for prng detection (@merlokk)
 2017-12-06 17:46:35 +01:00
iceman1001 1f637d726f fix to darkside overdue. I needed to remove my old impl.. 2017-12-06 17:15:24 +01:00
iceman1001 f59ee2ffeb chg: textual 2017-12-06 01:20:31 +01:00
iceman1001 56dbf3ea15 chg: 'hf mf nack' - adjustments in return values.. 
add: 'hf 14a info -n'  added new parameter,  to enable test for nack bug.
 2017-12-06 00:34:57 +01:00
iceman1001 01e1442bf8 chg: textual 2017-12-06 00:23:11 +01:00
iceman1001 e5f92935a1 chg: more adjustments 2017-12-06 00:17:49 +01:00
iceman1001 0c0e20eb06 chg: adjustments 2017-12-06 00:12:15 +01:00
iceman1001 2fffe96773 chg: added the append_Crc option 2017-12-05 23:41:04 +01:00
iceman1001 0a1a48df01 chg: 'hf mf nack' - extracted in into mifarehost for easier usage in other cmds like 
'hf 14a info'
chg: 'hf mf nack' - changes on devices side from @doegox   Thanks!
 2017-12-05 23:34:52 +01:00
iceman1001 5f87b24493 chg: 2017-12-05 21:07:03 +01:00
iceman1001 c0f91ddd09 revert... 2017-12-05 18:42:57 +01:00
iceman1001 c8a9813261 fix: better avr512 detection (@pwpiwi) https://github.com/Proxmark/proxmark3/pull/507 2017-12-05 18:28:29 +01:00
iceman1001 a43f156370 chg: 'hf mf nack' - minor 2017-12-05 18:04:21 +01:00
iceman1001 6e5038f224 chg: 'hf mf nack' - only test all 256 parities for one nonce when synced. 
0 nack = has not bug.
1 nack == has bug
x nacks == most likely a clone card which answers nack to all requests.
 2017-12-05 17:57:44 +01:00
iceman1001 53d8668e00 ADD: 'hf emv' - more additions by (@merlokk) 2017-12-05 15:44:35 +01:00
iceman1001 08193fd2e5 chg: getting crazy out of sync when running against magic cards. 2017-12-05 12:30:40 +01:00
iceman1001 bea28ae654 chg: wrong var name 2017-12-05 11:54:38 +01:00
iceman1001 984a26370d chg: 'hf mf nack' better output 2017-12-05 11:53:42 +01:00
Iceman 66e0e18a35
Update Makefile 
Remove all subversionings like  
7.1.1-3   becomes  7.1.1
 2017-12-05 07:29:53 +01:00
iceman1001 7b01acd6cc fix: ref to <ctype.h> for isxdigit() 2017-12-04 21:18:08 +01:00
iceman1001 614255fd75 revert... 
something is wrong with includes and defines...
 2017-12-04 20:35:51 +01:00
iceman1001 7044cf8fdf chg: double defines.. 2017-12-04 20:30:03 +01:00
iceman1001 e02e145fae draft for a Mifare classic NACK bug detection. 
the idea is to have a statistically solid conclusion if tag does or does not have the NACK bug.

-in short, ref  https://github.com/iceman1001/proxmark3/issues/141
NACK bug;  when a tag responds with a NACK to a 8 byte nonce exchange during authentication when the bytes are wrong but the parity bits are correct.

This is a strong oracle which is used in the darkside attack.
 2017-12-04 19:36:26 +01:00
iceman1001 07bf77e155 fix: 'hf mfu restore' - printed too many bytes. 8 -> 4 2017-12-03 15:58:37 +01:00
iceman1001 c4b73c8737 chg: better debugging functions. 2017-12-03 15:24:24 +01:00
iceman1001 73a5e3b23d chg: 'hf mfu eload' - instead of showing a error, it now tells a warning that we only loaded N blocks of data to emulator memory. 
It always loads the existing blocks into emulator memory.

The previous message made users belive a error had occured when it actually did load.
 2017-12-03 15:23:24 +01:00
iceman1001 b89b3399dc FIX: if receiving array isnt large enough, previously this will smash the stack.. 2017-12-02 20:45:53 +01:00
iceman1001 bb916aa999 fix: removed a warning 2017-12-02 19:07:10 +01:00
iceman1001 3b4b7812bf fix: removed a warning, 2017-12-02 19:01:43 +01:00
iceman1001 d54bb4ddf4 chg: skip if not debug 2017-12-02 18:59:47 +01:00
iceman1001 eb0c0c364c CHG: EMV changes. https://github.com/Proxmark/proxmark3/pull/493 [@merlokk) 2017-12-02 18:58:33 +01:00
iceman1001 6e144e0121 chg: removed line 2017-11-29 07:19:51 +01:00
iceman1001 2a120ec2e0 fix: no copy the crc 2017-11-29 07:18:43 +01:00
iceman1001 53452ab857 fix: 'hf mfu info' - rfu should n't print pack. 
fix: 'hf mfu info' - wrong pointer to cli authenticationkey
 2017-11-28 21:23:58 +01:00
iceman1001 bed2ff2dba fix: wrong place.. key got overwritten.. 2017-11-28 20:36:29 +01:00
iceman1001 bc9b2af87e ADD: NTAG213F,NTAG216F specific information in configuration blocks. 
ADD: insert pwd/pack if specified from cli.
 2017-11-28 20:03:46 +01:00
iceman1001 5f58dcfa52 fix: 'hf mfu dump' - wrong. 2017-11-28 09:25:36 +01:00
iceman1001 1299a0b31d CHG: increased timeout for printing the warning messages. It interupts all loops that already takes this in consideration. 2017-11-28 08:30:25 +01:00
iceman1001 6fa8740abd fix: 'hf mfu info' - select before testing a new pwdgen. 
fix: 'hf mfu info' - break after found pwd
 2017-11-27 20:04:54 +01:00
iceman1001 b99d759231 fix: compare not assign 2017-11-27 09:23:21 +01:00
iceman1001 f46546c5a9 ADD: 'hf mfu info' - tag identification should now identify NTAG213_F , NTAG216_F (thanks for info @jackfagner) 2017-11-27 09:21:55 +01:00
iceman1001 428e54bb6b CHG: 'hf mfu' gettype identification, now deals with NTAG213, GetVersion = subtype 04, 2017-11-26 19:16:12 +01:00
iceman1001 1ebf4afd73 CHG: 'hf mfu info' - now also tests for pwdgen algo D. 2017-11-26 16:52:20 +01:00
iceman1001 b5010ddfe8 fix: signed / unsigned errors. 2017-11-26 07:29:05 +01:00
iceman1001 9b573e06a4 ADD: hooking up 'pwdgen algo D' for lua-scripting 2017-11-26 07:08:27 +01:00
iceman1001 0815f19389 ADD: new pwdgen algo, (thanks @jackfagner) who did a great job figuring it out. Read his blog. 
ref.   https://github.com/jackfagner/NfcKey/blob/master/NfcKeyC.c
 2017-11-25 08:48:36 +01:00
iceman1001 9959d5c1e7 chg: emv commands should now compile. no testing done. 2017-11-25 08:18:30 +01:00
iceman1001 647411d10d chg: pointing to new emv cmds. (@merlokk) 2017-11-25 08:06:43 +01:00
iceman1001 4721e7e8a0 add: new found pwd. {@gentilkiwi) 2017-11-25 08:05:15 +01:00
iceman1001 e8e3256f7e add: compilation order 2017-11-25 08:03:53 +01:00
iceman1001 fa98197961 chg: added some updated string functions (@merlokk) 2017-11-25 08:02:51 +01:00
iceman1001 81ccfa734e add: 'script run brutesim' - new script to show simple bruteforce by incrementing cardnumber against different readers. Both LF & HF. @kenzycarey 
(adjusted to fit into same script structure like the rest in iceman fork)
 2017-11-25 07:58:56 +01:00
iceman1001 5f695999d2 add: emv - new files from pm3 offical 2017-11-25 03:29:26 +01:00
iceman1001 13ffd7bf97 add: emv changes from pm3 offical. 2017-11-25 03:28:02 +01:00
iceman1001 2f3dbbcaa3 rename: ul_switch_off_field -> DropField (inside cmdhf14a.c) 
chg:  Fix memory bounds error (@wsmoses)
 c3511781a1
 2017-11-11 23:23:01 +01:00
iceman1001 02af3b9e1d CHG: (@pwpiwi) d940ebfbad 2017-11-10 23:24:05 +01:00
iceman1001 25b173ea20 chg: 'hf 14a reader' - @pwpiwi 7c8115b273 2017-11-10 22:55:33 +01:00
iceman1001 0d149dd949 FIX: buffer overflow. array too short 2017-11-10 21:20:54 +01:00
iceman1001 9b4e52b89e CHG: dropfield 2017-11-10 20:49:56 +01:00
iceman1001 8b83db2c1b ADD: 'hf 14a apdu' @merlokk 2017-11-10 20:47:31 +01:00
iceman1001 a3e923c529 add: emv 2017-11-10 20:09:22 +01:00
iceman1001 23506bd1d7 add: first part emv @merlokk 2017-11-10 20:08:28 +01:00
iceman1001 30ceea4aea chg: cleaning up some function calls. 
fix: check to see clock is bigger than zero.
 2017-11-09 19:15:56 +01:00
iceman1001 3b91a33eec fix: assume graphbuffer data only 2017-11-06 15:45:23 +01:00