RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-22 16:26:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
13822 commits 3 branches 14 tags 86 MiB
Commit graph

8688 commits

Author SHA1 Message Date
merlokk 10362d68cf make style 2021-07-20 21:20:55 +03:00
merlokk a074b1f812 remove todo 2021-07-20 21:11:32 +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
Oleg Moiseenko a395873094
Merge pull request #1375 from merlokk/desf_changekey 
Desfire changekey
 2021-07-19 20:04:28 +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 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 8073930129 maur pwd 2021-07-14 10:37:22 +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
Philippe Teuwen d7da384f69 CMake and cross-compilation: restrict CFLAGS=--target to Android (probably to clang) 2021-07-14 01:35:18 +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
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
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
Oleg Moiseenko 8a598ce33c
Merge pull request #1346 from merlokk/desf_update 
Desfire functionality update
 2021-07-05 14:50:19 +03:00
iceman1001 cfb6e98a8e forgot to push some android adaptions 2021-07-05 13:45:45 +02: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
Oleg Moiseenko dfc151d2ac
Merge branch 'master' into crypto_changes 2021-07-05 12:26:43 +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 afbd80b906 cliparser CLIGetOptionList 2021-07-05 11:59:07 +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