Commit graph

3144 commits

Author SHA1 Message Date
merlokk b415ee086d remove double padding 2021-07-19 19:54:51 +03:00
merlokk b6a65405a0 remove debug 2021-07-19 19:05:07 +03:00
merlokk 0b06600e72 fix 2021-07-19 18:47:16 +03:00
merlokk 1e1c3ec210 add helptext 2021-07-19 18:46:35 +03:00
merlokk d50c72b30e fix create app defaults 2021-07-19 18:40:24 +03:00
merlokk 449f4edcb0 restrict change key algo 2021-07-19 18:32:10 +03:00
merlokk 4c686799ab add allowed secure channel check 2021-07-19 17:33:35 +03:00
merlokk 31334da0c4 fix key type defsults 2021-07-19 09:38:32 +03:00
iceman1001 508d33f97b lax size restrictions 2021-07-18 21:19:11 +02:00
iceman1001 15de3f14a9 dg5 show picture 2021-07-18 21:18:34 +02:00
merlokk 6a6ec86791 fix 2tdea/d40 authentication 2021-07-16 20:45:32 +03:00
merlokk 1699d8a90e add des3 to libcrypto 2021-07-16 20:45:03 +03:00
merlokk cf63b9e022 make style 2021-07-16 20:11:41 +03:00
merlokk bdac4cb48d print the new key if we put the key version into the des key 2021-07-16 20:05:14 +03:00
merlokk a35e185b5b add setup oldkey if we change the same key 2021-07-16 19:57:11 +03:00
merlokk bbc4f378ab some info 2021-07-15 20:41:34 +03:00
merlokk 46a294d585 core works 2021-07-15 20:14:02 +03:00
merlokk 92a0639ba8 fix 2021-07-15 15:26:25 +03:00
merlokk 557fc5bb97 changekey command sketch 2021-07-15 14:54:15 +03:00
merlokk 3eb8523079 key version 2021-07-15 14:53:48 +03:00
iceman1001 e5fc1d83b2 use partiy.h and textual 2021-07-14 15:01:01 +02:00
Iceman f027a1fce6
Merge branch 'master' into patch-1 2021-07-14 14:48:45 +02:00
iceman1001 28eec73445 added a client preference for delay of execution. This a global delay before each command is parsed. You can unset it with by setting delay to ZERO. The purpose of this setting is for users who want to use the pm3 against a implanted implant where you have to get a good position and arrange the pm3 while pressing <enter>. 2021-07-14 09:57:16 +02:00
Iceman 9845adfe77
Merge pull request #1371 from TheArchitect0880/patch-1
Update cmdhf14a.c
2021-07-13 18:14:35 +02:00
merlokk 1317fa8e32 command renamings, remove code 2021-07-13 18:42:03 +03:00
merlokk bd96dc4844 small fixes 2021-07-13 18:36:07 +03:00
merlokk 480bd87207 make style 2021-07-13 18:20:22 +03:00
merlokk 1b3e34c928 createapp fully works 2021-07-13 18:13:29 +03:00
merlokk 2f2942c7db CmdHF14ADesGetAppNames --no-auth 2021-07-13 17:42:10 +03:00
merlokk 5a72b53676 fix DesfireCommandEx 2021-07-13 17:36:27 +03:00
merlokk 741f560a8d hf mfdes getaids -- no-auth 2021-07-13 17:29:45 +03:00
merlokk 668650b8cd fix bugs 2021-07-13 17:23:29 +03:00
merlokk 9b70ebc01f fix cmd default test 2021-07-13 16:56:28 +03:00
merlokk e00fc93c20 createfile works 2021-07-13 16:51:50 +03:00
merlokk 7ce5fa53f4 createapp help and textual changes 2021-07-13 14:56:56 +03:00
merlokk 9fe785f918 remove code 2021-07-13 13:34:35 +03:00
merlokk 2505b17912 delete aid ok 2021-07-13 13:32:38 +03:00
merlokk 3e86c15a33 cov 351017 2021-07-13 12:16:30 +03:00
merlokk 89450c2fee commands refactoring 2021-07-13 11:56:12 +03:00
TheArchitect0880 89e9897200
Update cmdhf14a.c
changed "hf emv" to "emv" since its not under hf commands anymore
2021-07-13 00:04:02 +02:00
merlokk afbe5deda2 commands refactoring 2021-07-13 00:59:07 +03:00
merlokk d4646ce6d6 add aid to formatpicc 2021-07-12 23:53:57 +03:00
merlokk 8e68dafa3a freemem conditions 2021-07-12 23:53:38 +03:00
merlokk 12969cf728 text 2021-07-12 23:36:25 +03:00
merlokk cf96dc3acb get free mem an format icc commands 2021-07-12 23:33:13 +03:00
merlokk 6442223937 getfreemem 2021-07-12 22:46:55 +03:00
merlokk 9c63d09179 cmdcode 2021-07-12 22:40:22 +03:00
merlokk e03501bc86 formatpicc command 2021-07-12 22:38:25 +03:00
merlokk 6f66a97cb3 help text 2021-07-12 21:50:02 +03:00
merlokk 90fe298b33 remove todo that is done 2021-07-12 19:28:29 +03:00
merlokk 7bff67dceb new getuid works 2021-07-12 19:27:24 +03:00
merlokk 5bca74e5c8 DropField 2021-07-12 19:12:47 +03:00
merlokk 10409c3fdc help text 2021-07-12 18:56:30 +03:00
merlokk 81740b3494 cov 350889 2021-07-12 18:47:26 +03:00
merlokk 9c320dc241 getkeyversion works 2021-07-12 18:45:59 +03:00
merlokk 55b6ff8e05 make select-and-authenticate function 2021-07-12 17:53:17 +03:00
merlokk 2d5cc6aec7 350889 2021-07-12 11:21:48 +03:00
merlokk 72ef378cd1 350888 2021-07-12 11:20:50 +03:00
merlokk 7cb089f11b 350861 2021-07-12 11:19:48 +03:00
merlokk a3acb921c7 350563 2021-07-12 11:18:55 +03:00
merlokk a0ec56cdc4 350557 2021-07-12 11:15:50 +03:00
scott4290 33b48ae205
Update flash.c
Adding a suggested step to point the user in the right direction.

[+] Loading usable ELF segments:
[+]    0: V 0x00102000 P 0x00102000 (0x00040888->0x00040888) [R X] @0x94
[!!] 🚨 Error: PHDR is not contained in Flash
[!!] 🚨 Firmware probably too big for your device
[=] The flashing procedure failed, follow the suggested steps!
[+] All done
2021-07-11 16:17:51 -04:00
Oleg Moiseenko 1d883db517
Merge pull request #1364 from merlokk/desfire5
Desfire GetKeySettings and ChangeKeySettings
2021-07-11 19:45:00 +03:00
merlokk 88e573d072 add default channel settings to commands 2021-07-11 18:58:26 +03:00
merlokk e4bdecf30e style 2021-07-11 18:57:44 +03:00
merlokk cc3883a770 ev1/enc tx side works 2021-07-11 18:27:29 +03:00
merlokk d8a8c015bc channel d40/encode works 2021-07-11 18:14:27 +03:00
merlokk 3f7f343f6f DesfireChangeKeySettings works 2021-07-10 16:11:44 +03:00
merlokk 5367cb4e23 CmdHF14ADesChKeySettings command 2021-07-10 16:05:40 +03:00
merlokk 1cd467e1f3 change param name 2021-07-10 15:16:06 +03:00
merlokk e54f0e3a33 move crc to new file 2021-07-10 15:10:15 +03:00
merlokk b6e6070bfe remove debug 2021-07-10 15:08:39 +03:00
merlokk 67d7d29d74 CmdHF14ADesGetKeySettings works 2021-07-10 15:07:51 +03:00
scott4290 3634fb4091
Update cmdlft55xx.c
Fixed two bugs:  >= preventing users from testing one password (start_password=end_password) and reporting that the start password is greater than the end password.  The second issue is when the end password _is_ the correct password, the found password reported was curr -1.
2021-07-10 00:00:42 -04:00
merlokk c8777ebea8 add getkeysettings command 2021-07-09 19:26:41 +03:00
merlokk cbffdd7552 add print keysettings 2021-07-09 19:26:15 +03:00
merlokk d67ea92e2e implement check channel, add 2 new commands 2021-07-09 18:04:27 +03:00
merlokk f606cc5fb5 added check channel 2021-07-09 18:03:34 +03:00
Oleg Moiseenko da9fff22c9
Merge pull request #1361 from merlokk/desfire_tests
add test command for desfire
2021-07-09 16:38:29 +03:00
merlokk aa1d98ba55 fix test AlwaysAvailable 2021-07-09 16:06:18 +03:00
merlokk 48a9636679 style 2021-07-09 15:56:18 +03:00
merlokk 8403624bb1 cmac tests 2021-07-09 15:50:40 +03:00
merlokk fff1c8fae1 add test command and crc tests 2021-07-09 15:15:16 +03:00
merlokk 370c4cf5a4 make style 2021-07-09 14:43:12 +03:00
merlokk 08d8ac4f9f fix bug with false-positive crc16 and remove debug 2021-07-09 14:01:57 +03:00
merlokk 77a66a024b remove debug 2021-07-09 14:01:22 +03:00
merlokk bed25108f6 d40/enc works 2021-07-09 13:14:42 +03:00
merlokk a7f39a1b79 move crc search function to desfirecrypto 2021-07-09 13:09:59 +03:00
merlokk ec79e35dcc add crc16 check 2021-07-09 13:08:49 +03:00
merlokk 70bedbd7d1 fix some d40 channel conditions 2021-07-09 01:41:25 +03:00
merlokk 2fde5d90ae crc32 ok, ev1/enc channel ok. 2021-07-09 01:27:28 +03:00
merlokk 0fa708acb2 add crc32 check 2021-07-09 01:26:47 +03:00
merlokk cf7949c1f8 fix chaining 2021-07-08 18:26:07 +03:00
merlokk 03ed6a8f05 Merge branch 'master' of https://github.com/merlokk/proxmark3i into desfire4
# Conflicts:
#	client/src/mifare/desfiresecurechan.c
2021-07-08 17:46:06 +03:00
merlokk 8fd896478e ev1 channel reorganized 2021-07-08 17:07:02 +03:00
merlokk 567cbadc58 add some session params 2021-07-08 17:04:44 +03:00
Philippe Teuwen 3c31ee793d make style 2021-07-08 09:53:50 +02:00
merlokk ebcb86570e fix length bug in the encode/decode 2021-07-07 18:41:20 +03:00
merlokk ca983f1473 cmac can be NULL 2021-07-07 18:06:38 +03:00
merlokk c99002c5e0 add Get UID command 2021-07-07 17:59:42 +03:00
merlokk 6e207be3ac added there is no applications message if it there is no app) 2021-07-07 16:31:23 +03:00
merlokk d963ec8332 remove debug 2021-07-07 16:25:26 +03:00
merlokk 8102891491 ev1/mac and ev1/plain works 2021-07-07 16:18:12 +03:00
merlokk 0f0ef4435e add mac length and fix encode/decode 2021-07-07 16:17:35 +03:00
merlokk 857ce0ea17 fix multiple sprint_hex 2021-07-07 16:16:45 +03:00
merlokk ae53e38335 add application create/delete commands 2021-07-06 18:41:52 +03:00
merlokk fffef000ea mac des/ev1 calculated 2021-07-06 16:46:05 +03:00
merlokk 5f0f6b8032 update crypto encode/decode 2021-07-06 16:22:01 +03:00
merlokk c22050b638 create new desfirecrypto 2021-07-06 12:39:06 +03:00
Oleg Moiseenko a20db915df
Merge branch 'master' into desf_update2 2021-07-06 12:17:31 +03:00
merlokk 20696fb44a make style 2021-07-06 12:16:19 +03:00
merlokk 0a51eb445d add mac sketch 2021-07-06 12:05:59 +03:00
merlokk 56d7efdbb5 move some functions from cipurse to libcrypto 2021-07-06 12:05:38 +03:00
iceman1001 918630e22e fixes closing picture viewer exits client 2021-07-05 19:09:16 +02:00
merlokk d2491d342d move secure channel functions to separate file 2021-07-05 19:31:42 +03:00
merlokk b63a991bc3 fix coverity 350561 2021-07-05 19:04:41 +03:00
merlokk 7882a2dbaa fix coverity 350557 2021-07-05 19:03:41 +03:00
iceman1001 36af584e1b fix CID 350569 2021-07-05 17:23:02 +02:00
iceman1001 b0c1ce714f fix coverity CID 350569 2021-07-05 17:14:47 +02:00
iceman1001 b026fc64f0 fix coverity CID 350152 2021-07-05 17:14:14 +02:00
merlokk be9db18852 fix coverity 350572 2021-07-05 15:22:33 +03:00
Oleg Moiseenko 8a598ce33c
Merge pull request #1346 from merlokk/desf_update
Desfire functionality update
2021-07-05 14:50:19 +03:00
iceman1001 20fe52f8eb added a picture viewer in QT to be used with hf emrtd 2021-07-05 13:42:33 +02:00
merlokk d6dc117ed3 mark commands with new sign 2021-07-05 14:18:05 +03:00
merlokk 164a1db780 Merge branch 'desf_update' of https://github.com/merlokk/proxmark3i into desf_update 2021-07-05 14:15:58 +03:00
merlokk e9b8e18430 remove key_size 2021-07-05 14:15:39 +03:00
Oleg Moiseenko 6671563fb9
Merge branch 'master' into desf_update 2021-07-05 14:02:15 +03:00
merlokk 96d18a1cd7 splitbysize works correctly in the all the cases 2021-07-05 14:00:51 +03:00
iceman1001 36c0ddc91a increase output size in order to avoid crash in emrtd info 2021-07-05 12:36:43 +02:00
merlokk 003a0b0de4 splitbysize now put length of message at the first bytes of array's memory 2021-07-05 12:40:07 +03:00
merlokk 5937fd4217 added lib 2021-07-05 12:12:42 +03:00
merlokk dece2b1bbd delete des from desfire_crypto 2021-07-05 12:09:08 +03:00
merlokk 3cc199ea34 cmdhfmf uses libcrypto 2021-07-05 12:04:36 +03:00
merlokk 93a19fb953 cmdhfemrtd uses libcrypto 2021-07-05 12:03:50 +03:00
merlokk 2fb090e560 move des functions to pcrypto 2021-07-05 12:01:43 +03:00
merlokk b53c8bc0c9 Merge branch 'master' of github.com:merlokk/proxmark3i into desf_update 2021-07-04 22:40:27 +03:00
merlokk 1aedfc7b6e ev1 mac decode placeholder 2021-07-04 22:37:27 +03:00
merlokk 5d8fa054e5 added channel logic to d40 mode 2021-07-04 22:16:43 +03:00
merlokk 998538a60a libcrypto des encrypt/decrypt ecb and change cmdhfemtrd to use des from libcrypto 2021-07-04 22:15:53 +03:00
merlokk aa8c4b3dca secure channel sketch 2021-07-04 17:49:11 +03:00
merlokk fce8affd48 fix des authentication 2021-07-04 15:43:57 +03:00
merlokk 1adfad07bd move des encrypt/decrypt to lib 2021-07-04 14:14:43 +03:00
merlokk db87af3bf8 Revert "fix DesfireAuthenticate for d40/ev1 mode"
This reverts commit 430f82730d.
2021-07-04 14:00:35 +03:00
merlokk 430f82730d fix DesfireAuthenticate for d40/ev1 mode 2021-07-04 13:38:12 +03:00
merlokk 6124b49c99 DesfirePrintContext prints session state 2021-07-04 12:47:09 +03:00
merlokk 5271cb96c3 add commant, remove debug 2021-07-04 12:25:34 +03:00
merlokk 2abd930ef7 simplify cliparser optinlist. added mfdes default 2021-07-04 12:20:09 +03:00
merlokk fe5f9ec9d5 native channel works 2021-07-04 11:21:31 +03:00
Pat Cunningham 2b176c53cc handel incorrect picopass config found on unpersonalized cards and AA1s grater than 250 blocks 2021-07-03 20:22:42 -07:00
merlokk 1b2442ec36 regactoring desfire commands. textual fixes 2021-07-03 17:31:12 +03:00
merlokk 0d00f56777 CmdHF14ADesGetAppNames works 2021-07-03 13:11:17 +03:00
merlokk f9e006f2e3 added authchann otion 2021-07-03 12:21:29 +03:00
merlokk acca624752 added cli text options to command 2021-07-03 00:08:45 +03:00
merlokk 7af924eadd add get key size function 2021-07-03 00:07:55 +03:00
merlokk a73c6ef90a add array_length 2021-07-02 22:13:45 +03:00
merlokk 0aad993711 remove comments and text fixes 2021-07-02 18:17:21 +03:00
merlokk d354ac90fd fix warning 2021-07-02 18:07:46 +03:00
merlokk 636a1dd457 DesfireGetAIDList works 2021-07-02 18:06:13 +03:00
merlokk e5d24ff81f authentication works 2021-07-02 17:37:15 +03:00
merlokk b5ee999c73 rename GetErrorString -> DesfireGetErrorString 2021-07-01 20:47:02 +03:00
merlokk 73db86bcc7 exchange returns result. select works 2021-07-01 20:32:04 +03:00
merlokk ecfcc21ded select works (somehow) 2021-07-01 20:06:33 +03:00
merlokk 2fa6c4643e desfire channel sketch 2021-07-01 19:53:57 +03:00
merlokk d43f6ffc44 make style 2021-06-30 12:32:52 +03:00
merlokk 9c65dacb50 added clear parameter 2021-06-30 12:26:08 +03:00
merlokk 97f3a972d4 added default parameters for hf cipurse. now not needs to enter them each time 2021-06-30 12:19:12 +03:00
iceman1001 d6e55a2f40 textual 2021-06-29 22:23:39 +02:00
merlokk 9487953359 asn1_value_integer now works in pure hex to int instead of BCD 2021-06-29 19:59:42 +03:00
iceman1001 f0c1665427 Revert "Release v4.13441 - midsummer"
This reverts commit 55e1b6714b.
2021-06-25 23:39:10 +02:00
iceman1001 55e1b6714b Release v4.13441 - midsummer 2021-06-25 23:39:10 +02:00
iceman1001 a115ff0757 style 2021-06-25 23:35:36 +02:00
iceman1001 589c304142 fix uninitialized gcc7.5 opensuse warning 2021-06-25 23:09:48 +02:00
iceman1001 93cc64a8e3 fix uninitialized gcc7.5 opensuse warning 2021-06-25 23:04:55 +02:00
iceman1001 94d12f8bbf fix coverity CID 350102 2021-06-25 22:43:54 +02:00
iceman1001 015e02a9bf free start pointer 2021-06-25 22:13:41 +02:00
iceman1001 26b37ce64f reworked "lf em 4x50 chk" to use dynamic memory for dictionary 2021-06-25 19:46:12 +02:00
iceman1001 a10c92267e allow for 24 bytes keys to be loaded from dictionary 2021-06-25 19:45:25 +02:00
iceman1001 a86bd9464f text 2021-06-25 17:22:09 +02:00
rioux f7c4336645 last update askip 2021-06-25 13:26:16 +02:00
rioux c5aaa3f83f lf nexwatch with psk2 2021-06-25 12:09:40 +02:00
rioux e33f2a76aa lf nexwatch with psk2 2021-06-25 12:00:29 +02:00
Guilhem7 9b63675e05
Merge branch 'RfidResearchGroup:master' into master 2021-06-25 11:50:06 +02:00
iceman1001 4b2ab94b26 hw setmux - improved user feedback 2021-06-25 10:34:12 +02:00
iceman1001 b1e361619f fix shadow 2021-06-25 10:04:29 +02:00
iceman1001 0747abfe0f lf em 4x05 brute/chk - fixes input arguments, unify file name text 2021-06-25 10:03:14 +02:00
iceman1001 fc822109de unifiy file name param / textual 2021-06-25 10:02:30 +02:00
MaximeBosca 5f9f623627 new clone 2021-06-25 09:56:30 +02:00
iceman1001 d7421369ad text 2021-06-25 09:43:39 +02:00
iceman1001 3d663be25a fix "lf hitag reader --23" - now allows 6bytes 2021-06-24 21:31:43 +02:00
iceman1001 3b9da365a0 textual 2021-06-24 19:27:12 +02:00
Iceman 270ef78820
Merge pull request #1337 from merlokk/cov305864
fix coverity 305864
2021-06-24 18:47:51 +02:00
iceman1001 e2ca0a4abd style 2021-06-24 18:47:11 +02:00
merlokk 791a4e885b fix coverity 305864 2021-06-24 19:29:36 +03:00
iceman1001 eed0ca4796 textual 2021-06-24 18:23:10 +02:00
Iceman cffd0068fd
Merge pull request #1334 from merlokk/cipurse_test
Cipurse tests
2021-06-24 17:41:11 +02:00
iceman1001 ebd9f24af4 fix hf iclass config - now uses a default config card data if no config card present on device. 2021-06-24 17:38:17 +02:00
iceman1001 f02daaa1cb ndef parser vcard now handles xvcard 2021-06-24 17:34:37 +02:00
rad1game a4643516f8
Update cmdlfem4x05.c
Typo fix
2021-06-24 19:05:35 +04:00
merlokk 4ba61c6237 test apdu in the encode mode 2021-06-24 17:39:58 +03:00
merlokk aa880239a1 add error check in the crypto stream 2021-06-24 17:39:23 +03:00
iceman1001 ffddfea841 textual 2021-06-24 15:09:11 +02:00
iceman1001 c522de5b79 added "hf mf gview" to view contents of a magic gen3 gtu card 2021-06-24 14:59:33 +02:00
merlokk 8b9271fc7d added frame key checking 2021-06-24 10:49:36 +03:00
merlokk 85986e5994 part ot test encrypt 2021-06-24 10:18:01 +03:00
merlokk e0d1656ea1 add plain apdu encode 2021-06-23 21:06:46 +03:00
merlokk f3bdd52cf1 check apdu copy 2021-06-23 20:59:37 +03:00
merlokk f26b4178f3 part of TestAPDU 2021-06-23 20:56:22 +03:00
merlokk 8e822e9677 added TestEncDec 2021-06-23 20:45:14 +03:00
merlokk 0ca3a5d644 added part of TestEncDec 2021-06-23 20:35:54 +03:00
merlokk 7fa4f740f4 added TestMAC 2021-06-23 20:22:57 +03:00
merlokk 1832a5b370 added TestMIC 2021-06-23 20:08:18 +03:00
merlokk 99979c6609 added TestAuth 2021-06-23 19:58:37 +03:00
merlokk 50c40e4ce5 added smi test 2021-06-23 19:34:22 +03:00
merlokk c126f02b95 added TestISO9797M2 2021-06-23 19:22:31 +03:00
merlokk bbe0fa1a35 fix tests 2021-06-23 19:12:13 +03:00
merlokk fb9d19e43a kvv test added 2021-06-23 18:43:57 +03:00
merlokk 8aee946895 add command hf cipurse test 2021-06-23 18:20:30 +03:00
merlokk 6a5a5f7397 make style 2021-06-23 17:41:14 +03:00
merlokk 31e4d69853 fix cipurse coverity and textual 2021-06-23 17:24:27 +03:00
merlokk 01632eb9b0 make style 2021-06-23 16:18:05 +03:00
MaximeBosca 12bd44c3a8 test 2021-06-23 15:04:00 +02:00
MaximeBosca 17d6b76931 test 2021-06-23 14:55:22 +02:00
rioux c23552f255 TODO 2021-06-23 14:49:59 +02:00
merlokk ca9fe92fb8 fix error show in the hf search 2021-06-23 14:50:02 +03:00
Philippe Teuwen 66d35ae0b1 fix tip 2021-06-23 09:53:27 +02:00
Philippe Teuwen ab140b926a fix tip 2021-06-23 09:52:29 +02:00
iceman1001 11362c66f1 fix coverity CID 301400|301401 2021-06-22 13:51:31 +02:00
Iceman 00b4636be1
Merge pull request #1329 from mwalker33/desfire
Update desfire_crypto.c
2021-06-22 11:48:15 +02:00
mwalker33 bcc137af1d Update desfire_crypto.c
Coverty 344484 - ensure AES IV is at least 16 bytes long.
2021-06-22 18:55:23 +10:00
iceman1001 4facebb34d input sanitizing 2021-06-22 10:52:08 +02:00
iceman1001 d330d22c48 text 2021-06-22 10:46:21 +02:00
iceman1001 0d2cd089c0 coverity fix, textual, style 2021-06-22 10:43:48 +02:00
mwalker33 1655cdd206 Update cmdhfmfdes.c
Remove old code
2021-06-22 17:22:01 +10:00
mwalker33 69e1afbda9 Update cmdhfmfdes.c
Coverity : 320356, 286670, 344402
2021-06-22 17:15:04 +10:00
iceman1001 083e557b9f fix little endian vs big endian in the macros... again... but this time correct 2021-06-22 07:53:00 +02:00
iceman1001 88d9942d3f fix little endian vs big endian in the macros 2021-06-22 07:49:17 +02:00
iceman1001 ba76aabdf8 hf mf fchk - output style 2021-06-21 09:15:18 +02:00
iceman1001 293cd21e28 textual 2021-06-21 09:03:46 +02:00
iceman1001 0f6b6cb650 fix coverity CID 349331 2021-06-21 07:30:46 +02:00
iceman1001 0e7e13db7d fix for client crash in lf hitag eload. Hitag simulation still now working (wip) 2021-06-20 23:02:18 +02:00
iceman1001 3ec98d936c textual 2021-06-20 21:39:52 +02:00
iceman1001 08b583e2bb fix param call in lf keri demod 2021-06-20 21:28:33 +02:00
iceman1001 9d02c2e94a renamed 'hf mfdes readdata, writedata' to 'read/write' 2021-06-20 16:37:51 +02:00
iceman1001 f6534e18be style 2021-06-20 16:36:31 +02:00
iceman1001 6f2cb98ae4 fix coverity CID 349310 2021-06-20 11:17:23 +02:00
iceman1001 4d95cc2fdb fix coverity CID 349307 2021-06-20 11:15:48 +02:00
iceman1001 861e06d8af fix coverity CID 322780 - out-of-bounds 2021-06-20 10:47:23 +02:00
iceman1001 e8d5d81178 code style, and make less output for hf search 2021-06-20 10:41:47 +02:00
iceman1001 9a063d75fe style, the return codes needs to be adjusted to follow the PM3_E* styled defines. 2021-06-20 10:32:08 +02:00
iceman1001 b8aedada54 text 2021-06-20 08:56:06 +02:00
iceman1001 b93de4388a textual 2021-06-20 08:41:18 +02:00
iceman1001 5da59e5535 fix coverity CID 349303 2021-06-20 08:40:32 +02:00
iceman1001 b1566bd9ae fix coverity CID 349305 and textual changes 2021-06-20 08:38:33 +02:00
iceman1001 48cfb255ef fix coverity CID 349309 2021-06-20 08:10:41 +02:00
iceman1001 b5e7b6277f fix coverity CID 349310 2021-06-20 08:08:41 +02:00
iceman1001 501a848034 fix coverity CID 349311 2021-06-20 08:05:21 +02:00
iceman1001 ea80ea21ad fix coverity CID 349314 2021-06-20 08:02:33 +02:00
iceman1001 e0fc80c539 fix coverity CID 349315 2021-06-20 08:01:01 +02:00
iceman1001 b17a311c66 various coverity fixes 2021-06-20 07:58:29 +02:00
iceman1001 2f432788cf fix out-of-bounds access 2021-06-20 07:49:41 +02:00
iceman1001 57f9a00906 ndef parser - now handles more ndef types 2021-06-19 22:15:35 +02:00
ikarus 996c7e3d8a fixed typo. 2021-06-19 21:29:24 +02:00
iceman1001 449dc7bd48 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-06-19 20:14:06 +02:00
mwalker33 57729b604c Update cmdhfmfdes.c
realloc update
2021-06-19 13:12:10 +10:00
mwalker33 094f9edbad
Merge branch 'master' into desfire 2021-06-19 11:10:20 +10:00
mwalker33 22d311e5fa Update cmdhfmfdes.c
3K3Des Authentication and Change Key patch
Get Card UID (when authenticated for real UID
3Des session key patch when 1st half = 2nd Half
2021-06-19 11:05:59 +10:00
merlokk b2996aa69a make style 2021-06-18 12:05:14 +03:00
merlokk b92ebfa4a4 added hf search -v and reworked fast aid search output 2021-06-18 11:59:48 +03:00
merlokk c5f24a24a4 make style and small fix 2021-06-17 13:44:14 +03:00
merlokk da8c33f4c0 small fix 2021-06-17 13:32:38 +03:00
merlokk 0cc310df62 fixed cipurse hf search behavior and add some aid search to link to commands 2021-06-17 13:24:16 +03:00
Philippe Teuwen d699463fa0
Merge branch 'master' into patch-1 2021-06-16 18:12:25 +02:00
merlokk c8c3c279eb small fix 2021-06-15 15:44:04 +03:00
merlokk cbb484588c add some info 2021-06-15 15:36:50 +03:00
merlokk a5b5a147c9 fix libs 2021-06-15 14:06:43 +03:00
merlokk f3f3a5a270 make style 2021-06-15 14:06:43 +03:00
merlokk f0367ad2f7 help changes and add delete command 2021-06-15 14:06:43 +03:00
merlokk 6f334ed968 add create file command 2021-06-15 14:06:43 +03:00
merlokk 2f83e87222 some refactorings 2021-06-15 14:06:43 +03:00
merlokk c5c15de700 read file attributes 2021-06-15 14:06:43 +03:00
merlokk 012b7e5701 write file works 2021-06-15 14:06:42 +03:00
merlokk f682a184b8 set channel security levels from command line 2021-06-15 14:06:42 +03:00
merlokk e5fe614a4f added no-authenticate option to read file 2021-06-15 14:06:42 +03:00
merlokk 737ff2d465 encoding works 2021-06-15 14:06:42 +03:00
merlokk a206dcc9b2 clear security state when card returns error 2021-06-15 14:06:42 +03:00
merlokk 9cfa638e4d encrypted resp works 2021-06-15 14:06:42 +03:00
merlokk 6875ad1b81 mic calculation ok 2021-06-15 14:06:42 +03:00
merlokk eaf623af94 MAC works 2021-06-15 14:06:41 +03:00
merlokk 5caca153a5 TX mac ok 2021-06-15 14:06:41 +03:00
merlokk e8c6964bdf fix small bug 2021-06-15 14:06:41 +03:00
merlokk 98060cf748 some additional info 2021-06-15 14:06:41 +03:00
merlokk 09f33a45c7 get additional info 2021-06-15 14:06:41 +03:00
merlokk 84ada9cc14 read file works 2021-06-15 14:06:40 +03:00
merlokk 99c4a3a9c0 fix warning 2021-06-15 14:06:40 +03:00
merlokk 9857094274 security level logic 2021-06-15 14:06:40 +03:00
merlokk 54e7713a9a auth refactoring 2021-06-15 14:06:40 +03:00
merlokk b4ecbdb5f6 text fix 2021-06-15 14:06:40 +03:00
merlokk 283f065bc8 add mac/encrypt primitives 2021-06-15 14:06:40 +03:00
merlokk 413c5ec340 add mac sketch 2021-06-15 14:06:40 +03:00
merlokk da2a1f3c62 add MAC sketch 2021-06-15 14:06:40 +03:00
merlokk 1ba9606011 authentication works 2021-06-15 14:05:34 +03:00
merlokk 1a937b33c4 auth code done. needs tests 2021-06-15 14:05:34 +03:00
merlokk 37daaa2120 GenerateK0AndCp sketch 2021-06-15 14:05:34 +03:00
merlokk fa85078822 high level of auth and some renamings 2021-06-15 14:05:34 +03:00
merlokk f17cbfe412 add some consts and kvv 2021-06-15 14:05:34 +03:00
merlokk 05c8f313dd add auth command and some command's sketches 2021-06-15 14:05:34 +03:00
merlokk 90f930659c add crypto sketch 2021-06-15 14:05:34 +03:00
merlokk ce2b22a6a7 cipurse crypto sketch 2021-06-15 14:05:33 +03:00
merlokk b309fe519b GetChallenge works 2021-06-15 14:05:33 +03:00
merlokk ae6580f65b check cipurse via hf search 2021-06-15 14:02:50 +03:00
merlokk f267df2fb7 cipurse info sketch 2021-06-15 14:02:50 +03:00
Oleg Moiseenko a30d926dab
Merge pull request #1300 from merlokk/fido_fix
Fido commands fix
2021-06-15 13:51:58 +03:00
merlokk 77ee260970 typo 2021-06-15 13:46:02 +03:00
iceman1001 7bfc3d8f58 fix spiffs comms 2021-06-15 11:38:59 +02:00
Philippe Teuwen 2b0e5c0637
Merge pull request #1312 from ah01/add_ntag210u
Add support for NTAG 210μ
2021-06-15 10:19:52 +02:00
ah01 451d4cf08d Add support for NTAG210u 2021-06-13 16:48:41 +02:00
Matthew Saunier 3160d99b7f
Removed comments 2021-06-08 12:22:45 -06:00
Matthew Saunier 0b487c1fa7
Added 4041X permutation table in comments 2021-06-07 14:37:05 -06:00
Matthew Saunier 48961429dc
Update cmdlfindala.h 2021-06-07 14:24:42 -06:00
Matthew Saunier 42f1124476
Restored original function and added 4041X as an optional format 2021-06-07 14:24:17 -06:00
Philippe Teuwen 149236d8b3 make style 2021-06-04 21:58:38 +02:00
Philippe Teuwen 1f27be076b make miscchecks 2021-06-04 21:58:38 +02:00
Philippe Teuwen af6ff40748 simplify Iso7816Connect 2021-06-04 21:58:38 +02:00
Philippe Teuwen c5ba1d7a2d Missing SetISODEPState 2021-06-04 21:58:38 +02:00
Philippe Teuwen 61d5a87c4f Use Iso7816ExchangeEx in eMRTD 2021-06-04 21:58:38 +02:00
Philippe Teuwen 56daa155b5 Iso7816Exchange: avoid sending systematically typeA APDUs firstly on typeB tags 2021-06-04 21:58:38 +02:00
Philippe Teuwen 11334f9440 Isolate ISO7816 select & exchange from EMVcore 2021-06-04 21:58:38 +02:00
Gator96100 ed69517252 Windows: fixed buffer resize causes no colors 2021-06-04 21:58:38 +02:00
Matthew Saunier 53d6de6236
Update cmdlfindala.h 2021-06-04 11:24:02 -06:00
Matthew Saunier d768869569
Rewrote getIndalaBits()
getIndalaBits() was not producing valid card data, examined a batch of genuine HID 4041X format cards and fixed up the transform from H10301 to 4041X. Now a read / clone using the same FC and SN will produce an identical card.
2021-06-04 10:27:10 -06:00
merlokk aa407eb594 rename default fido config file 2021-06-03 18:52:14 +03:00
Philippe Teuwen 899f269a99 Fix wtf bug in t55xxAquireAndCompareBlock0 2021-06-01 22:52:55 +02:00
Philippe Teuwen c45331e1e2 fix text 2021-05-31 14:33:05 +02:00
Philippe Teuwen caf9809c0c mutualize print_type4_cc_info 2021-05-30 15:09:48 +02:00
Philippe Teuwen 4b00db8e48 st -> st25ta 2021-05-30 14:55:58 +02:00
Philippe Teuwen 4c44138557 make style 2021-05-30 14:29:05 +02:00
Philippe Teuwen 323c391f4d nfc commands 2021-05-30 14:23:13 +02:00
merlokk b3a8d704c9 add some help for yubikey 2021-05-28 17:30:36 +03:00
merlokk 8cf58f2e57 fix config files 2021-05-28 15:38:59 +03:00
merlokk 49eccfdbfb fix help 2021-05-28 15:24:05 +03:00
merlokk 6ab2d98644 fido U2F auth command works 2021-05-28 15:19:49 +03:00
merlokk 08809f0c0d fix working with config files 2021-05-28 14:33:49 +03:00
merlokk c83c62855b add saveFileJSONrootEx with overwrite function 2021-05-28 14:33:22 +03:00
Philippe Teuwen 3fe6c417be text 2021-05-26 17:44:39 +02:00
Philippe Teuwen d0e0fa1a80 Fix issue 1288 2021-05-26 17:39:03 +02:00
Philippe Teuwen 2d23d1d226 ESOFT->EMALLOC 2021-05-26 17:39:03 +02:00
Philippe Teuwen 54153153b8 Fix issue #1287 2021-05-25 20:00:04 +02:00
Philippe Teuwen 95dfe54917 hf 14a ndef sanity check 2021-05-25 02:03:46 +02:00
Philippe Teuwen 42dd1e619b ndef type 4 tags: honor max rapdu and support large ndef content 2021-05-25 01:26:30 +02:00
Philippe Teuwen 643d93102e add support for older ndef type 4 tags v1.0 2021-05-24 22:57:39 +02:00
iceman1001 59b86af1a8 fix #1286 - wrong pwd/key length checks 2021-05-24 21:54:09 +02:00
iceman1001 d9f1b97752 comment out header 2021-05-24 14:02:37 +02:00
tcprst 3b4d63686a
add 14a ndef command for type 4 tags 2021-05-23 18:16:27 -04:00
Philippe Teuwen 07a8369058 Support clang 12 2021-05-22 21:28:33 +02:00
iceman1001 86118525e5 style 2021-05-22 14:22:41 +02:00
iceman1001 9a9d86de95 text 2021-05-22 14:20:38 +02:00
iceman1001 326d2cf5d3 resplen is a pointer and we want its value 2021-05-22 07:36:14 +02:00
Gator96100 b2d158699e check for Windows color support each time 2021-05-21 22:52:23 +02:00
iceman1001 6a6dcd4f56 fix cppchecker 2021-05-21 21:07:38 +02:00
iceman1001 51fb73f4c8 cppchecker fixes 2021-05-21 11:49:00 +02:00
iceman1001 f63bc96980 seems cppchecker cant make up its mind 2021-05-20 11:34:56 +02:00
iceman1001 0d017908b4 style 2021-05-20 10:31:21 +02:00
iceman1001 b974a07736 text 2021-05-20 10:31:00 +02:00
iceman1001 b9bf84dbf1 desfire readdata fct, now deals with both INS cases 2021-05-20 10:15:16 +02:00
iceman1001 6447653c64 hf seos - added the skeleton for future use 2021-05-20 10:07:04 +02:00
iceman1001 d46f80e7ea new desfire ats, based on #PR138 in nfc-tools/libfreefare repository 2021-05-20 06:44:48 +02:00
iceman1001 a0efc7aa02 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-05-19 18:07:29 +02:00
iceman1001 8bf5a99bca codestyle prefer calloc 2021-05-19 18:07:19 +02:00
Iceman a469fdd24b
Merge pull request #1279 from mwalker33/desfire
Update cmdhfmfdes.c
2021-05-19 12:58:07 +02:00
mwalker33 0c71b6cc32 Update cmdhfmfdes.c
use defines for command 0xc4
2021-05-19 20:57:06 +10:00
mwalker33 c731c945d6 Update cmdhfmfdes.c
Desfire
- Change Key where key to change = key used to authenticate
- Patch to stop an AES key change incorrectly reporting an issue
2021-05-19 20:47:11 +10:00
iceman1001 27dcbb49ec hf 14a raw - now has a verbose parameter and less output normally 2021-05-19 12:18:04 +02:00
iceman1001 03a7109efd fix coverity CID 321717 2021-05-19 10:20:30 +02:00
iceman1001 3d8b165033 fix coverity CID 344398 2021-05-19 09:06:35 +02:00
Philippe Teuwen 2b4d110836 accept multiple commands on prompt 2021-05-19 01:48:43 +02:00
Philippe Teuwen 836e0fa206 accept multiple commands on stdin 2021-05-19 01:19:26 +02:00
Philippe Teuwen a592b349cb make style 2021-05-18 23:56:11 +02:00
Philippe Teuwen 76adb58feb Merge branch 'mbedtls_2.26.0'
* mbedtls_2.26.0:
  mbedtls: disable timing, unused and needs tuning on ProxSpace
  mbedtls: remove inline on mpi fcts to avoid warning:
  mbedtls: stack warning fix, cf 17bce5fb5a
  mbedtls: memset, cf 996ed197fb
  mbedtls: add secp128r1, cf 996ed197fb
  mbedtls: port previous config
  mbedtls: make style
  mbedtls 2.26.0
2021-05-18 23:52:55 +02:00
Iceman 592b7af837
Merge pull request #1277 from mwalker33/desfire
Update cmdhfmfdes.c
2021-05-18 12:19:45 +02:00
mwalker33 e0269bde74 Update cmdhfmfdes.c
Desfire readdata patch
2021-05-18 19:49:03 +10:00
iceman1001 03a8704e17 text 2021-05-18 09:13:00 +02:00
iceman1001 01154712a9 hf mfu info - search for NeXT implant known pwd 2021-05-17 20:36:03 +02:00
iceman1001 70694ff281 style 2021-05-17 20:35:11 +02:00
Iceman 269983db27
Merge pull request #1276 from mwalker33/desfire
Desfire
2021-05-17 12:10:51 +02:00
mwalker33 cfdef9e92e Update cmdhfmfdes.c
Desfire write MAC'ed and Encrypted update
2021-05-17 19:16:27 +10:00
iceman1001 09dc29dd9d fix cppchecker, lesser scope 2021-05-16 23:03:40 +02:00
iceman1001 16783000f0 rework some defines 2021-05-16 23:03:13 +02:00
mwalker33 af59e27643 Update cmdhfmfdes.c
WriteData - Fixed MACed calculation.
- Tested on Plain (free and Authenticated access)
- Authenticated Plain+MAC

Bugfix for write loop for correct data offset etc.
2021-05-16 16:52:53 +10:00
iceman1001 8fa51075fb fix cppchecker unsigned warning 2021-05-15 15:33:11 +02:00
iceman1001 5fdd9ac392 fix cppchecker warnings 2021-05-15 15:23:32 +02:00
mwalker33 929ddf0830 Update cmdhflist.c
Display the correct Key No in Annotation
2021-05-15 18:34:30 +10:00
iceman1001 925e672e54 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-05-15 09:24:48 +02:00
mwalker33 2e347393e1 option rename
renamed option to --gap
extended option to em410x reader brute
updated change log
2021-05-15 15:59:43 +10:00
mwalker33 a99eb7bf5b Update cmdlfem410x.c
Draft EM4100 sim fix
2021-05-15 15:31:36 +10:00
iceman1001 e45924b450 moar format, WIP, need more samples 2021-05-14 22:45:57 +02:00
iceman1001 3a920f4e0c unsigned shift 2021-05-14 22:43:08 +02:00
Philippe Teuwen eee13d9eb0 mbedtls: disable timing, unused and needs tuning on ProxSpace 2021-05-14 14:07:59 +02:00
iceman1001 37e0ed59f2 fix coverity CID 322673, 322660 2021-05-14 09:02:05 +02:00
iceman1001 752a41e423 coverity CID 286923 2021-05-14 08:10:54 +02:00
iceman1001 28032cd3be coverity CID 322662 2021-05-14 08:08:56 +02:00
iceman1001 3a54bc35fb coverity CID 322665 2021-05-14 08:06:01 +02:00
iceman1001 67bdc1f775 coverity CID 322669 2021-05-14 08:03:22 +02:00
iceman1001 70be8d774d coverity CID 322672 2021-05-14 07:44:25 +02:00
Philippe Teuwen 13a9afa36d Uniformize source code ref and fix gcc 11.1 warning
Using "extern char linker_symbol[]" notation
cf https://sourceware.org/binutils/docs/ld/Source-Code-Reference.html
2021-05-13 23:12:15 +02:00
iceman1001 5cc79c7dfd fix cppchecker 2021-05-13 22:40:13 +02:00
iceman1001 03e535ac67 fix cppchecker 2021-05-13 22:38:01 +02:00
iceman1001 6db2a84499 fix cppchecker - 2021-05-13 21:21:33 +02:00
iceman1001 ec46f55821 fix cppchecker, bad boolean compare and unused value 2021-05-13 21:19:16 +02:00
iceman1001 ed87304ca6 fix gcc11.1 warnings, it was a bug. Where the special block was added to 0xFF instead of direct after reserved blocks. 2021-05-13 21:14:56 +02:00
iceman1001 4e48b10ab9 cppchecker fixes 2021-05-13 20:21:06 +02:00
iceman1001 56499a8821 fix compiler warning 2021-05-13 19:54:31 +02:00
iceman1001 841c91a662 should be 8bytes 2021-05-13 19:52:59 +02:00
iceman1001 f6d75ccb5b text 2021-05-13 18:03:27 +02:00
iceman1001 5c64cc6adb fix coverity CID 322519 2021-05-13 17:00:37 +02:00
iceman1001 1ff1fa7385 style 2021-05-11 15:43:12 +02:00
iceman1001 f83fa37b86 fix so authenticated session works with reading a file 2021-05-11 15:37:05 +02:00
iceman1001 4853704920 text 2021-05-11 15:36:27 +02:00
merlokk 4ec8278c89 fix auth command
fast fix reg command
2021-05-10 16:13:56 +03:00
merlokk bd6d0869d8 textual 2021-05-10 16:03:28 +03:00
merlokk 577e4e3b30 fix fido u2f auth command 2021-05-10 15:59:20 +03:00
merlokk 28da6f60f6 fix chaining 2021-05-10 15:26:39 +03:00
merlokk 0944ec1fee fix plain parameter (now dirty) 2021-05-10 15:02:23 +03:00
iceman1001 9498a07262 fix coverity CID 322227 2021-05-10 11:43:20 +02:00
iceman1001 089ec732a7 fix buffer overflow 2021-05-10 10:08:38 +02:00
iceman1001 615ca521c0 fix newline for hf search 2021-05-09 20:39:43 +02:00
tharexde b708ca143d added newline in help text 2021-05-08 22:28:11 +02:00
iceman1001 358bdb7022 dynamic loading and freeing 2021-05-08 19:49:14 +02:00
iceman1001 cbf045dddb refactor fido2 commands to use load and save fcts from fileutils.c. They will now load from /client/resources and save a new file in working dir 2021-05-08 14:59:40 +02:00
iceman1001 52494a6456 added a load json root fct 2021-05-08 10:47:59 +02:00
iceman1001 d4fe2d775c renamed 2021-05-08 10:47:22 +02:00
iceman1001 8ca410b19f text 2021-05-07 21:21:42 +02:00
Philippe Teuwen 2af0537bc0 bibtex 2021-05-07 21:01:23 +02:00
iceman1001 da3dbd9f82 fix too small arr 2021-05-07 20:40:39 +02:00
iceman1001 578fc70499 text 2021-05-07 19:58:47 +02:00
iceman1001 bb722fa1f8 lf nexwatch - unknown credential identified with a new magic value 2021-05-07 19:57:51 +02:00
iceman1001 3f6c914b99 cppchecker, text 2021-05-07 12:04:50 +02:00
iceman1001 3418d747d9 fix cppchecker 2021-05-07 11:58:39 +02:00
iceman1001 49b19376fa fix cppchecker knownconditiontrueorfalse 2021-05-07 10:19:00 +02:00
iceman1001 656231acba fix cppchecker knownconditiontrueorfalse 2021-05-07 10:16:29 +02:00
iceman1001 e2e6541932 fix cppchecker scope 2021-05-07 10:12:38 +02:00
iceman1001 46782ed308 fix cppchecker redundantcondition 2021-05-07 10:10:19 +02:00
iceman1001 deb08c0e66 fix cppchecker redundantcondition 2021-05-07 10:09:13 +02:00
iceman1001 9d23550424 fix wrong return type 2021-05-07 10:07:01 +02:00
iceman1001 3a5c74d84c remove compiler warnings 2021-05-07 09:14:49 +02:00
iceman1001 9127306c15 style 2021-05-07 08:10:19 +02:00
Iceman cb8cc92337
Merge pull request #1264 from tharexde/4x50_client_bugfix
em4x50: fixed bug in eload and restore
2021-05-07 08:08:29 +02:00
tharexde d0175c1fda fixed comparison 0 == 0 2021-05-06 22:54:16 +02:00
iceman1001 5ef0061e31 style 2021-05-06 22:08:18 +02:00
iceman1001 06a3f4c1bb hf lto info - now decodes a bit more information 2021-05-06 19:12:36 +02:00
iceman1001 9588ff7804 OLD -> MIX 2021-05-06 19:12:12 +02:00
iceman1001 c279c5e643 old to mix 2021-05-05 21:37:32 +02:00
iceman1001 e4f55556ba style 2021-05-05 21:04:48 +02:00
iceman1001 0dd73df088 hf mf wipe - now support enforcing sector 0 / block 0 writes 2021-05-05 19:33:15 +02:00
iceman1001 ea416c3694 fixing textual output of ASN1 printing 2021-05-05 12:07:36 +02:00
iceman1001 e6e58227cb text 2021-05-05 12:06:20 +02:00
iceman1001 967550d828 fix compiler warnings 2021-05-05 12:05:56 +02:00
iceman1001 6630f3724b asn1 decoder got some colors 2021-05-04 16:45:50 +02:00
iceman1001 997cd7577f added 'data asn1' - decodes asn1 byte arrays 2021-05-04 15:59:21 +02:00
iceman1001 8b100bf173 ..break it... 2021-05-04 09:46:58 +02:00
iceman1001 6d71b9327e ISO15693 SLIX modifications found in @g3gg0 's offical pm3 fork, looks like WIP, with more focus on a standalone mode. I took the base fcts 2021-05-04 09:40:30 +02:00
iceman1001 9533671616 hf iclass chk, lookup - solving some concurrensy issues 2021-05-03 20:33:51 +02:00
iceman1001 cd9090b6c8 hf iclass chk - now uses NG 2021-05-03 20:01:12 +02:00
iceman1001 305903c513 rework ISO15693 defines, removing duplicates 2021-05-03 09:35:38 +02:00
iceman1001 80817cea00 hf iclass chk - rework OLD -> NG. And textual 2021-05-03 09:31:51 +02:00
iceman1001 f50691e3de hf iclass eload - now uses NG 2021-05-02 18:41:43 +02:00
iceman1001 788876538d convert from OLD to NG 2021-05-01 19:01:15 +02:00
iceman1001 1cc9d9e988 add parity check to N10002 2021-04-30 11:21:40 +02:00
iceman1001 2aec706328 fix: memory leak when reconnecting to device, reuse old struct 2021-04-30 11:19:27 +02:00
iceman1001 0d1f8ca957 making a 14a select fct reachable, in order to do a test in desfire code without repeating same ftc 2021-04-30 11:18:14 +02:00
iceman1001 8243ac9749 fix a sanity memory leak with reserving memory used only for json file loading.. 2021-04-30 11:16:57 +02:00
iceman1001 550fa5aa8f 14a exchange apdu now uses defined return codes 2021-04-30 08:51:38 +02:00
iceman1001 3c072721bf trace list -t mfdes - updated EV2, EV3 annotations 2021-04-30 08:14:11 +02:00
iceman1001 79bf10dc30 text 2021-04-27 19:35:52 +02:00
iceman1001 82e71d7815 lf hid clone - only print the selected format 2021-04-27 19:16:06 +02:00
iceman1001 7b2adb1305 lf search - textual 2021-04-27 15:20:04 +02:00
iceman1001 10c9ea5f84 more wiegand formats, and if binary is user supplied use that length, and ignore parity faults is removed since we wanna see all decodings anyway 2021-04-27 15:19:34 +02:00
iceman1001 bbdb2d7c95 hf iclass lookup - fix wrong arg order 2021-04-27 15:16:27 +02:00
iceman1001 63b9adbffb hf iclass decrypt - add the possibility to decode as block6 after a decryted block 2021-04-27 15:15:59 +02:00
iceman1001 792b59997e change hf legic dump, restore, to abort if xoring of data failed 2021-04-26 14:29:28 +02:00
Iceman 5cf6798b70
Merge pull request #1258 from aveao/emrtd
emrtd: Fix file reading and parsing
2021-04-26 11:41:57 +02:00
iceman1001 c3f1edf73a added indala26,27,27asc, 29 bit formats 2021-04-26 11:37:58 +02:00
Ave but on a massive iMac a20f3afad2 emrtd: Fix problem with certain reads being incorrect 2021-04-26 12:02:50 +03:00
Ave but on a massive iMac 20ca241816 emrtd: Fix bug with certain file reads 2021-04-26 11:04:33 +03:00
iceman1001 c1339a4473 added some 38bit formats 2021-04-26 08:54:43 +02:00
iceman1001 62d84dd734 text 2021-04-25 11:57:28 +02:00
iceman1001 08f567a227 added 'lf idteck sim' 2021-04-25 11:57:03 +02:00
iceman1001 cfc8332321 text 2021-04-25 10:55:39 +02:00
iceman1001 94fc054277 changed 'emv *' - to try 14b if 14a fails. <experimental> 2021-04-24 14:53:40 +02:00
iceman1001 96ae77caf8 changed - now is able to interrupt search with <enter> 2021-04-24 14:52:33 +02:00
iceman1001 71c64337e1 hf 14a raw - maintain the 512 byte usb package limit 2021-04-24 14:46:51 +02:00
iceman1001 d7c5f0cac2 text 2021-04-24 14:39:27 +02:00
Iceman d680f1b290
Merge pull request #1254 from mwalker33/Desfire-Change-Key
Update cmdhfmfdes.c
2021-04-24 07:04:18 +02:00
mwalker33 ae42c9445a Update cmdhfmfdes.c
Desfire changekey AES
Seems to work, but response validation fails.
2021-04-24 13:43:00 +10:00
iceman1001 2119c4e7bd hf 14b got some love 2021-04-23 22:25:58 +02:00
Iceman 96e9d0f5cd
Merge pull request #1253 from mwalker33/Desfire-Change-Key
Desfire change key
2021-04-23 07:06:22 +02:00
mwalker33 6780b852d4 Update cmdhfmfdes.c
Desfire DES/3DES change key works
2021-04-23 07:44:32 +10:00
iceman1001 cc3fcb0ec6 might fix coverity CID 305865 2021-04-21 19:20:12 +02:00
iceman1001 b267ee8ef5 convert 14b raw to use NG 2021-04-21 18:36:21 +02:00
Philippe Teuwen e1b922631d Display only exec basename in proxmark3 client help 2021-04-20 18:46:58 +02:00
Philippe Teuwen 95031e0b17 remove color in proxmark3 -h 2021-04-20 12:21:54 +02:00