Commit graph

7952 commits

Author SHA1 Message Date
iceman1001 3a051b3266 lf indala sim - now it works again 2021-01-31 01:09:27 +01:00
Ave 8f8263ae59 emrtd: Fix EF_DG2 image dumping 2021-01-29 23:27:33 +03:00
iceman1001 e29bbcf6c3 text 2021-01-29 20:35:36 +01:00
iceman1001 ea5625c304 chg: cliparse error message unified to pm3 style 2021-01-29 20:35:18 +01:00
iceman1001 e42985b65c testing crc32 2021-01-29 19:28:45 +01:00
iceman1001 76f2c2c95e cppchecker fix 2021-01-29 16:51:06 +01:00
iceman1001 a6e4b03c28 coverty finds this a deadcode, cppchecker complains... 2021-01-29 16:18:09 +01:00
iceman1001 3b37ca1d4c coverity fix #308455 2021-01-29 16:06:45 +01:00
iceman1001 ead26ec3c3 lf t55xx special - now uses cliparser 2021-01-29 16:06:26 +01:00
iceman1001 831a3ad2fa hw dbg - fix wrong param 2021-01-29 12:13:54 +01:00
iceman1001 249d3e7d1e text 2021-01-29 12:04:19 +01:00
iceman1001 dc01b63d49 analyse demodbuff - bad reference to string pointer after free 2021-01-29 11:59:32 +01:00
iceman1001 b3c0e00174 wiegand encode - now "-w" format param is optional, if excluded it tries to convert to all known formats and output 2021-01-29 11:56:31 +01:00
iceman1001 165ceb122f update to correct filename for the sample file 2021-01-28 21:41:57 +01:00
iceman1001 90fb78ff1b cppchecker fix 2021-01-28 21:38:30 +01:00
iceman1001 6737f6f3cd sanitize fix - lf/hf tune heap overflow 2021-01-28 20:31:39 +01:00
iceman1001 405b93f109 coverity fix 309975 2021-01-28 15:29:52 +01:00
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
tharexde ef8f47263a lf em 4x50 info: complete data is displayed only via additional verbose option (-v) 2020-12-19 22:00:48 +01:00
tharexde 2d54ec652c changed reading of "uid" to "serial" in function detect_4x50_block since output is always "serial" 2020-12-19 21:27:03 +01:00
Philippe Teuwen 3098f01dd9 emrtd: non-BAC: tested! remove debug print 2020-12-19 20:53:16 +01:00
Philippe Teuwen 669eea1f74 emrtd: hide SOD todo for now 2020-12-19 19:44:26 +01:00
Philippe Teuwen 415dd84a8d fix print_buffer out-of-boundaries bug 2020-12-19 19:32:30 +01:00
Philippe Teuwen 97eaab27a1 emrtd: remove few hardcoded filenames 2020-12-19 18:01:19 +01:00
Philippe Teuwen e16249252e emrtd: remove last defs and integrate SOD in com lists 2020-12-19 17:58:22 +01:00
Philippe Teuwen 34cc523546 emrtd: add helper fcts to search the table 2020-12-19 17:37:28 +01:00
Philippe Teuwen 019f4a7e94 emrtd table: pace flag 2020-12-19 17:12:08 +01:00
Philippe Teuwen e277eaaab2 emrtd: add COM description, add big DG table 2020-12-19 16:48:37 +01:00
Ave 9bed791026 emrtd: Account for undocumented 5F85 tag 2020-12-19 16:25:09 +03:00
Ave 3e4a03ec33 emrtd: Implement a better fix for parsing empty tags 2020-12-19 16:17:44 +03:00
Ave 263eb57749 emrtd: fixes for some belgian passports 2020-12-19 16:14:27 +03:00
Ave d23ebec93c emrtd: Make emrtd_mrz_determine_separator less hacky 2020-12-19 07:25:28 +03:00
Ave 9945107016 hf emrtd info: Replace padding with spaces on names 2020-12-19 07:08:39 +03:00
Ave 013a8abcd8 hf emrtd info: Fix segfaults on mononyms 2020-12-19 07:01:03 +03:00
Ave 333afad302 hf emrtd info: Fixes for hungarian passports 2020-12-19 06:49:21 +03:00
Ave 88f0de3176 emrtd: Use .jp2 ext when saving JPG 2000 files 2020-12-19 05:28:21 +03:00
Ave 6ca472fc8f emrtd: Dump image from EF_DG7 too 2020-12-19 03:27:48 +03:00
Philippe Teuwen bdcf84f90d fix emrtd info offline bug 2020-12-19 00:59:27 +01:00
Philippe Teuwen 7a9e129ad9 hf emrtd info: add option to load from files 2020-12-19 00:19:11 +01:00
Ave 24b0e042cb Resolve coverity 308206 and 308207 2020-12-19 01:41:04 +03:00
Ave 5a4e77d7af hf emrtd info: Parse and print info about EF_DG12 2020-12-19 01:05:09 +03:00
iceman1001 72f868e2a0 hf 14a info - now aidsearch is interuptable with <enter> press 2020-12-18 22:10:30 +01:00
iceman1001 372da13e7b Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-12-18 22:05:20 +01:00
iceman1001 15e171b09d hf 14b info - now supports aidsearch 2020-12-18 22:05:16 +01:00
Ave fa21787531 hf emrtd info: Split EF_DG1 into its own func, read file list 2020-12-18 23:52:42 +03:00
Ave 8e89eb1206 hf emrtd info: fancier output for files 2020-12-18 22:33:13 +03:00
Ave Ozkal 27b7ecf1cd emrtd: Complete EF_DG11 support on hf emrtd info 2020-12-18 21:25:46 +03:00
Ave Ozkal 36cf0be239 emrtd: Basic EF_DG11 support on hf emrtd info 2020-12-18 21:12:57 +03:00
Iceman dd1c0dc045
Merge pull request #1119 from aveao/emrtd
eMRTD additions
2020-12-18 09:00:00 +01:00
Ave 4f3d3f8ac4 emrtd: Fix insecure read on emrtd_read_file 2020-12-18 05:03:06 +03:00
Ave 69a124762a emrtd: Code cleanup on emrtd_bump_ssc 2020-12-18 04:44:11 +03:00
iceman1001 e0e478c90d text 2020-12-18 02:39:32 +01:00
Philippe Teuwen 43dc10e7f0 hf trace list: fix 14b CRC & accept 14a/14b crcs in 7816 2020-12-18 02:37:31 +01:00
Ave cd21765acc emrtd: Move EF_CardAccess dump to before auth to ensure that it is dumped even without auth 2020-12-18 04:28:14 +03:00
Ave 9b4e0c212f emrtd: Remove unnecessary memcpys from two dump functions 2020-12-18 04:26:39 +03:00
Philippe Teuwen 975034854d rework 14b apdu timeout computations 2020-12-18 02:15:42 +01:00
Philippe Teuwen ffb1b662ac allowing user timeouts in 14b apdus 2020-12-18 02:15:42 +01:00
Ave 79e9875b43 emrtd: Validate date further 2020-12-18 03:29:21 +03:00
Ave 027f4e5adc emrtd: Use toupper 2020-12-18 03:26:26 +03:00
Ave 3312230e80 emrtd: Remove debug line 2020-12-18 03:15:14 +03:00
Ave 45d55106c6 emrtd: Auto-convert document number to uppercase 2020-12-18 03:13:06 +03:00
Ave ffb7111835 emrtd: Ensure that DOB and doc expiry lengths are correct 2020-12-18 03:06:42 +03:00
Ave fbed338dce emrtd: don't check for EF_CardAccess, and dump it on hf emrtd dump 2020-12-18 02:39:48 +03:00
iceman1001 ef7a6bb166 text 2020-12-17 22:54:23 +01:00
iceman1001 09c9f85206 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-12-17 22:20:17 +01:00
iceman1001 f0d3cdec67 fix 308197 coverity 2020-12-17 22:20:07 +01:00
iceman1001 814e7c2536 fix 308198 coverity 2020-12-17 22:15:33 +01:00
Philippe Teuwen 254235237e emrtd: fix emrtd_read_binary params 2020-12-17 22:06:44 +01:00
iceman1001 f48f85469e fix 308195 coverity 2020-12-17 21:56:56 +01:00
tharexde 78cb9df465 Merge branch 'master' into 4x50_eview
update 201217 2
2020-12-17 21:30:32 +01:00
Ave a04d67e828 emrtd: Dump image when dumping EF_DG2 2020-12-17 23:23:31 +03:00
Ave f3d5c60c10 emrtd: Dump cert when dumping EF_SOD 2020-12-17 22:45:41 +03:00
tharexde c37b74a721 Merge branch 'master' into 4x50_eview
update 201217
2020-12-17 20:42:41 +01:00
Ave ae7090a47e emrtd: Dump image when dumping EF_DG5 2020-12-17 22:22:41 +03:00
Ave a9f28adabf emrtd: Improve emrtd_lds_get_data_by_tag to account for variable data sizes 2020-12-17 22:22:26 +03:00
Ave 01ec2efc25 Show hints by default 2020-12-17 22:07:16 +03:00
Ave 205885cb15 emrtd: Improve card presence check logic 2020-12-17 18:18:25 +03:00
iceman1001 b3c7dd64c6 fix auth logic, and compiler warning 2020-12-17 14:46:57 +01:00
iceman1001 646b0eefb7 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-12-17 08:40:03 +01:00
Ave 8cb25b742a emrtd: Remove redundant padding code 2020-12-17 05:12:54 +03:00
Ave b31a610566 emrtd: Fix passport composite + change print order 2020-12-17 05:08:56 +03:00
Ave 8e6736edd1 emrtd: Verify composite check digits 2020-12-17 04:28:26 +03:00
Ave b362101b54 emrtd: Split emrtd_mrz_verify_check_digit into two funcs 2020-12-17 04:19:54 +03:00
Ave 8e72830686 emrtd: Merge two functions into emrtd_lds_get_data_by_tag 2020-12-17 04:15:00 +03:00
Ave 2e3e4835ed emrtd: Support ID cards on hf emrtd info 2020-12-17 04:03:09 +03:00
Ave 9066aa1d26 emrtd: Support passports on hf emrtd info 2020-12-17 03:44:39 +03:00
iceman1001 76da4ce427 change 14b apdu - longer timeout, emrt now autopad too short document numbers 2020-12-17 02:09:26 +03:00
iceman1001 4b9ffef63a change 14b apdu - longer timeout, emrt now autopad too short document numbers 2020-12-17 00:00:26 +01:00
Ave 503e48d409 emrtd: Start work on the hf emrtd info command 2020-12-16 23:53:40 +03:00
Ave ac3392402f emrtd: Split auth into a separate function
This is done to prepare for info command
2020-12-16 22:18:49 +03:00
Ave 84873aa3cf emrtd: pad document number 2020-12-16 21:21:11 +03:00
iceman1001 c7e5648164 maur default key 2020-12-15 21:35:21 +01:00
Christian Molson 60f36b468d em4x70: Add write key convenience function. Use real values in writekey/auth help text so people with blank tags can program a test key and test authentication. 2020-12-15 12:32:30 -05:00
Christian Molson dc35f79bd2 em4x70: Add write pin convenience function to write and verify a new pin 2020-12-15 11:22:43 -05:00
Iceman 7f6bad4eae
Merge pull request #1105 from aveao/emrtd
eMRTD: Bugfixes & basic cleanup
2020-12-15 10:20:28 +01:00
Ave fbfe1d051c emrtd: loads of renames 2020-12-15 02:55:23 +03:00
Iceman 2bc36d5716
Merge pull request #1103 from ikarus23/apdufind
APDU finder: Reset the tag every x seconds (default is 5 minutes).
2020-12-15 00:30:40 +01:00
Ave 4969a0bca3 emrtd: Fix a crash 2020-12-15 02:19:42 +03:00
ikarus b9b92c6bc3 APDU finder: Prevent reactivating the field (speedup). 2020-12-14 23:27:47 +01:00
ikarus 006e5d2be0 APDU finder: Reset the tag every x seconds (default is 5 minutes). 2020-12-14 21:48:02 +01:00
Christian Molson 5f8612cf92 em4x70: Improve client print out of tag information 2020-12-14 14:30:43 -05:00
Iceman c683071901
Merge pull request #1101 from aveao/emrtd
eMRTD support 1/?
2020-12-14 18:34:55 +01:00
Ave 3339ba110f emrtd: Split BAC into its own function 2020-12-14 20:09:20 +03:00
Ave bc00e92af0 emrtd: Switch from size_t to int to make CI happy 2020-12-14 19:08:03 +03:00
Ave 457311ffd9 emrtd: make clean pass 2020-12-14 18:25:49 +03:00
Ave d197d5df34 emrtd: Complete non-BAC support 2020-12-14 18:24:24 +03:00
Ave 0bca61aa99 emrtd: Continue work on supporting non-BAC passports 2020-12-14 18:05:45 +03:00
Ave eaea632eb3 emrtd: Join secure and insecure reads 2020-12-14 17:45:53 +03:00
Ave 19922e1d23 emrtd: Clean up includes, further document used files 2020-12-14 17:30:58 +03:00
Ave 8ed358e3be emrtd: Mark DESKey as const 2020-12-14 17:28:54 +03:00
Ave 1e16b2d2d9 emrtd: Code cleanup, impl PRNG 2020-12-14 17:26:47 +03:00
Ave a5aed0dffd emrtd: Force dumping EF_SOD 2020-12-14 02:42:37 +03:00
Ave 41a7bdef1c emrtd: Detect file list on card and dump what is available 2020-12-14 02:11:39 +03:00
Ave a85e8a40d4 emrtd: Get file list from ef_com (but not parse yet) 2020-12-14 01:30:11 +03:00
Ave d5d5cc1fe6 emrtd: Add further checks to secure_select and secure_read 2020-12-14 00:21:10 +03:00
iceman1001 9db2a04449 fix: rem - now handles cliparse and strings correct 2020-12-13 01:44:03 +01:00
ikarus 81981a73fe APDU finder: increment P1/P2 alternating & add Changelog entry. 2020-12-13 01:25:55 +01:00
iceman1001 a9713bbe61 fix #1094 - add Le 2020-12-13 01:17:41 +01:00
ikarus baa86de247 Fixed merge conflict (make style). 2020-12-13 00:16:56 +01:00
ikarus 9300b8b65c Merge branch 'master' into apdufuzz 2020-12-13 00:14:34 +01:00
ikarus cd625ca759 Reworked hf 14a apdufuzz (now apdufind).
* Renamed to apdufind. Fuzzing is something different than this simple enumeration.
* Removed Le as parameter. This is just the maximum response bytes expected. Not much to find here with this simple tool.
* Sweep through all values, even if a start value was given (don't stop at 0).
* Changed sweep oder to INS->P1->P2->CLA. This way instructions are more quickly found.
* Show response data, if there are any (hex & ascii).
* Retry command with Le = 0x0100 (extended length APDU) if there was a length error return code.
* Improved the output with general information.
* Fixed bug: It's now possible to run the command without parameters.
2020-12-12 23:59:09 +01:00
Ave 21fc1d634f emrtd: Add 14b support and better presence detection 2020-12-13 01:49:17 +03:00
Ave ac82a80afa emrtd: Read more files, save read files 2020-12-12 22:10:40 +03:00
Ave d1d5d8ee74 emrtd: account for larger file reads, read ef_dg2 2020-12-12 21:54:23 +03:00
Ave c2531e7ed0 emrtd: Rename from hf emrtd info to dump, code cleanup 2020-12-12 21:19:51 +03:00
Ave 3dd4f580c8 emrtd: Have secure_select_file accept string filenames 2020-12-12 21:11:17 +03:00
Ave 42e6763ea1 emrtd: Improve and clean asn1datalength and asn1fieldlength 2020-12-12 20:55:16 +03:00
Ave a895fbd3c6 emrtd: Implement secure_read_file 2020-12-12 20:26:54 +03:00
Christian Molson 89099cf1a1 EM4x70 remove short command options from authentication. 2020-12-12 10:31:00 -05:00
Christian Molson 701914430f em4x70 makestyle 2020-12-12 10:02:43 -05:00
Christian Molson 13268df9c3 Merge remote-tracking branch 'upstream/master' into em4x70-auth 2020-12-12 10:00:22 -05:00
Christian Molson a6024a8622 EM4x70 Authentication support 2020-12-12 09:59:30 -05:00
Philippe Teuwen 7cd80611d3 #makestyleday 2020-12-12 14:46:40 +01:00
Christian Molson 7b7698843f EM4x70 fix info text, update parity options to use long options only 2020-12-12 08:29:33 -05:00
Christian Molson ed8c63a4f4 EM4x70 Unlock support. Send pin code to unlock tag. 2020-12-12 01:20:26 -05:00
Christian Molson 4c52fac9e1 EM4x70 write support 2020-12-11 23:26:17 -05:00
Ave cf3b0bcbe1 emrtd: Impl check_cc 2020-12-12 04:34:16 +03:00
Ave 3e2e0299ff emrtd: Impl secure read binary 2020-12-12 01:50:54 +03:00
tharexde ffd1fe1dde added function CmdEM4x50EView 2020-12-11 19:55:15 +01:00
tharexde 80c033b93b added function CmdEM4x50EView 2020-12-11 19:54:46 +01:00
Ave e93a258f88 emrtd: make style pass 2020-12-11 21:17:15 +03:00
Ave 831672be20 emrtd: Clean up secure select file 2020-12-11 21:14:47 +03:00
Ave 2f42b875e1 emrtd: Impl secure file select 2020-12-11 21:07:52 +03:00
Iceman 9eabdf85e6
Merge pull request #1093 from cyberpunk-re/rawdemod_parser
Rawdemod parsing fixes
2020-12-11 07:19:50 +01:00
Ave ca3471ffdf emrtd: calculate session keys 2020-12-11 06:52:26 +03:00
Ave 70ecfdf502 emrtd: Verify rnd_ifd 2020-12-11 06:27:47 +03:00
Ave 332b67655c emrtd: Improve logging 2020-12-11 05:38:27 +03:00
Ave ca04c44384 emrtd: Implement retail_mac and external authentication 2020-12-11 04:53:17 +03:00
Ave 6086ede2ed emrtd: split 3des encryption to its own func 2020-12-11 04:53:17 +03:00
Ave 69be5f8b25 emrtd: calculate S and e_ifd 2020-12-11 04:53:17 +03:00
Ave a7478443b3 emrtd: calc kenc and kmac 2020-12-11 04:53:17 +03:00
Ave b0fb5bfff6 emrtd: Reduce code repetition 2020-12-11 04:53:17 +03:00
Ave 49e4321382 emrtd: Get challenge
also some code "cleanup" which makes this whole shit less mem safe but
shh
2020-12-11 04:53:17 +03:00
Ave 9f6309cc23 emrtd: Add kseed calc, fix kmrz calc 2020-12-11 04:53:17 +03:00
Ave 1149c56696 emrtd: Add kmrz calc 2020-12-11 04:53:17 +03:00
Ave 84a1059d93 emrtd: Add BAC check 2020-12-11 04:53:17 +03:00
Ave 885f4b52fd emrtd: Rename select_aid to select_file 2020-12-11 04:53:17 +03:00
Ave 2c5ab21948 emtrd: Switch magic numbers over to named defines 2020-12-11 04:53:17 +03:00
Ave bee075ad09 emrtd: Push initial code
Can only read EF_CardAccess currently, but has abstractions for
selecting AIDs and reading files, which was the Hard Part so far

Based heavily on mrpkey by rfidiot
2020-12-11 04:53:17 +03:00
cyberpunk-re 8d594db69e remove newline 2020-12-11 00:19:57 +00:00
cyberpunk-re 7a3faa7de8 fix parsing for psk 2020-12-11 00:17:51 +00:00
iceman1001 0c0cdab17d hf iclass encode - writes a credential 6,7,8,9 2020-12-11 01:02:36 +01:00
iceman1001 21eebd4b76 hf iclass encode - now writes a block6 2020-12-11 00:49:18 +01:00
iceman1001 4ca4119fc9 added 2020-12-11 00:42:55 +01:00
iceman1001 936efd160e lf nexwatch demod - pad hex 2020-12-10 17:07:33 +01:00
iceman1001 71108ea822 missing zero padding in raw output 2020-12-10 16:02:27 +01:00
iceman1001 ab018ebe6d added - a naive apdu fuzzer for ISO14443A 2020-12-10 11:48:09 +01:00
Christian Molson 76bf80a8dd Update em4x70 info to use cliparser 2020-12-09 16:22:52 -05:00
Christian Molson 011b585b0d Merge remote-tracking branch 'upstream/master' into em4x70_support 2020-12-09 10:00:42 -05:00
iceman1001 3329e363e0 lf em 410x - now uses cliparser, support continuous mode, and reworked output 2020-12-09 14:48:10 +01:00
Iceman 8e022d3040
Merge pull request #1090 from cyberpunk-re/t55xx_config_recompute_block0
Fix issue #844 - "t55xx config" => recompute block0
2020-12-09 12:19:21 +01:00
iceman1001 01b2c14616 adapt and fix memoryleaks in Em4x50 2020-12-09 12:18:01 +01:00
(⌐■_■) Cyberpunk 888efe2c13
Merge branch 'master' into t55xx_config_recompute_block0 2020-12-09 09:54:07 +00:00
cyberpunk-re 7f4fe79aaa Made GetConfigBlock0Source string buf larger to acomodate ASCII color escape expansion 2020-12-08 23:32:23 +00:00
cyberpunk-re b52d50d30a Block0 source explicit in lf t55xx config and color coded 2020-12-08 22:54:29 +00:00
Christian Molson be3af8d32c Fix command help spacing/order for em4x70 2020-12-08 14:38:47 -05:00
Christian Molson 64dd8614d8 Remove unused cmflfem4x70 header from cmlfem410x.c 2020-12-08 14:36:23 -05:00
tharexde 1d083fdb67 Merge branch 'master' into update_4x50
update 201208
2020-12-08 20:23:59 +01:00
tharexde b83cbe8212 fixed Appveyor complaint 2020-12-08 20:20:49 +01:00
iceman1001 ed031d9bd1 MAD SIO added 2020-12-08 20:10:45 +01:00
Nick Draffen 9646c34c94
Merge branch 'master' into topaz_cliparser 2020-12-08 14:05:30 -05:00
Iceman 77a041545c
Merge pull request #1089 from tcprst/thinfilm_cliparser
hf thinfilm - now use cliparser
2020-12-08 20:01:55 +01:00
tcprst 2c4f7cad70
fix missing newline in iclass restore helptext 2020-12-08 09:35:30 -05:00
cyberpunk-re 00cff49f9d fixed incorrect bitmask on modulation 2020-12-07 23:33:58 +00:00
cyberpunk-re dcf7e52b01 Remove lua script not belonging to this PR 2020-12-07 13:51:23 +00:00
cyberpunk-re 9ea6665a24 Fix issue #844 2020-12-07 12:55:11 +00:00
tharexde 12880aa419 help text adjustments regarding new command structure 2020-12-06 23:14:41 +01:00
tharexde 0ba4394532 cleanup 2020-12-06 23:08:43 +01:00
tharexde e4d0bfeced added missing commands for new "lf em" command structure 2020-12-06 23:00:26 +01:00
tharexde 894d973d69 Merge branch 'master' into update_4x50
merged 201206
2020-12-06 20:40:46 +01:00
tharexde 136339898a block number to be wiped first has to be dynamic 2020-12-06 19:26:20 +01:00
tharexde 314450b738 transferring data of dump file to device via
- em4x50_eload or
	- file option "-f <filename>":
		- via spiffs if flash memory is available
		- via emulator memory if flash memory is not available
2020-12-06 01:53:43 +01:00
tcprst 6427958e61
hf thinfilm - now use cliparser 2020-12-05 19:35:52 -05:00
tcprst 4ef311336c
hf topaz - now use cliparser 2020-12-05 19:17:57 -05:00
Christian Molson 4e592eba1c Merge branch 'master' into em4x70_support 2020-12-05 17:59:58 -05:00
iceman1001 54634b33b0 text 2020-12-05 23:51:00 +01:00
tharexde 0a21f7dd8f keys are copied blockwise via spiffs to device because of
- flash memory limitation (big dictionaries)
	- user feedback (infos about progress)
2020-12-05 23:47:53 +01:00
Christian Molson 614ab55809 Initial commit for em4x70 support.
Initially I only have an em4x70 variant used for car transponders.
Also known as the ID48.
2020-12-05 17:47:03 -05:00
iceman1001 ee3c0faee1 hf iclass -helptexts 2020-12-05 13:27:39 +01:00
iceman1001 697463fb69 text 2020-12-04 23:38:40 +01:00
iceman1001 4bde614006 text 2020-12-04 23:32:47 +01:00