Commit graph

2652 commits

Author SHA1 Message Date
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