Commit graph

13571 commits

Author SHA1 Message Date
Oleg Moiseenko 60d132fcc0
Merge pull request #1359 from merlokk/desfire4
Desfire encoded channel for d40/ev1
2021-07-09 14:35:58 +03:00
Iceman 50264dcbf1
Update 0_Compilation-Instructions.md
`make -j`  is the preferred way.
2021-07-09 13:14:02 +02: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
Oleg Moiseenko e2303a8bdc
Merge pull request #1357 from merlokk/desfire3
Desfire ev1/plain and ev1/mac
2021-07-07 17:41:34 +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
iceman1001 94236fa02c added ht_reblay support python scripts (@salmg) 2021-07-07 13:39:52 +02:00
iceman1001 2c9851d751 added new standalone mode hf_reblay by @salmg 2021-07-07 13:36:23 +02:00
iceman1001 cc146f4bc2 correct gh user 2021-07-07 11:26:54 +02: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 f74e5db6f0
Merge pull request #1356 from merlokk/desf_update2
desfire coverity + crypto refactoring
2021-07-06 12:17:38 +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 994df2fd9a textual 2021-07-06 08:05:10 +02:00
Iceman 266839fd01
Merge pull request #1355 from scott4290/patch-1
Update t55xx_default_pwds.dic
2021-07-06 08:00:54 +02:00
iceman1001 366014706a fix hf_msdsal standalone patch from @nexting 2021-07-06 07:56:42 +02:00
scott4290 c5faa57833
Update t55xx_default_pwds.dic
ID/HID blue copier with a light-blue inlay sticker purchased circa 2014.  I tested with two different T5577 codes and the same password was set.
2021-07-05 17:27:05 -04: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
Oleg Moiseenko c78fa3c67f
Merge pull request #1354 from merlokk/cov_overrun
try to fix coverity
2021-07-05 15:36:26 +03:00
merlokk 84eb4e4597 try to fix coverity 2021-07-05 15:35:53 +03:00
merlokk be9db18852 fix coverity 350572 2021-07-05 15:22:33 +03:00