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

8606 commits

Author SHA1 Message Date
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
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
Iceman afb06ec72c
Merge pull request #1347 from linuxgemini/macports-support-experiment 
add experimental support for macs with macports installed
 2021-07-04 12:10:45 +02: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
İlteriş Yağıztegin Eroğlu 24a2a94341 add experimental support for macs with macports installed 
currently requires symlinking python{version}(-embed).pc to
python(embed).pc or python3(-embed).pc
under /opt/local/lib/pkgconfig
 2021-07-03 17:07:53 +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 850e36ab31 cli parser text options 2021-07-03 00:07:21 +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
Philippe Teuwen 732644fb9b hf_mfu_magicwrite -c: add version info 2021-07-01 22:00:57 +02: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
Nemanja Nedeljković adb207268d
Change in hf 15 raw broke support hf_15_magic.lua 
There was a change in `hf 15 raw` and this script was not updated to support that change
 2021-06-29 12:52:35 +02:00
Philippe Teuwen 6f579e5b6c mfkeys 2021-06-29 01:57:04 +02: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 9458289c4e added dorma kaba entry 2021-06-21 16:33:56 +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 1ed21a3ae8 added more keys (@equipter) 2021-06-20 18:26:45 +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 0fdcae6682 maur keys 2021-06-20 10:11:11 +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
Matthias Deeg 6348ad308c
add Lua script for RFID-based TOTP token Protectimus SLIM NFC 2021-06-16 11:10:37 +02:00
Philippe Teuwen 10f65df350 add keys 2021-06-16 02:43:57 +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 80e8e1f8f9 add file to cmake 2021-06-15 14:06:39 +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