Commit graph

506 commits

Author SHA1 Message Date
merlokk a86f332263 cmac 2tdea works 2021-08-08 18:33:35 +03:00
merlokk e4a72b11e8 cmac add minimum len 2021-08-08 17:54:16 +03:00
merlokk 94bb6d389b add source 2021-08-07 22:07:24 +03:00
merlokk 2fb3385d90 test subkeys - 2tdea, 3tdea 2021-08-07 22:03:48 +03:00
merlokk 4a2a23c6e2 kdf an10922 test 2021-08-07 20:26:49 +03:00
merlokk 7aad008762 fix key path for cmac subkeys 2021-08-07 16:27:39 +03:00
merlokk 02194f3e43 aes cmac subkeys test 2021-08-07 16:16:41 +03:00
merlokk 7ea7e4b364 fix 2021-08-07 14:53:23 +03:00
merlokk ce39985d19 remove debug 2021-08-07 13:57:50 +03:00
merlokk 88756eef79 auth concet 2021-08-07 13:54:43 +03:00
merlokk efd3a887ae remove some old cryto code 2021-08-07 13:42:47 +03:00
merlokk e21010905c add crytolib 2021-08-07 12:54:59 +03:00
merlokk ee7438bfc1 move functions, get rid of some deendences 2021-08-07 12:20:05 +03:00
merlokk 9b999b7d2c remove old session key gen 2021-08-07 11:53:34 +03:00
merlokk 84f470a596 remove subkey gen 2021-08-07 11:45:09 +03:00
merlokk e822cf5b1e make style 2021-08-06 23:45:53 +03:00
Oleg Moiseenko 86d8c5ff42
Merge pull request #1428 from craftbyte/master
Fix DESfire DF search and assignment to AID
2021-08-06 23:34:33 +03:00
merlokk 6c3cac9c63 fix buffer length 2021-08-06 20:31:12 +03:00
merlokk d92c8f1bff iso mac calculation 2021-08-06 20:27:04 +03:00
merlokk d7aa4feae8 iso select rework 2021-08-06 19:46:49 +03:00
merlokk c27100295a fix iso command data 2021-08-06 14:52:33 +03:00
merlokk 18e2d55c57 remove debug & cov 354623 ) 2021-08-05 20:26:27 +03:00
merlokk f1c48db6bd added iso commands and read sketch 2021-08-05 20:03:07 +03:00
Anze Jensterle c71f93687d
Fix DESfire DF search and assignment to AID 2021-08-05 18:45:50 +02:00
merlokk 3945e1e7f4 added iso channel checks 2021-08-05 19:06:53 +03:00
merlokk 6e5240056e changekey ev2 works 2021-08-05 12:32:08 +03:00
merlokk 09bb3f62a1 make style 2021-08-05 00:01:53 +03:00
merlokk 91b1026f6d remove comments 2021-08-04 23:51:09 +03:00
merlokk 2432908e08 ev2 enc with padding - ok 2021-08-04 23:39:25 +03:00
merlokk 7046675403 d40 fix 2021-08-04 23:13:57 +03:00
merlokk c125c10e31 d40 + padding 2021-08-04 22:36:38 +03:00
merlokk e78c563e45 encode with padding sketch 2021-08-04 20:01:11 +03:00
merlokk 7b79bd375f move plain mode to mac mode 2021-08-04 19:12:44 +03:00
merlokk df0d5617ac ev2 plain comes wo mac 2021-08-04 18:49:36 +03:00
merlokk 9478305436 d40 mac calc 2021-08-04 18:46:05 +03:00
merlokk 450ec87296 add ev1 mac with and wo data 2021-08-04 18:07:04 +03:00
merlokk be9093db63 fix match iso id and iso file id 2021-08-04 18:06:23 +03:00
merlokk a6e39a5ff1 ev2/encoded works with/wo data on the all directions 2021-08-04 17:15:32 +03:00
merlokk c3a5a45d37 add rx mac print if OK 2021-08-04 16:42:39 +03:00
merlokk bf59d29919 ch ev2/encode tx no data, rx with data works (getuid) 2021-08-04 16:38:10 +03:00
merlokk 3baf595578 make style 2021-08-04 15:48:20 +03:00
Oleg Moiseenko 45073eb969
Merge pull request #1415 from merlokk/ev2mac
Ev2 mac calc and channel sketch
2021-08-04 15:30:18 +03:00
merlokk 51b197c3a6 ev2 encrypted channel tx works 2021-08-04 15:26:40 +03:00
merlokk fc8e3e8851 fix ev2 auth. ev2/enc/nodata works 2021-08-04 14:58:07 +03:00
Oleg Moiseenko b34681b484
Merge pull request #1410 from merlokk/desf_ls
Desfire lsfiles and lsapp
2021-08-04 12:05:55 +03:00
merlokk 645985a1f9 check mode in ev2 like ev1 2021-08-03 19:08:30 +03:00
merlokk fd5afbdfac encode fix 2021-08-03 18:58:39 +03:00
merlokk 8d84e96716 ev2 rx channel sketch 2021-08-03 18:49:52 +03:00
merlokk 58e8693b49 ev2 tx channel sketch 2021-08-03 18:33:06 +03:00
merlokk 22c2b46010 add tests 2021-08-03 18:03:17 +03:00
merlokk fa30947698 mac calc 2021-08-03 17:55:28 +03:00
merlokk e7414e127d test 2021-08-03 17:41:55 +03:00
merlokk 4e7603d2d7 lsapp field on/off fix 2021-08-03 12:23:44 +03:00
merlokk 857d67d733 some fixes in info command 2021-08-03 00:19:11 +03:00
merlokk 6ae54d5893 add n/a value for freemem 2021-08-02 23:39:23 +03:00
merlokk f70558c008 readsig command 2021-08-02 23:05:25 +03:00
merlokk ddd0e3c868 add checked auth commands flag, remove old code 2021-08-02 18:50:29 +03:00
merlokk 4f4a14c124 lsapp get/print file list 2021-08-02 18:29:15 +03:00
merlokk 0951b31175 print refactoring 2021-08-02 18:13:45 +03:00
merlokk ed310ed432 DesfireFillAppList refactoring 2021-08-02 17:49:04 +03:00
merlokk d27c340ab0 add get key versions to lsapp 2021-08-02 17:03:50 +03:00
merlokk fd138bdd04 move aiddesfire to mifare folder and refactoring 2021-08-02 16:41:49 +03:00
merlokk 5b03b9870b add AID functions and select app wo field on 2021-08-02 16:17:16 +03:00
merlokk a2eca79ed9 lsapp: get key settins for all app 2021-08-02 13:38:16 +03:00
merlokk 508e89a7a9 iso check correctly select MF 2021-08-01 22:56:03 +03:00
merlokk 8402ba3d95 add iso native check 2021-08-01 19:27:50 +03:00
merlokk 7d6ff9f773 DesfireCheckAuthCommands 2021-08-01 18:28:55 +03:00
merlokk a36ec29383 lsapp base works 2021-07-31 21:47:42 +03:00
merlokk b12abd8f73 clear block data before copy 2021-07-31 20:38:27 +03:00
merlokk 5eefe7d14c fix split block length bug 2021-07-31 20:33:54 +03:00
merlokk c2fd7790f0 lsfiles table format 2021-07-31 19:50:35 +03:00
merlokk ab249d0d76 make style 2021-07-31 16:46:16 +03:00
merlokk 84d89b2480 iso auth works for app and picc level 2021-07-31 12:36:49 +03:00
merlokk 91f000ad33 iso channel auth with des/2dea/3tdea/aes works 2021-07-31 11:58:33 +03:00
merlokk e4eff3c40f fix 2021-07-31 10:55:21 +03:00
merlokk de566068b7 clear session after select 2021-07-31 10:54:03 +03:00
merlokk 72585aae8a iso select refactoring 2021-07-31 10:47:19 +03:00
merlokk c4a20a3df7 iso authenticate works for aes and application level 2021-07-31 00:06:21 +03:00
merlokk dd74ec9523 ev1 gen session keys 2021-07-31 00:05:39 +03:00
merlokk d80656ef53 select command refactoring 2021-07-30 20:23:52 +03:00
merlokk cefad27487 app select works 2021-07-30 20:10:21 +03:00
merlokk 8319953ad7 commands sketches and iso select command 2021-07-30 19:41:25 +03:00
merlokk e2f0d62458 ev2 auth 1st and 2nd works 2021-07-30 16:38:00 +03:00
merlokk 4cc9de1183 tests for ev2 compute iv 2021-07-30 15:26:32 +03:00
merlokk f074386413 ev2 iv calc 2021-07-30 14:45:26 +03:00
merlokk a5ba41f5cf code for non-first auth 2021-07-30 14:08:06 +03:00
merlokk 48be261c1b add more verbosity to auth command 2021-07-30 13:32:39 +03:00
merlokk a66dbf90fe ev2 session keys generation 2021-07-30 13:14:54 +03:00
merlokk cddf89ca4c verbosity 2021-07-30 00:35:14 +03:00
merlokk 319607f014 auth works 2021-07-30 00:14:30 +03:00
merlokk cc699d288d ev2 auth sketch 2021-07-30 00:04:10 +03:00
merlokk 6990f9dd90 add select wo field on 2021-07-29 20:24:47 +03:00
merlokk 74650f94c1 coverity 2021-07-29 18:44:46 +03:00
merlokk 2441b24124 make style 2021-07-29 18:19:59 +03:00
merlokk cd760e05e7 detailed print settings 2021-07-29 17:22:51 +03:00
merlokk d80a3fb6e9 refactoring 2021-07-29 16:41:51 +03:00
merlokk 41907800c4 add select app mode 2021-07-29 16:41:30 +03:00
merlokk 985bcc9c4a commands read and lsfiles refactoring 2021-07-29 16:19:16 +03:00
merlokk 74fc92f1db works 2021-07-29 09:01:10 +03:00
merlokk a5f7e4172b formatting 2021-07-29 00:21:16 +03:00
merlokk 907c4a4b39 data ready 2021-07-29 00:00:38 +03:00
merlokk 6066d949af tx chaining iso native 2021-07-28 22:45:06 +03:00
merlokk 6459e5cc39 native tx chaining 2021-07-28 22:31:17 +03:00
merlokk 22e8ab8977 d40/mac works 2021-07-28 20:25:35 +03:00
merlokk d9be538fa1 d40/encode works 2021-07-28 20:15:44 +03:00
merlokk b508ca3e5d d40/mac mode works in mac and plain modes 2021-07-28 15:27:22 +03:00
merlokk b1f819e208 d40/encoded channel works 2021-07-28 14:18:53 +03:00
merlokk 5215f4660c get comm mode 2021-07-28 00:06:46 +03:00
merlokk 2ed139bfc3 communication mode to file mode and vice versa 2021-07-28 00:06:20 +03:00
merlokk 41ed6534a1 add commands that can use any channel 2021-07-28 00:05:51 +03:00
merlokk 1cabef3148 settings decode fix 2021-07-27 21:27:58 +03:00
merlokk 8910fbac6f autodetect file type 2021-07-27 21:24:51 +03:00
merlokk dbe85e731f add record manipulation commands 2021-07-27 19:13:15 +03:00
merlokk 9bcb30256e fix communication modes. header length not counts as data 2021-07-27 18:29:34 +03:00
merlokk 0b6546012a fix crc search with padding 2021-07-27 18:28:41 +03:00
merlokk 4c743d4772 skip mode warnings for read/write data 2021-07-27 17:57:39 +03:00
merlokk 618bdd4bc7 read and write commands 2021-07-27 16:54:03 +03:00
merlokk be128741e3 add cli parser option 2021-07-27 16:08:20 +03:00
merlokk d22817f8cc create file works. fixed consts, mode and samples 2021-07-27 14:51:31 +03:00
merlokk 2f1f9f8c6e fix secure channel 2021-07-27 13:12:01 +03:00
merlokk eeb20a5dea add check if isoid can be in the command 2021-07-27 13:11:41 +03:00
merlokk 03e10a5980 add clear rec to channel 2021-07-26 19:47:23 +03:00
merlokk a5f18cc58b clear record file 2021-07-26 19:45:37 +03:00
merlokk 831dafc456 more verbosity 2021-07-26 19:33:40 +03:00
merlokk 062cf98166 cov 353970 and rename 2021-07-26 19:15:54 +03:00
merlokk c44d7728b4 fix help 2021-07-26 19:12:47 +03:00
merlokk f9e0329125 fix check length 2021-07-26 18:40:09 +03:00
merlokk 73f62ae27e make style 2021-07-26 18:00:15 +03:00
merlokk fa314e46b0 add commands to channel 2021-07-26 17:18:50 +03:00
merlokk 1adfc0a931 get value works 2021-07-26 16:35:45 +03:00
merlokk 997234e18d add create file to channel tables, remove debug 2021-07-26 14:15:11 +03:00
merlokk 64b3dcc2e2 create value file works 2021-07-26 13:59:13 +03:00
merlokk 235c1fc9c3 change view display parameters via le-be functions 2021-07-26 12:54:54 +03:00
merlokk 8db2325b13 move byte operations to commonutils 2021-07-25 20:03:15 +03:00
merlokk f5b7f93d79 remove le definitions 2021-07-25 16:24:41 +03:00
merlokk 2f1033015c cov 353928 2021-07-25 11:53:45 +03:00
merlokk a5a83404ad cov 353932 2021-07-25 11:52:13 +03:00
merlokk 24e620e679 access rights refactoring 2021-07-25 11:50:29 +03:00
merlokk 4444fb4533 refactoring fix 2021-07-24 00:52:54 +03:00
merlokk 195b66bdbf print file settings for create 2021-07-23 20:49:40 +03:00
merlokk 012e90f5c8 create file raw mode works 2021-07-23 17:03:48 +03:00
merlokk bbf7b1a26d file settings refactoring and fix bug in get file ids 2021-07-23 13:16:51 +03:00
merlokk 325e304e41 delete file command 2021-07-22 21:16:42 +03:00
merlokk d1a4c89e07 create/delete file commands 2021-07-22 20:38:01 +03:00
merlokk 00368aa994 added check mode for change file settings 2021-07-21 23:18:43 +03:00
merlokk 76b0179109 remove debug 2021-07-21 21:53:44 +03:00
merlokk 660647ab5a channel changes 2021-07-21 18:43:37 +03:00
merlokk 8f639b1127 ch file settings command and option 2021-07-21 18:10:49 +03:00
merlokk 34a5d15bfc command header via array 2021-07-21 18:10:19 +03:00
merlokk f6e86293f0 print file settings. move from old code. 2021-07-21 15:50:26 +03:00
merlokk 408fc64e55 get file settings command 2021-07-21 09:21:57 +03:00
merlokk edc84ed3f4 add commands get file id and iso id 2021-07-21 08:29:39 +03:00
merlokk 10362d68cf make style 2021-07-20 21:20:55 +03:00
merlokk 2f1611a7cf text + remove debug 2021-07-20 21:10:42 +03:00
merlokk b062ffa6cd set config works 2021-07-20 21:07:31 +03:00
merlokk 61ffdb5269 add set config command and some verbosity 2021-07-20 13:58:05 +03:00
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 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 6a6ec86791 fix 2tdea/d40 authentication 2021-07-16 20:45:32 +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 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
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 5a72b53676 fix DesfireCommandEx 2021-07-13 17:36:27 +03:00
merlokk e00fc93c20 createfile works 2021-07-13 16:51:50 +03:00
merlokk 89450c2fee commands refactoring 2021-07-13 11:56:12 +03:00
merlokk afbe5deda2 commands refactoring 2021-07-13 00:59:07 +03:00
merlokk 8e68dafa3a freemem conditions 2021-07-12 23:53:38 +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 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 7cb089f11b 350861 2021-07-12 11:19:48 +03:00
merlokk a3acb921c7 350563 2021-07-12 11:18:55 +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 5367cb4e23 CmdHF14ADesChKeySettings command 2021-07-10 16:05:40 +03:00
merlokk e54f0e3a33 move crc to new file 2021-07-10 15:10:15 +03:00
merlokk 67d7d29d74 CmdHF14ADesGetKeySettings works 2021-07-10 15:07:51 +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 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