Commit graph

7735 commits

Author SHA1 Message Date
iceman1001
56b4a480cd cppchecker fix, realloc should already freed it 2021-01-28 14:33:30 +01:00
iceman1001
2c73337bde cppchecker ,, silence a warning 2021-01-28 14:32:57 +01:00
iceman1001
6633214957 cppchecker fix 2021-01-28 14:22:44 +01:00
iceman1001
12c0eb97fb cppchecker fix 2021-01-28 14:20:33 +01:00
iceman1001
a5f4212809 cppchecker fix 2021-01-28 14:18:44 +01:00
iceman1001
11a95d7351 cppchecker fix 2021-01-28 14:16:42 +01:00
iceman1001
10e2829123 cppchecker fix UID might be NULL 2021-01-28 14:11:33 +01:00
iceman1001
beb6a8bf11 cppchecker 2021-01-28 14:09:25 +01:00
iceman1001
3ad822844f cppchecker ... 2021-01-28 14:08:47 +01:00
iceman1001
3fead5b93c cppchecker... 2021-01-28 13:53:37 +01:00
iceman1001
46767a07e7 cppchecker 2021-01-28 13:50:27 +01:00
iceman1001
785d790ea0 cppchecker fix 2021-01-28 13:48:28 +01:00
iceman1001
12a28fcd16 cppchecker fix hf 14b 2021-01-28 13:38:58 +01:00
iceman1001
fd7a25beed cppchecker fix - hf mfu restore and key param 2021-01-28 13:34:03 +01:00
iceman1001
58cbe90469 rename 2021-01-28 01:21:52 +01:00
iceman1001
fdcc4b741c fix lf em 4x05 write - pwd/data. t55xx chk - now uses cliparser, and color to cliparser empty message 2021-01-27 22:52:08 +01:00
iceman1001
7f78b0a85d text and test fix for lf search 2021-01-27 14:36:43 +01:00
iceman1001
3176d05a2a lf simbidir - now use cliparser 2021-01-27 14:14:59 +01:00
iceman1001
35cc4125bd lf search - now use cliparser 2021-01-27 14:11:36 +01:00
Iceman
375909653d
Merge pull request #1174 from McEloff/trace_list_mf_dict
`trace list -t mf` - now can use external dictionary keys file
2021-01-27 12:49:06 +01:00
Eloff
2218b4e7db minor fix 2021-01-27 14:43:50 +03:00
iceman1001
d39e0939b6 fix t55xx protect/recoverpw - make param pwd optional 2021-01-27 09:09:42 +01:00
McEloff
11b94e7748 trace list -t mf - now can use external dictionary keys file 2021-01-27 01:14:20 +03:00
iceman1001
fad3658604 fix 'lf t55 sniff' input params 2021-01-26 22:26:19 +01:00
iceman1001
05c5985073 fix #1173 - added guards 2021-01-26 10:47:55 +01:00
Philippe Teuwen
6a13a0c349 hardnested: one more init 2021-01-26 01:07:32 +01:00
Philippe Teuwen
658a62f761 hardnested: add missing init, fixing some segfault 2021-01-25 23:48:19 +01:00
iceman1001
20fccb16aa hf mf hardnested - changed to calloc, and some text 2021-01-25 22:12:17 +01:00
iceman1001
89b9ddff78 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-01-25 22:09:12 +01:00
iceman1001
c571b1e0ad hf mf hardnested - clear these too 2021-01-25 20:59:32 +01:00
iceman1001
77d51cae38 hf mf hardnested - just making sure its cleared 2021-01-25 20:55:28 +01:00
iceman1001
2305411a1d hf mf hardnested - added missing init 2021-01-25 19:38:47 +01:00
Philippe Teuwen
134ddf6313 hardnested offline: avoid reaching out for pm3 2021-01-25 17:31:25 +01:00
iceman1001
ba8cd68942 hf mf hardnested - NUM_SUMS is 19, making loop iterator smaller 2021-01-25 14:31:17 +01:00
iceman1001
078a28550f hf mf hardnested - these are called with u16 in the source 2021-01-25 14:28:47 +01:00
iceman1001
a658d5dd1e Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-01-25 14:15:58 +01:00
Philippe Teuwen
0fee0c97cb make style 2021-01-23 22:38:07 +01:00
iceman1001
2987fdb187 added warning prefix 2021-01-23 19:08:45 +01:00
iceman1001
4d2d65a0c6 lf fdx reader - check both 125 / 134 freqs. 2021-01-22 22:58:50 +01:00
Marcos Del Sol Vives
37f4dee727 Fix out of bounds read 2021-01-22 22:22:04 +01:00
tharexde
843dd9bef4 deleted unneeded include statement 2021-01-20 19:47:55 +01:00
tharexde
d41a884c2f restoring filename from commit. 2021-01-20 19:47:14 +01:00
tharexde
e061645c6b deleted unneeded include statement 2021-01-20 19:37:38 +01:00
tharexde
3620ebd673 Merge branch 'master' into dev_4x50_sim_full
update 210120
2021-01-20 19:07:39 +01:00
iceman1001
9945e1b358 added some sleeps 2021-01-20 14:28:49 +01:00
iceman1001
abb0d1c437 forgot the 'r' change became long param '--r0' 2021-01-20 12:22:52 +01:00
iceman1001
0555b69b68 update docs 2021-01-20 11:58:43 +01:00
tharexde
78d1e09595 deleted test functions, clean up 2021-01-18 00:01:22 +01:00
tharexde
ef56bee76a Merge branch 'master' into sim_half_duplex
update 210117
2021-01-17 00:31:38 +01:00
tharexde
cff48f84c6 refactoring 2021-01-16 19:40:42 +01:00
tharexde
c15266dfc2 added timeouts 2021-01-16 01:59:02 +01:00
Niel Nielsen
b0c160f236
Added honor to Iceman1001
Added star command in honor of @Iceman1001 hard work on this project
2021-01-14 14:34:55 +01:00
iceman1001
d7baee2f0c swapped PM3OTHER -> PM3GENERIC, while keeping PM3OTHER functionalitwise for backwards compat. 2021-01-14 14:23:00 +01:00
Philippe Teuwen
f2bc066858 make style 2021-01-14 11:39:45 +01:00
iceman1001
e723ebea12 lf t55 bruteforce - now use cliparser 2021-01-12 20:59:44 +01:00
iceman1001
55b76f0d4c lf t55xx recoverpw .. - now uses cliparser 2021-01-12 20:38:55 +01:00
iceman1001
9351d29a48 usart btfactory - improve warning message given the cliparser template limit 2021-01-12 00:30:16 +01:00
iceman1001
59c4a38674 lf t55xx protect/sniff - now use cliparser 2021-01-12 00:11:40 +01:00
iceman1001
ad1f3eae57 added some supprt fct for cliparser, to take a hex byte param and fall back to a default value, or specify how many bytes the param must be 2021-01-11 23:29:49 +01:00
iceman1001
b60daea570 lf t55xx sniff - now uses cliparser 2021-01-10 12:52:57 +01:00
iceman1001
12e80bb8a6 analyze freq - use cliparser, foo - to play with fpga muxer data simulator (anticat) 2021-01-09 22:50:53 +01:00
iceman1001
93c99e9f7a lf hid clone - wip take binary string as input 2021-01-09 22:47:04 +01:00
iceman1001
005079b91f lf hitag info, sniff - now uses cliparser 2021-01-09 22:45:17 +01:00
iceman1001
8b7ef202c3 pref savedefaultpaths uses cliparser, enabled but is not used in the fileutils yet. 2021-01-09 22:44:09 +01:00
iceman1001
ee8309e09b pref cmds - now use cliparser. renamed a enum to fit the global scope better 2021-01-09 14:00:58 +01:00
iceman1001
2239b2dff0 all analyse cmds now use cliparser 2021-01-09 12:32:50 +01:00
iceman1001
5f92562856 analyze a - now uses cliparser 2021-01-09 11:50:26 +01:00
iceman1001
3f4a98901d analyze nuid - now uses cliparser, and refactored to generators 2021-01-09 11:43:49 +01:00
iceman1001
ae45dbd877 analyze chksum - now uses cliparser 2021-01-09 11:27:05 +01:00
Samy Kamkar
fab65d1dcd Add EV3 to hf 14a info 2021-01-08 16:23:39 -08:00
iceman1001
b6b04bda19 analyse lcr/crc - now uses cliparser 2021-01-07 14:05:03 +01:00
iceman1001
11991976de text 2021-01-07 12:51:57 +01:00
iceman1001
90cbfbf0fc smard cmds - now use cliparser 2021-01-07 12:50:28 +01:00
iceman1001
0983ad806f smart commands - most use cliparser, moved sim fw file to RESOURCES 2021-01-07 12:31:29 +01:00
iceman1001
e96cfa94b6 hf mfdes getuid/info/eum - with a default cliparser 2021-01-07 11:40:10 +01:00
iceman1001
eba87bdd4b usart the rest - now uses cliparser 2021-01-07 11:33:36 +01:00
iceman1001
f05fa8a77e usart btpin/factory/tx - now uses cliparser 2021-01-07 10:45:31 +01:00
tharexde
12071080a6 next step (half duplex simulation): all commands seem to work 2021-01-07 01:22:46 +01:00
iceman1001
55ede9e415 hw setlfdivsor - text 2021-01-06 02:04:57 +01:00
iceman1001
82ffd54f09 added 3 spaces to compensate when voltage goes to one digit 2021-01-05 22:53:00 +01:00
tharexde
f6868aadf9 next version of half duplex simulation 2021-01-05 01:11:46 +01:00
iceman1001
c13ad9dcc6 text 2021-01-04 23:06:06 +01:00
iceman1001
9a0165f4ca hw connect, ping, version, standalone, tune etc - now uses cliparser 2021-01-04 21:58:50 +01:00
Philippe Teuwen
887f127963 android target client compability: add cmdemrtd.c 2021-01-04 19:29:01 +01:00
NPC-C83H
86821a2534
Update pm3_main.c 2021-01-05 01:32:05 +08:00
NPC-C83H
1c5a206f79
Update CMakeLists.txt
android client compability
2021-01-05 01:27:21 +08:00
iceman1001
be92990c45 hw setdivisor - now uses cliparser 2021-01-04 12:25:03 +01:00
iceman1001
d82edb3b7a hw detectreader, readmem, lcd, lcdreset, fpgaoff, reset, now uses cliparser 2021-01-04 12:01:55 +01:00
iceman1001
38332d2fcf hf mfu otptear/pwdgen - now supports cliparser 2021-01-04 11:11:05 +01:00
tcprst
ecd52347fa
Add support for Apple Silicon (M1) 2021-01-03 19:27:20 -05:00
Philippe Teuwen
eaee80f3d7 update changelog 2021-01-04 00:54:34 +01:00
Philippe Teuwen
9ce99862e8 make style 2021-01-04 00:36:34 +01:00
tharexde
eea63a6cb7 first draft half duplex simulation 2021-01-03 22:50:27 +01:00
Philippe Teuwen
72896b902e comment 2021-01-02 13:10:42 +01:00
Samy Kamkar
db213522d6 Reorder Lua libs/includes to compile on macOS
Jansson libs/include dirs were taking preference over the included Lua
files, causing system Lua files to interfere with expected includes
2021-01-01 15:47:47 -08:00
iceman1001
baa7ca086b hf mfu eview - view emulator memory. Defaults to download and show 0xFF blocks * 4 bytes since we dont know the MFU tag type 2021-01-01 21:02:22 +01:00
iceman1001
d08f0d7fe8 hf mfu setpwd/setuid/keygen - now uses cliparser 2021-01-01 21:01:10 +01:00
iceman1001
afc4d78d68 hf mfu eload/restore/sim/cauth - now uses cliparser 2020-12-31 13:51:38 +01:00
Philippe Teuwen
b956d4c148 hf 14a config cliparser: use string values 2020-12-31 11:39:57 +01:00
tcprst
a9f4f4f804
hf 14a config - now use cliparser 2020-12-30 22:42:46 -05:00
Gabriele Gristina
027ed5e558 Fixed build errors on osx 2020-12-31 00:33:42 +01:00
ikarus
6d62f3f53c hf_mf_format.lua: fixed off by one and typo. 2020-12-30 23:10:53 +01:00
iceman1001
c3ea0c83ad hf mf mad - text 2020-12-30 22:05:28 +01:00
iceman1001
cdbd4d7d1e hf mf mad - deals with user supplied keys in a different order now 2020-12-30 19:16:37 +01:00
iceman1001
49f684c31a add noralsy/vigik entry 2020-12-30 18:58:04 +01:00
iceman1001
037fd47673 fix #1151 - improved feedback text 2020-12-30 18:57:30 +01:00
Philippe Teuwen
8084b3141f
Merge pull request #1147 from tcprst/14a_cliparser
hf 14a cuids, sim - now use cliparser
2020-12-30 09:58:57 +01:00
Philippe Teuwen
055b439cb2
Merge pull request #1148 from tcprst/em_text
lf em 410x - textual
2020-12-30 09:58:03 +01:00
Philippe Teuwen
481f8a64a2
Merge pull request #1150 from aveao/emrtd-dumpdir
eMRTD dump: Allow specifying a custom dump directory
2020-12-30 09:54:31 +01:00
Ave
5d250339dd emrtd dump: Allow specifying a dump folder 2020-12-30 06:48:54 +03:00
Ave
9f29a839a7 emrtd info: Move EF_SOD print to a func, also add to online 2020-12-30 06:03:12 +03:00
Ave
80f035f7ab emrtd info: Improve EF_SOD wording 2020-12-30 05:57:11 +03:00
Ave
2679ea0980 emrtd info: Split EF_SOD into a separate section (only on offline) 2020-12-30 05:50:25 +03:00
tcprst
714470877a
lf em 410x - textual 2020-12-29 21:12:11 -05:00
tcprst
49990ab11d
hf 14a cuids, sim - now use cliparser 2020-12-29 20:58:13 -05:00
Philippe Teuwen
a0e110941a make style 2020-12-30 01:31:40 +01:00
iceman1001
8c803edfd2 hf mfu dump - now uses cliparser 2020-12-29 23:36:38 +01:00
iceman1001
d8c8de3204 hf mfu rdbl - now uses cliparser 2020-12-29 22:47:50 +01:00
iceman1001
db43f55b98 hf mfu wrbl - now supports cliparser 2020-12-29 21:38:02 +01:00
Ave
ff4acf7005 emrtd: Improve comment on USA quirk workaround 2020-12-29 20:05:50 +03:00
tharexde
9b3bc55136 aa 2020-12-29 17:40:18 +01:00
Ave
ee87abd047 Merge remote-tracking branch 'origin/master' into emrtd 2020-12-29 19:30:27 +03:00
iceman1001
f3f47a66e9 hf mfu info - now supports cliparser, fixed magic detection output, fixed ntag counter output 2020-12-29 17:25:48 +01:00
Ave
a14b5f7b5f emrtd: Employ a workaround for data length of 0x80
This is to make US passport hashes read properly.
https://wf.lavatech.top/ave-but-random/emrtd-data-quirks#EF_SOD
2020-12-29 19:24:44 +03:00
Ave
d1ec96ed41 emrtd: Ensure that emrtd_parse_ef_sod_hash_algo returns -1 on errors too 2020-12-29 19:13:10 +03:00
Philippe Teuwen
03be720277
Merge pull request #1144 from aveao/emrtd
emrtd: Account for hash algo quirks
2020-12-29 16:49:30 +01:00
Ave
71ac6369d8 emrtd: Account for hash algo quirks 2020-12-29 18:42:29 +03:00
Philippe Teuwen
285448ec56
Merge pull request #1142 from aveao/emrtd
eMRTD support 3/?
2020-12-29 16:00:53 +01:00
Ave
040520d865 emrtd: Improve hashing logic, support SHA1 2020-12-29 17:56:29 +03:00
Iceman
62bef9b730
Merge pull request #1141 from ikarus23/apdufind
apdufind: added option to find Le=0 commands (case 2S)
2020-12-29 07:17:51 +01:00
tcprst
6d6f3d9f1a
hf 14a sniff, reader - now use cliparser 2020-12-28 23:00:10 -05:00
Ave
2c5c58d128 emrtd: Remove 'very very very very cursed' comment 2020-12-29 04:21:00 +03:00
Ave
aae3426f8e emrtd: Adjust an include comment 2020-12-29 04:09:53 +03:00
Ave
bc8c52931b emrtd: Split DG hash calc into emrtd_calc_dg_hash 2020-12-29 04:01:15 +03:00
Ave
f47b617a58 emrtd: Check emrtd_parse_ef_sod_hash_algo output 2020-12-29 03:51:30 +03:00
Ave
637e017975 emrtd: Support SHA256 2020-12-29 03:39:01 +03:00
Ave
5a9d474765 emrtd: Better coverity bits for hash verif 2020-12-29 02:15:15 +03:00
Ave
dbe5d9ac9a emrtd info (online): Add basic hash verification support 2020-12-29 02:08:30 +03:00
Ave
7e2b10d413 emrtd info (offline): Add basic hash verification support 2020-12-29 01:55:18 +03:00
ikarus
59e6658753 apdufind: added option to find Le=0 commands (case 2S) 2020-12-28 19:14:29 +01:00
Ave
dc2d4bafaa Merge remote-tracking branch 'origin/master' into emrtd 2020-12-28 20:39:38 +03:00
ikarus
201e2506b2 apdufind: fixed bug which prevented a retry, if there was an error. 2020-12-28 15:38:35 +01:00
iceman1001
8233b2c914 script now supports Gen1a, Gen1b, Gen2 type of MIFARE Ultralight family uid changeable cards 2020-12-28 13:36:37 +01:00
tharexde
438cada2cf commits after xcode crash 2020-12-27 22:22:44 +01:00
ikarus
28df590fc8 apdufind: added option to skip instrcutions.
(This helps if a tag might be locked permanently with a certain instruction. You can just skip it.)
2020-12-27 20:20:19 +01:00
ikarus
9007629213 apdufind: filter reoccurring SWs & reset filed on tractive errors. 2020-12-27 15:44:59 +01:00
iceman1001
d801d2be0f lf/hf tune - color vs emoji... 2020-12-26 22:11:56 +01:00
Ave
b2855d9514 Merge remote-tracking branch 'origin/master' into emrtd 2020-12-26 17:10:35 +03:00
iceman1001
3d76be2dbd coverity fix 2020-12-24 10:55:36 +01:00
iceman1001
902b6c9866 hf/lf tune - show Volt max. And use corect session support identification 2020-12-23 22:54:56 +01:00
Iceman
7a6d72fcd4
Merge pull request #1134 from tcprst/legic_lua_fix
hf_legic Lua - change method for temp file naming
2020-12-23 22:14:42 +01:00
tcprst
b91bc9bb85
hf_legic Lua - change method for temp file naming 2020-12-23 16:01:50 -05:00
Ave
9e7d515c37 emrtd info: Don't print EF_SOD info 2020-12-23 23:52:31 +03:00
Ave
a1762fa4a3 emrtd: Mark biometrics as EAC-only and introduce the concept 2020-12-23 23:21:54 +03:00
Ave
9987ebf534 emrtd: Use memcmp for JPEG headers 2020-12-23 23:08:34 +03:00
Ave
e87e3816ba Merge remote-tracking branch 'aveao/patch-1' into emrtd 2020-12-23 23:00:09 +03:00
Ave
73dec1e072
ui: Load readline after stdio.h 2020-12-23 19:57:50 +00:00
Ave
4962cb84ec emrtd: Note that MRZ option is for passports (TD3) only 2020-12-23 22:37:51 +03:00
Ave
fab5092c03 Merge remote-tracking branch 'origin/master' into emrtd 2020-12-23 22:29:21 +03:00
Ave
0272a3b63e emrtd: Move a lot of size values from int to size_t 2020-12-23 22:27:05 +03:00
Philippe Teuwen
8d4acbe3a6 make style 2020-12-23 19:51:10 +01:00
Philippe Teuwen
7bc3067fa4 Make print_progess scalable 2020-12-23 18:15:25 +01:00
tcprst
4c82cc4436
hf epa - now use cliparser 2020-12-22 20:52:18 -05:00
Iceman
0551f1b7c9
Merge pull request #1130 from tcprst/fido_cliparser
hf fido info - now use cliparser
2020-12-23 02:34:22 +01:00
tcprst
dbf2ce6074
fix double import 2020-12-22 20:15:19 -05:00
tcprst
59e3c31e0f
hf fido info - now use cliparser 2020-12-22 20:09:19 -05:00
iceman1001
69e5f8daa5 update the readline to 8.1 and curses to 6.1. The later version 6.2 fails when cross compiling. Thanks @doegox for verifying cross compiling 2020-12-22 22:56:57 +01:00
Ave
c3ed99e388 emrtd: Parse hashes on EF_SOD 2020-12-22 05:52:48 +03:00
Ave
f1a8345fac emrtd: Add a skip feature to emrtd_lds_get_data_by_tag 2020-12-22 05:29:37 +03:00
Ave
b505c5f4d8 emrtd: Read file hash data from EF_SOD 2020-12-22 05:01:42 +03:00
Philippe Teuwen
62f60dbfbf utf8 barmode when emoji mode is set 2020-12-22 00:35:17 +01:00
Ave
8c1e4168cf emrtd: make style pass 2020-12-22 02:30:26 +03:00
Ave
a05bdecaaf emrtd: make top tag skipping on emrtd_lds_get_data_by_tag optional 2020-12-22 02:28:37 +03:00
Ave
c3cc3b2a80 emrtd: split lds tag det to a different func and improve emrtd_lds_get_data_by_tag 2020-12-22 02:22:28 +03:00
Iceman
82362cc9e1
Merge pull request #1129 from tcprst/legic_cliparser
hf legic wipe, dump, restore, eload, esave - now use cliparser
2020-12-21 21:10:29 +01:00
tcprst
fce36effb4
legic style 2020-12-21 15:01:30 -05:00
tcprst
f1c4be446c
hf legic esave - now use cliparser 2020-12-21 15:00:02 -05:00
iceman1001
e25a99077e hf search - always turn off field 2020-12-21 20:50:47 +01:00
tcprst
cd972adce5
hf legic eload - now use cliparser 2020-12-21 14:50:42 -05:00
iceman1001
d4c87945b8 style & text 2020-12-21 20:47:17 +01:00
tcprst
ef2dfc8b3b
hf legic restore - now use cliparser 2020-12-21 12:50:12 -05:00
tcprst
2f1408d659
hf legic dump - now use cliparser 2020-12-21 12:41:14 -05:00
tcprst
85b1a833fc
hf legic wipe - now use cliparser 2020-12-21 12:17:05 -05:00
iceman1001
0ce10e18df textual 2020-12-21 12:55:36 +01:00
Iceman
4ac50615a9
Merge pull request #1128 from tcprst/legic_cliparser
hf legic crc, rdbl, wrbl, sim, info, reader - now use cliparser
2020-12-21 10:37:22 +01:00
tcprst
7f740c4e3d
hf legic reader - continuous mode and cliparser 2020-12-20 21:40:06 -05:00
tcprst
a51c45168e
hf legic info - now use cliparser 2020-12-20 21:20:47 -05:00
tcprst
03edf439d2
hf legic wrbl - now use cliparser 2020-12-20 21:16:46 -05:00
tcprst
b676efd992
hf legic sim - now use cliparser 2020-12-20 21:00:24 -05:00
tcprst
b407d921a9
hf legic rdbl - now use cliparser 2020-12-20 20:52:49 -05:00
iceman1001
8bb7e4ed8b hf xxx - uses cliparser and textual 2020-12-21 02:40:04 +01:00
tcprst
640f9fcc02
Merge remote-tracking branch 'upstream/master' into legic_cliparser 2020-12-20 20:07:17 -05:00
iceman1001
246ee8b2d7 hf tune - now uses the barmode 2020-12-21 02:06:43 +01:00
tcprst
6221bb061f
Merge remote-tracking branch 'upstream/master' into legic_cliparser 2020-12-20 19:59:05 -05:00
iceman1001
feeb32b13f lf tune - added possiblity to get bar / mix / value (defaul) output of measurements. Also set in preferences 2020-12-21 01:45:03 +01:00
tcprst
08efedaa83
hf legic crc - now use cliparser 2020-12-20 17:19:26 -05:00
Iceman
e85edbcef2
Merge pull request #1126 from tharexde/4x50_serial
4x50 serial
2020-12-20 13:39:23 +01:00
Philippe Teuwen
2385ea9bb7 fix issue #1127 2020-12-20 01:13:20 +01:00
Philippe Teuwen
c828caff33 emrtd: add --mrz 2020-12-19 22:05:10 +01:00
tharexde
a366b046c4 Merge branch 'master' into 4x50_serial
update 201219
2020-12-19 22:02:31 +01:00