Commit graph

3163 commits

Author SHA1 Message Date
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
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 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 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 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
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 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
merlokk ce2b22a6a7 cipurse crypto sketch 2021-06-15 14:05:33 +03:00
merlokk b309fe519b GetChallenge works 2021-06-15 14:05:33 +03:00
merlokk ae6580f65b check cipurse via hf search 2021-06-15 14:02:50 +03:00
merlokk f267df2fb7 cipurse info sketch 2021-06-15 14:02:50 +03:00
Oleg Moiseenko a30d926dab
Merge pull request #1300 from merlokk/fido_fix
Fido commands fix
2021-06-15 13:51:58 +03:00
merlokk 77ee260970 typo 2021-06-15 13:46:02 +03:00
iceman1001 7bfc3d8f58 fix spiffs comms 2021-06-15 11:38:59 +02:00
Philippe Teuwen 2b0e5c0637
Merge pull request #1312 from ah01/add_ntag210u
Add support for NTAG 210μ
2021-06-15 10:19:52 +02:00
ah01 451d4cf08d Add support for NTAG210u 2021-06-13 16:48:41 +02:00
Matthew Saunier 3160d99b7f
Removed comments 2021-06-08 12:22:45 -06:00
Matthew Saunier 0b487c1fa7
Added 4041X permutation table in comments 2021-06-07 14:37:05 -06:00
Matthew Saunier 48961429dc
Update cmdlfindala.h 2021-06-07 14:24:42 -06:00
Matthew Saunier 42f1124476
Restored original function and added 4041X as an optional format 2021-06-07 14:24:17 -06:00
Philippe Teuwen 149236d8b3 make style 2021-06-04 21:58:38 +02:00
Philippe Teuwen 1f27be076b make miscchecks 2021-06-04 21:58:38 +02:00
Philippe Teuwen af6ff40748 simplify Iso7816Connect 2021-06-04 21:58:38 +02:00
Philippe Teuwen c5ba1d7a2d Missing SetISODEPState 2021-06-04 21:58:38 +02:00
Philippe Teuwen 61d5a87c4f Use Iso7816ExchangeEx in eMRTD 2021-06-04 21:58:38 +02:00
Philippe Teuwen 56daa155b5 Iso7816Exchange: avoid sending systematically typeA APDUs firstly on typeB tags 2021-06-04 21:58:38 +02:00
Philippe Teuwen 11334f9440 Isolate ISO7816 select & exchange from EMVcore 2021-06-04 21:58:38 +02:00
Gator96100 ed69517252 Windows: fixed buffer resize causes no colors 2021-06-04 21:58:38 +02:00
Matthew Saunier 53d6de6236
Update cmdlfindala.h 2021-06-04 11:24:02 -06:00
Matthew Saunier d768869569
Rewrote getIndalaBits()
getIndalaBits() was not producing valid card data, examined a batch of genuine HID 4041X format cards and fixed up the transform from H10301 to 4041X. Now a read / clone using the same FC and SN will produce an identical card.
2021-06-04 10:27:10 -06:00
merlokk aa407eb594 rename default fido config file 2021-06-03 18:52:14 +03:00
Philippe Teuwen 899f269a99 Fix wtf bug in t55xxAquireAndCompareBlock0 2021-06-01 22:52:55 +02:00
Philippe Teuwen c45331e1e2 fix text 2021-05-31 14:33:05 +02:00
Philippe Teuwen caf9809c0c mutualize print_type4_cc_info 2021-05-30 15:09:48 +02:00
Philippe Teuwen 4b00db8e48 st -> st25ta 2021-05-30 14:55:58 +02:00
Philippe Teuwen 4c44138557 make style 2021-05-30 14:29:05 +02:00
Philippe Teuwen 323c391f4d nfc commands 2021-05-30 14:23:13 +02:00
merlokk b3a8d704c9 add some help for yubikey 2021-05-28 17:30:36 +03:00
merlokk 8cf58f2e57 fix config files 2021-05-28 15:38:59 +03:00
merlokk 49eccfdbfb fix help 2021-05-28 15:24:05 +03:00
merlokk 6ab2d98644 fido U2F auth command works 2021-05-28 15:19:49 +03:00
merlokk 08809f0c0d fix working with config files 2021-05-28 14:33:49 +03:00
merlokk c83c62855b add saveFileJSONrootEx with overwrite function 2021-05-28 14:33:22 +03:00
Philippe Teuwen 3fe6c417be text 2021-05-26 17:44:39 +02:00
Philippe Teuwen d0e0fa1a80 Fix issue 1288 2021-05-26 17:39:03 +02:00
Philippe Teuwen 2d23d1d226 ESOFT->EMALLOC 2021-05-26 17:39:03 +02:00
Philippe Teuwen 54153153b8 Fix issue #1287 2021-05-25 20:00:04 +02:00
Philippe Teuwen 95dfe54917 hf 14a ndef sanity check 2021-05-25 02:03:46 +02:00
Philippe Teuwen 42dd1e619b ndef type 4 tags: honor max rapdu and support large ndef content 2021-05-25 01:26:30 +02:00
Philippe Teuwen 643d93102e add support for older ndef type 4 tags v1.0 2021-05-24 22:57:39 +02:00
iceman1001 59b86af1a8 fix #1286 - wrong pwd/key length checks 2021-05-24 21:54:09 +02:00
iceman1001 d9f1b97752 comment out header 2021-05-24 14:02:37 +02:00
tcprst 3b4d63686a
add 14a ndef command for type 4 tags 2021-05-23 18:16:27 -04:00
Philippe Teuwen 07a8369058 Support clang 12 2021-05-22 21:28:33 +02:00
iceman1001 86118525e5 style 2021-05-22 14:22:41 +02:00
iceman1001 9a9d86de95 text 2021-05-22 14:20:38 +02:00
iceman1001 326d2cf5d3 resplen is a pointer and we want its value 2021-05-22 07:36:14 +02:00
Gator96100 b2d158699e check for Windows color support each time 2021-05-21 22:52:23 +02:00
iceman1001 6a6dcd4f56 fix cppchecker 2021-05-21 21:07:38 +02:00
iceman1001 51fb73f4c8 cppchecker fixes 2021-05-21 11:49:00 +02:00
iceman1001 f63bc96980 seems cppchecker cant make up its mind 2021-05-20 11:34:56 +02:00
iceman1001 0d017908b4 style 2021-05-20 10:31:21 +02:00
iceman1001 b974a07736 text 2021-05-20 10:31:00 +02:00
iceman1001 b9bf84dbf1 desfire readdata fct, now deals with both INS cases 2021-05-20 10:15:16 +02:00
iceman1001 6447653c64 hf seos - added the skeleton for future use 2021-05-20 10:07:04 +02:00
iceman1001 d46f80e7ea new desfire ats, based on #PR138 in nfc-tools/libfreefare repository 2021-05-20 06:44:48 +02:00
iceman1001 a0efc7aa02 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-05-19 18:07:29 +02:00
iceman1001 8bf5a99bca codestyle prefer calloc 2021-05-19 18:07:19 +02:00
Iceman a469fdd24b
Merge pull request #1279 from mwalker33/desfire
Update cmdhfmfdes.c
2021-05-19 12:58:07 +02:00
mwalker33 0c71b6cc32 Update cmdhfmfdes.c
use defines for command 0xc4
2021-05-19 20:57:06 +10:00
mwalker33 c731c945d6 Update cmdhfmfdes.c
Desfire
- Change Key where key to change = key used to authenticate
- Patch to stop an AES key change incorrectly reporting an issue
2021-05-19 20:47:11 +10:00
iceman1001 27dcbb49ec hf 14a raw - now has a verbose parameter and less output normally 2021-05-19 12:18:04 +02:00
iceman1001 03a7109efd fix coverity CID 321717 2021-05-19 10:20:30 +02:00
iceman1001 3d8b165033 fix coverity CID 344398 2021-05-19 09:06:35 +02:00
Philippe Teuwen 2b4d110836 accept multiple commands on prompt 2021-05-19 01:48:43 +02:00
Philippe Teuwen 836e0fa206 accept multiple commands on stdin 2021-05-19 01:19:26 +02:00
Philippe Teuwen a592b349cb make style 2021-05-18 23:56:11 +02:00
Philippe Teuwen 76adb58feb Merge branch 'mbedtls_2.26.0'
* mbedtls_2.26.0:
  mbedtls: disable timing, unused and needs tuning on ProxSpace
  mbedtls: remove inline on mpi fcts to avoid warning:
  mbedtls: stack warning fix, cf 17bce5fb5a
  mbedtls: memset, cf 996ed197fb
  mbedtls: add secp128r1, cf 996ed197fb
  mbedtls: port previous config
  mbedtls: make style
  mbedtls 2.26.0
2021-05-18 23:52:55 +02:00
Iceman 592b7af837
Merge pull request #1277 from mwalker33/desfire
Update cmdhfmfdes.c
2021-05-18 12:19:45 +02:00
mwalker33 e0269bde74 Update cmdhfmfdes.c
Desfire readdata patch
2021-05-18 19:49:03 +10:00
iceman1001 03a8704e17 text 2021-05-18 09:13:00 +02:00
iceman1001 01154712a9 hf mfu info - search for NeXT implant known pwd 2021-05-17 20:36:03 +02:00
iceman1001 70694ff281 style 2021-05-17 20:35:11 +02:00
Iceman 269983db27
Merge pull request #1276 from mwalker33/desfire
Desfire
2021-05-17 12:10:51 +02:00
mwalker33 cfdef9e92e Update cmdhfmfdes.c
Desfire write MAC'ed and Encrypted update
2021-05-17 19:16:27 +10:00
iceman1001 09dc29dd9d fix cppchecker, lesser scope 2021-05-16 23:03:40 +02:00
iceman1001 16783000f0 rework some defines 2021-05-16 23:03:13 +02:00
mwalker33 af59e27643 Update cmdhfmfdes.c
WriteData - Fixed MACed calculation.
- Tested on Plain (free and Authenticated access)
- Authenticated Plain+MAC

Bugfix for write loop for correct data offset etc.
2021-05-16 16:52:53 +10:00
iceman1001 8fa51075fb fix cppchecker unsigned warning 2021-05-15 15:33:11 +02:00
iceman1001 5fdd9ac392 fix cppchecker warnings 2021-05-15 15:23:32 +02:00
mwalker33 929ddf0830 Update cmdhflist.c
Display the correct Key No in Annotation
2021-05-15 18:34:30 +10:00
iceman1001 925e672e54 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-05-15 09:24:48 +02:00
mwalker33 2e347393e1 option rename
renamed option to --gap
extended option to em410x reader brute
updated change log
2021-05-15 15:59:43 +10:00
mwalker33 a99eb7bf5b Update cmdlfem410x.c
Draft EM4100 sim fix
2021-05-15 15:31:36 +10:00
iceman1001 e45924b450 moar format, WIP, need more samples 2021-05-14 22:45:57 +02:00
iceman1001 3a920f4e0c unsigned shift 2021-05-14 22:43:08 +02:00
Philippe Teuwen eee13d9eb0 mbedtls: disable timing, unused and needs tuning on ProxSpace 2021-05-14 14:07:59 +02:00
iceman1001 37e0ed59f2 fix coverity CID 322673, 322660 2021-05-14 09:02:05 +02:00
iceman1001 752a41e423 coverity CID 286923 2021-05-14 08:10:54 +02:00
iceman1001 28032cd3be coverity CID 322662 2021-05-14 08:08:56 +02:00
iceman1001 3a54bc35fb coverity CID 322665 2021-05-14 08:06:01 +02:00
iceman1001 67bdc1f775 coverity CID 322669 2021-05-14 08:03:22 +02:00
iceman1001 70be8d774d coverity CID 322672 2021-05-14 07:44:25 +02:00
Philippe Teuwen 13a9afa36d Uniformize source code ref and fix gcc 11.1 warning
Using "extern char linker_symbol[]" notation
cf https://sourceware.org/binutils/docs/ld/Source-Code-Reference.html
2021-05-13 23:12:15 +02:00
iceman1001 5cc79c7dfd fix cppchecker 2021-05-13 22:40:13 +02:00
iceman1001 03e535ac67 fix cppchecker 2021-05-13 22:38:01 +02:00
iceman1001 6db2a84499 fix cppchecker - 2021-05-13 21:21:33 +02:00
iceman1001 ec46f55821 fix cppchecker, bad boolean compare and unused value 2021-05-13 21:19:16 +02:00
iceman1001 ed87304ca6 fix gcc11.1 warnings, it was a bug. Where the special block was added to 0xFF instead of direct after reserved blocks. 2021-05-13 21:14:56 +02:00
iceman1001 4e48b10ab9 cppchecker fixes 2021-05-13 20:21:06 +02:00
iceman1001 56499a8821 fix compiler warning 2021-05-13 19:54:31 +02:00
iceman1001 841c91a662 should be 8bytes 2021-05-13 19:52:59 +02:00
iceman1001 f6d75ccb5b text 2021-05-13 18:03:27 +02:00
iceman1001 5c64cc6adb fix coverity CID 322519 2021-05-13 17:00:37 +02:00
iceman1001 1ff1fa7385 style 2021-05-11 15:43:12 +02:00
iceman1001 f83fa37b86 fix so authenticated session works with reading a file 2021-05-11 15:37:05 +02:00
iceman1001 4853704920 text 2021-05-11 15:36:27 +02:00
merlokk 4ec8278c89 fix auth command
fast fix reg command
2021-05-10 16:13:56 +03:00
merlokk bd6d0869d8 textual 2021-05-10 16:03:28 +03:00
merlokk 577e4e3b30 fix fido u2f auth command 2021-05-10 15:59:20 +03:00
merlokk 28da6f60f6 fix chaining 2021-05-10 15:26:39 +03:00
merlokk 0944ec1fee fix plain parameter (now dirty) 2021-05-10 15:02:23 +03:00
iceman1001 9498a07262 fix coverity CID 322227 2021-05-10 11:43:20 +02:00
iceman1001 089ec732a7 fix buffer overflow 2021-05-10 10:08:38 +02:00
iceman1001 615ca521c0 fix newline for hf search 2021-05-09 20:39:43 +02:00
tharexde b708ca143d added newline in help text 2021-05-08 22:28:11 +02:00
iceman1001 358bdb7022 dynamic loading and freeing 2021-05-08 19:49:14 +02:00
iceman1001 cbf045dddb refactor fido2 commands to use load and save fcts from fileutils.c. They will now load from /client/resources and save a new file in working dir 2021-05-08 14:59:40 +02:00
iceman1001 52494a6456 added a load json root fct 2021-05-08 10:47:59 +02:00
iceman1001 d4fe2d775c renamed 2021-05-08 10:47:22 +02:00
iceman1001 8ca410b19f text 2021-05-07 21:21:42 +02:00
Philippe Teuwen 2af0537bc0 bibtex 2021-05-07 21:01:23 +02:00
iceman1001 da3dbd9f82 fix too small arr 2021-05-07 20:40:39 +02:00
iceman1001 578fc70499 text 2021-05-07 19:58:47 +02:00
iceman1001 bb722fa1f8 lf nexwatch - unknown credential identified with a new magic value 2021-05-07 19:57:51 +02:00
iceman1001 3f6c914b99 cppchecker, text 2021-05-07 12:04:50 +02:00
iceman1001 3418d747d9 fix cppchecker 2021-05-07 11:58:39 +02:00
iceman1001 49b19376fa fix cppchecker knownconditiontrueorfalse 2021-05-07 10:19:00 +02:00
iceman1001 656231acba fix cppchecker knownconditiontrueorfalse 2021-05-07 10:16:29 +02:00
iceman1001 e2e6541932 fix cppchecker scope 2021-05-07 10:12:38 +02:00
iceman1001 46782ed308 fix cppchecker redundantcondition 2021-05-07 10:10:19 +02:00
iceman1001 deb08c0e66 fix cppchecker redundantcondition 2021-05-07 10:09:13 +02:00
iceman1001 9d23550424 fix wrong return type 2021-05-07 10:07:01 +02:00
iceman1001 3a5c74d84c remove compiler warnings 2021-05-07 09:14:49 +02:00
iceman1001 9127306c15 style 2021-05-07 08:10:19 +02:00
Iceman cb8cc92337
Merge pull request #1264 from tharexde/4x50_client_bugfix
em4x50: fixed bug in eload and restore
2021-05-07 08:08:29 +02:00
tharexde d0175c1fda fixed comparison 0 == 0 2021-05-06 22:54:16 +02:00
iceman1001 5ef0061e31 style 2021-05-06 22:08:18 +02:00
iceman1001 06a3f4c1bb hf lto info - now decodes a bit more information 2021-05-06 19:12:36 +02:00
iceman1001 9588ff7804 OLD -> MIX 2021-05-06 19:12:12 +02:00
iceman1001 c279c5e643 old to mix 2021-05-05 21:37:32 +02:00
iceman1001 e4f55556ba style 2021-05-05 21:04:48 +02:00
iceman1001 0dd73df088 hf mf wipe - now support enforcing sector 0 / block 0 writes 2021-05-05 19:33:15 +02:00
iceman1001 ea416c3694 fixing textual output of ASN1 printing 2021-05-05 12:07:36 +02:00
iceman1001 e6e58227cb text 2021-05-05 12:06:20 +02:00
iceman1001 967550d828 fix compiler warnings 2021-05-05 12:05:56 +02:00
iceman1001 6630f3724b asn1 decoder got some colors 2021-05-04 16:45:50 +02:00
iceman1001 997cd7577f added 'data asn1' - decodes asn1 byte arrays 2021-05-04 15:59:21 +02:00
iceman1001 8b100bf173 ..break it... 2021-05-04 09:46:58 +02:00
iceman1001 6d71b9327e ISO15693 SLIX modifications found in @g3gg0 's offical pm3 fork, looks like WIP, with more focus on a standalone mode. I took the base fcts 2021-05-04 09:40:30 +02:00
iceman1001 9533671616 hf iclass chk, lookup - solving some concurrensy issues 2021-05-03 20:33:51 +02:00
iceman1001 cd9090b6c8 hf iclass chk - now uses NG 2021-05-03 20:01:12 +02:00
iceman1001 305903c513 rework ISO15693 defines, removing duplicates 2021-05-03 09:35:38 +02:00
iceman1001 80817cea00 hf iclass chk - rework OLD -> NG. And textual 2021-05-03 09:31:51 +02:00
iceman1001 f50691e3de hf iclass eload - now uses NG 2021-05-02 18:41:43 +02:00
iceman1001 788876538d convert from OLD to NG 2021-05-01 19:01:15 +02:00
iceman1001 1cc9d9e988 add parity check to N10002 2021-04-30 11:21:40 +02:00
iceman1001 2aec706328 fix: memory leak when reconnecting to device, reuse old struct 2021-04-30 11:19:27 +02:00
iceman1001 0d1f8ca957 making a 14a select fct reachable, in order to do a test in desfire code without repeating same ftc 2021-04-30 11:18:14 +02:00
iceman1001 8243ac9749 fix a sanity memory leak with reserving memory used only for json file loading.. 2021-04-30 11:16:57 +02:00
iceman1001 550fa5aa8f 14a exchange apdu now uses defined return codes 2021-04-30 08:51:38 +02:00
iceman1001 3c072721bf trace list -t mfdes - updated EV2, EV3 annotations 2021-04-30 08:14:11 +02:00
iceman1001 79bf10dc30 text 2021-04-27 19:35:52 +02:00
iceman1001 82e71d7815 lf hid clone - only print the selected format 2021-04-27 19:16:06 +02:00
iceman1001 7b2adb1305 lf search - textual 2021-04-27 15:20:04 +02:00
iceman1001 10c9ea5f84 more wiegand formats, and if binary is user supplied use that length, and ignore parity faults is removed since we wanna see all decodings anyway 2021-04-27 15:19:34 +02:00
iceman1001 bbdb2d7c95 hf iclass lookup - fix wrong arg order 2021-04-27 15:16:27 +02:00
iceman1001 63b9adbffb hf iclass decrypt - add the possibility to decode as block6 after a decryted block 2021-04-27 15:15:59 +02:00
iceman1001 792b59997e change hf legic dump, restore, to abort if xoring of data failed 2021-04-26 14:29:28 +02:00
Iceman 5cf6798b70
Merge pull request #1258 from aveao/emrtd
emrtd: Fix file reading and parsing
2021-04-26 11:41:57 +02:00
iceman1001 c3f1edf73a added indala26,27,27asc, 29 bit formats 2021-04-26 11:37:58 +02:00
Ave but on a massive iMac a20f3afad2 emrtd: Fix problem with certain reads being incorrect 2021-04-26 12:02:50 +03:00
Ave but on a massive iMac 20ca241816 emrtd: Fix bug with certain file reads 2021-04-26 11:04:33 +03:00
iceman1001 c1339a4473 added some 38bit formats 2021-04-26 08:54:43 +02:00
iceman1001 62d84dd734 text 2021-04-25 11:57:28 +02:00
iceman1001 08f567a227 added 'lf idteck sim' 2021-04-25 11:57:03 +02:00
iceman1001 cfc8332321 text 2021-04-25 10:55:39 +02:00
iceman1001 94fc054277 changed 'emv *' - to try 14b if 14a fails. <experimental> 2021-04-24 14:53:40 +02:00
iceman1001 96ae77caf8 changed - now is able to interrupt search with <enter> 2021-04-24 14:52:33 +02:00
iceman1001 71c64337e1 hf 14a raw - maintain the 512 byte usb package limit 2021-04-24 14:46:51 +02:00
iceman1001 d7c5f0cac2 text 2021-04-24 14:39:27 +02:00
Iceman d680f1b290
Merge pull request #1254 from mwalker33/Desfire-Change-Key
Update cmdhfmfdes.c
2021-04-24 07:04:18 +02:00
mwalker33 ae42c9445a Update cmdhfmfdes.c
Desfire changekey AES
Seems to work, but response validation fails.
2021-04-24 13:43:00 +10:00
iceman1001 2119c4e7bd hf 14b got some love 2021-04-23 22:25:58 +02:00
Iceman 96e9d0f5cd
Merge pull request #1253 from mwalker33/Desfire-Change-Key
Desfire change key
2021-04-23 07:06:22 +02:00
mwalker33 6780b852d4 Update cmdhfmfdes.c
Desfire DES/3DES change key works
2021-04-23 07:44:32 +10:00
iceman1001 cc3fcb0ec6 might fix coverity CID 305865 2021-04-21 19:20:12 +02:00
iceman1001 b267ee8ef5 convert 14b raw to use NG 2021-04-21 18:36:21 +02:00
Philippe Teuwen e1b922631d Display only exec basename in proxmark3 client help 2021-04-20 18:46:58 +02:00
Philippe Teuwen 95031e0b17 remove color in proxmark3 -h 2021-04-20 12:21:54 +02:00
iceman1001 8172c708c3 cppchecker and some renaming 2021-04-20 11:00:39 +02:00
Philippe Teuwen a7ad668f83 script run help 2021-04-20 10:50:24 +02:00
Philippe Teuwen 7fbe4063b2 fix for script run & cliparser 2021-04-20 10:24:52 +02:00
Philippe Teuwen 06d61cdb7f fix script run for now, to be seen if we can do better 2021-04-20 01:41:34 +02:00
iceman1001 99a82cf7d2 coverity fixes 2021-04-19 23:31:11 +02:00
iceman1001 bb9cf8ec40 make sure there is room for null terminator 2021-04-19 23:25:13 +02:00
Philippe Teuwen a2fa5cbc44 Add fulltext test 2021-04-19 23:12:27 +02:00
iceman1001 c7e47a721d cliparser doesnt like empty strings, 2021-04-19 23:00:02 +02:00
iceman1001 1871e7b9fb lf t55xx resetread - correct cli arguments 2021-04-19 22:52:40 +02:00
iceman1001 150579f375 cliparser doesnt liek empty strings, should be NULL instead 2021-04-19 22:47:20 +02:00
iceman1001 5604afce7a trace list - now colors whole reader line output. Also little nasty buff-underflow bug fixed 2021-04-19 22:18:37 +02:00
Philippe Teuwen 1d69cabd54 change fido/emrtd/st fct names to match other functions 2021-04-19 21:56:49 +02:00
Philippe Teuwen dc54dd305b Use CmdTraceListAlias everywhere 2021-04-19 21:43:32 +02:00
Philippe Teuwen 2e925d5da3 hf 14a list & CmdTraceListAlias: simplify 2021-04-19 21:21:47 +02:00
Philippe Teuwen 4dea429157 hf 14a list helptext handling by CmdTraceListAlias, to be generalized if ok 2021-04-19 14:35:09 +02:00
Philippe Teuwen 4c228b6c64 fix handling of trace list -1 with empty trace buffer 2021-04-19 14:22:15 +02:00
iceman1001 baf6ef292d remove old unused files 2021-04-19 07:07:40 +02:00
Philippe Teuwen 008a0b5ab4 First attempt at dumping all help: proxmark3 --fulltext 2021-04-19 02:54:16 +02:00
Philippe Teuwen 11c7ead732 Add -h/--help support to last commands 2021-04-19 01:43:26 +02:00
Philippe Teuwen d2246e6606 remove leftover 2021-04-19 01:18:12 +02:00
Philippe Teuwen e2cc02af49 Allow to see help from all categories 2021-04-19 01:16:39 +02:00
Philippe Teuwen 7e68064446 Allow to see help offline 2021-04-19 00:33:59 +02:00
Philippe Teuwen 68e8705278 Add option -c to lf search to continue searching after first hit 2021-04-18 23:23:48 +02:00
iceman1001 f76528eba4 fix coverity CID 319477 2021-04-18 20:19:49 +02:00
iceman1001 e7df423e0f text 2021-04-18 20:03:23 +02:00
iceman1001 6961611474 unified text and loading file now follow new pattern 2021-04-18 19:57:50 +02:00
Philippe Teuwen ed78bca62b style 2021-04-18 18:31:51 +02:00
iceman1001 729fd0439c text 2021-04-18 16:05:45 +02:00
iceman1001 e28f8c5c65 fix config cards generation and it uploads direct to device. 2021-04-18 15:07:56 +02:00
iceman1001 155443754b better detection of empty blocks 2021-04-18 11:35:38 +02:00
Philippe Teuwen 4c696885e4 typos 2021-04-17 23:18:13 +02:00
iceman1001 3577193303 data raw - now use cliparser 2021-04-17 21:47:29 +02:00
Ryan Saridar 8046f6862a
Fix DESFire mis-annotation 2021-04-17 19:08:34 +01:00
iceman1001 ec9c9a54ab clang fix 2021-04-17 15:42:58 +02:00
iceman1001 0c78958122 clang fix 2021-04-17 15:36:46 +02:00
iceman1001 a1ddd01906 clang 2021-04-17 15:28:49 +02:00
iceman1001 2b8d5e5c0d clang fixes 2021-04-17 15:23:19 +02:00
iceman1001 be6a9273ec clang fix 2021-04-17 15:17:39 +02:00
iceman1001 cd965a6d34 fix coverity CID 93584 2021-04-17 10:38:41 +02:00
iceman1001 5a847b2629 lf pac demod - now also checks for inverted bitstream 2021-04-16 21:35:14 +02:00
iceman1001 d34ae56c11 style 2021-04-16 17:10:45 +02:00
iceman1001 d2646122e7 style 2021-04-16 17:10:08 +02:00
iceman1001 5775a283e9 fix coverity CID 319296 2021-04-16 17:04:21 +02:00
iceman1001 8497b3e3f6 fix data dec 2021-04-16 13:20:20 +02:00
iceman1001 cf8f0f0b6a hf iclass eload/view/decrypt - now suports BIN/EML/JSON formats 2021-04-16 12:53:44 +02:00
iceman1001 dff76e81ca fix coverity CID 226452, 319217 2021-04-16 08:43:20 +02:00
iceman1001 72e5b9e80d text 2021-04-16 08:09:11 +02:00
iceman1001 4f21963b07 text 2021-04-16 01:29:47 +02:00
iceman1001 4c8aada66b text and rework 2021-04-16 00:44:50 +02:00
Philippe Teuwen f63125386b typos 2021-04-16 00:13:36 +02:00
Philippe Teuwen 046f8f50ea typo 2021-04-16 00:09:11 +02:00
iceman1001 e426699c5d forgotten 2021-04-16 00:00:02 +02:00
iceman1001 53b42d0069 adapt text 2021-04-15 23:39:33 +02:00
iceman1001 876de0d954 rework helptexts and params 2021-04-15 23:26:31 +02:00
iceman1001 771ac8d239 text 2021-04-15 23:00:43 +02:00
iceman1001 62697ca460 text 2021-04-15 22:41:47 +02:00
Iceman 0a88565d0f
Merge pull request #1248 from merlokk/emv_crypto
show some general crypto description
2021-04-15 22:08:21 +02:00
iceman1001 9c35896162 hf 14b reader - now supports continuous mode 2021-04-15 22:06:17 +02:00
iceman1001 786858aa6c fix ´hf search' / ´hf 15 reader´ looping gave false result 2021-04-15 21:51:47 +02:00
iceman1001 4f3447a4ab text 2021-04-15 19:34:42 +02:00
merlokk b627934fb4 fix tabs 2021-04-15 19:56:20 +03:00
merlokk e1a7b61b1f show some general crypto description 2021-04-15 19:51:24 +03:00
iceman1001 46bf529763 change 'hf 15 restore' now supports EML/JSON 2021-04-15 18:27:24 +02:00
iceman1001 8587b93e0d text 2021-04-15 18:11:44 +02:00
iceman1001 f5147cb5cf hf 15 raw - now uses cliparser 2021-04-15 18:11:22 +02:00
iceman1001 7a04b06f52 hf 15 restore - now uses cliparser 2021-04-15 17:37:35 +02:00
merlokk 966875ce6f add tokenization tags for apple/google pay 2021-04-15 18:05:08 +03:00
iceman1001 49630f0a7f hf 15 dump - now uses cliparser 2021-04-15 12:52:47 +02:00
iceman1001 d33ba25d3f hf 15 wrbl - now uses cliparser 2021-04-15 12:31:16 +02:00
iceman1001 3e1a1abbbb hf 15 info - now uses cliparser 2021-04-15 12:15:44 +02:00
iceman1001 0f9365d2dd hf 15 rdmulti - now colors lockbyte if set 2021-04-15 11:16:23 +02:00
iceman1001 9347426456 hf 15 rdmulti - now uses cliparser 2021-04-15 11:05:57 +02:00
iceman1001 f76f98b318 hf 15 rdbl - now uses cliparser 2021-04-15 10:54:40 +02:00
iceman1001 d5aee1bd00 text 2021-04-15 10:42:47 +02:00
iceman1001 9396aa4bf6 text 2021-04-15 10:40:23 +02:00
iceman1001 ab3032c628 hf 15 writeafi, writedsfi - now support cliparser 2021-04-15 10:39:56 +02:00
iceman1001 1ec1bda141 fix lf search 2021-04-14 14:24:50 +02:00
iceman1001 eb4181d8be reenabled felica in hf search 2021-04-14 08:15:30 +02:00
iceman1001 fc61561e97 hf felica auth1, auth2 - now use cliparser. 2021-04-14 08:15:14 +02:00
iceman1001 831f664a4c coverity fix CID 319217 2021-04-13 17:45:36 +02:00
iceman1001 967cab7b58 update the header file 2021-04-13 17:02:06 +02:00
iceman1001 e7e43d11d0 hf felica rdbl, wrbl, now uses cliparser. Renamed them, and hf felica raw got a bugfix to read raw bytes correct 2021-04-13 16:08:58 +02:00
iceman1001 30ea41efc8 hf felica scsvcode, rdunencrypted - now uses cliparser 2021-04-13 15:30:12 +02:00
iceman1001 506d660c29 cppchecker fixes 2021-04-13 11:08:03 +02:00
iceman1001 66a9490fe7 lf t55xx restore - now support bin/eml/json formats 2021-04-13 11:05:39 +02:00
iceman1001 536ddd17fd cppchecker fixes 2021-04-13 10:02:48 +02:00
iceman1001 4d2f8a3bd5 hf felica rqresponse - now uses cliparser 2021-04-12 22:49:19 +02:00
iceman1001 935ba8289a hf felica rqsyscode, rqspecver - now uses cliparser 2021-04-12 22:10:38 +02:00
iceman1001 cf0ffb778d hf felica rqservice - now uses cliparser 2021-04-12 21:42:49 +02:00
iceman1001 37751e1b2b hf felica resetmode - now uses cliparser 2021-04-12 21:30:53 +02:00
iceman1001 6da7fcd510 coverity fixes 2021-04-12 18:39:15 +02:00
iceman1001 b7b42ebd39 lf hitag dump - now supports cliparser. Command is still not implemented 2021-04-12 16:47:54 +02:00
iceman1001 0290efb25e hf mf hardnest - init all values (Thanks @doegox) 2021-04-12 16:18:24 +02:00
iceman1001 5ddedf17dd lf hitag writer - now uses cliparser 2021-04-12 16:17:37 +02:00
iceman1001 8bee66c32a lf hitag reader - now uses cliparser 2021-04-12 13:18:25 +02:00
iceman1001 b59e469d47 hf mf autopwn - now use cliparser 2021-04-12 10:02:47 +02:00
iceman1001 e2ed63d96b hf mf hardnested - now uses cliparser 2021-04-12 08:16:11 +02:00
iceman1001 199e344260 use defines instead 2021-04-11 21:35:45 +02:00
iceman1001 f07426db43 hf mf restore - now uses cliparser 2021-04-11 21:19:14 +02:00
iceman1001 e5a9e8812a hf mf wrbl - now uses cliparser 2021-04-11 19:11:11 +02:00
iceman1001 96f8cad9a5 hf mf decrypt - now use cliparser 2021-04-11 18:18:13 +02:00
iceman1001 55e1b95f21 hf mf setmod - now uses cliparser 2021-04-11 17:54:17 +02:00
iceman1001 0ac28addcb remove one test command 2021-04-11 13:58:04 +02:00
iceman1001 cc5debd628 hf mf csetblk - now uses cliparser. plus print refactoring 2021-04-11 13:14:13 +02:00
iceman1001 e448d58291 hf mf csetuid - now supports cliparser. Also experimental 7byte support. Not seen one in the wild. untested 2021-04-11 12:48:06 +02:00
iceman1001 65427193d6 hf mf csave - now use cliparser\nhf mf view - now accepts BIN/EML/JSON 2021-04-11 11:30:09 +02:00
iceman1001 e4648ba1c3 hf mf eload / cload now takes BIN/EML/JSON files 2021-04-11 10:59:55 +02:00
iceman1001 e8d0a1e783 hf mf cview - now uses cliparser 2021-04-10 19:38:01 +02:00
iceman1001 99cb92e736 hf mf esave - now uses cliparser 2021-04-10 19:25:50 +02:00
iceman1001 93a9750d93 hf mf ecfill - now uses cliparser 2021-04-10 19:08:32 +02:00
iceman1001 5ac7b9fd9f hf mfu eload - now works again :) 2021-04-10 18:21:38 +02:00
iceman1001 43c42a06a0 hf mf eload - now uses cliparser, and fixes for block printing etc. 2021-04-10 18:13:11 +02:00
iceman1001 d551a66256 new command "hf mf view".\nhf mf eview - now uses cliparser 2021-04-10 15:40:25 +02:00
iceman1001 e1b856b5fc hf mf ekeyprn, eclr, nack - now uses cliparser 2021-04-10 15:08:27 +02:00
iceman1001 49b830266c text 2021-04-10 12:28:39 +02:00
iceman1001 1cb9b37d83 hf mf rdbl,rdsc - now use cliparser 2021-04-10 09:51:18 +02:00
iceman1001 a8a17b70d3 hf mf egetsc/egetblk/cgetsc/cgetsc - now use cliparser and can decode st 2021-04-10 09:01:00 +02:00
iceman1001 916e5d7ba2 versbose text 2021-04-10 08:05:33 +02:00
Ryan Saridar 2e09354bba
Fix RESTORE mis-annotation 2021-04-08 16:51:21 +01:00
merlokk 2f634923bb if SSAD present before check it (A@Pay) 2021-04-08 17:59:47 +03:00
merlokk a99a52f5a6 check CDA SDAD present 2021-04-08 17:58:25 +03:00
merlokk 7becdffd6d work with apple/google pay 2021-04-08 15:57:13 +03:00
iceman1001 007b916643 style 2021-04-08 11:08:39 +02:00
iceman1001 27184d7f5b style 2021-04-08 10:44:31 +02:00
iceman1001 31c5722ac0 fix coverity CID 317343,317344 ... 2021-04-08 10:38:10 +02:00
iceman1001 3e1b041ff8 fix coverity CID 317346 2021-04-08 10:37:33 +02:00
iceman1001 a731bccb01 inverse to please osx 2021-04-08 10:01:18 +02:00
iceman1001 2537fbde20 text 2021-04-08 09:51:23 +02:00
iceman1001 7567e7601d textual 2021-04-08 09:50:03 +02:00
iceman1001 d2e709158d remove newline 2021-04-08 09:48:44 +02:00
iceman1001 8a05a4d1d7 smart raw - now use NG.\nhf iclass config - added more support for keyrollning (WIP)\n 2021-04-08 09:34:11 +02:00
Iceman b654769963
Merge pull request #1236 from VortixDev/VortixDev-patch-sblock-annotations
Fix swapped DESELECT and WTX annotations
2021-04-08 07:00:08 +02:00
Ryan Saridar 6f9a60f521
Fix swapped DESELECT and WTX annotations 2021-04-07 22:56:21 +01:00
Ryan Saridar e223258aa2
Fix error typo 2021-04-07 22:17:57 +01:00
iceman1001 ac0ad24bfe hf 15 findafi, client side now breaks when finished 2021-04-07 12:32:47 +02:00
iceman1001 871820f8f7 fixing padding @anon 2021-04-07 09:13:45 +02:00
iceman1001 f53de10c60 hf 15 findafi, bad loop var 2021-04-07 01:19:28 +02:00
iceman1001 51ec7c2178 fix coverity #308283 2021-04-06 23:57:25 +02:00
iceman1001 501b31cf45 fix coverity #308236 2021-04-06 23:55:24 +02:00
iceman1001 30a10b266b fix #1234 - cliparse allow empty line, loop now user interuptable 2021-04-06 23:37:45 +02:00
iceman1001 372a6958fa cppchecker fix, we can simplify test meanwhile 2021-04-05 19:33:25 +02:00
iceman1001 2a9d064fd6 hf emrtd, maybe this makes coverity more calm 2021-04-05 12:24:54 +02:00
iceman1001 5ee8c9c75e text 2021-04-05 12:21:56 +02:00
iceman1001 ce40c4d067 hf iclass config - out of bounds check 2021-04-05 12:20:31 +02:00
iceman1001 8da99277ff fix coverity CID 308278 2021-04-05 09:05:25 +02:00
iceman1001 cf287818f3 fix coverity 308279 2021-04-05 09:02:15 +02:00
iceman1001 1b59b38058 fix coverity 314850, and textual changes 2021-04-05 08:47:03 +02:00
iceman1001 e9df21d3ab guard, fix coverity CID 408545 2021-04-05 08:26:17 +02:00
iceman1001 e3765a7ec0 fix coverity CID 317112,CID 317111 2021-04-05 08:14:59 +02:00
iceman1001 48012061a6 hitag cliparser stuff 2021-04-04 17:05:35 +02:00
iceman1001 02a6ebecb5 ...single params must be single char 2021-04-04 17:04:26 +02:00
iceman1001 86e682feff reverse read_reply in 14b raw 2021-04-04 17:02:55 +02:00
iceman1001 d19da982f0 looping for smart card, inverted the silent to verbose, updated cardhelper stuff 2021-04-04 17:01:43 +02:00
iceman1001 3b944adbd0 text 2021-04-04 11:31:48 +02:00
iceman1001 160941c280 text 2021-04-03 16:14:53 +02:00
iceman1001 a3ac00b20a hf search - disasbled felica detection #1233 again until felica is table enough 2021-04-03 15:44:13 +02:00
iceman1001 f4694a4cd5 added new command 'hf mf wipe' - which takes a keyfile to wipe a MFC to default values 2021-04-01 21:14:38 +02:00
iceman1001 924a8163d0 hf mf restore - when using keyfile as auth, use dump data for sectortrailer 2021-04-01 00:08:22 +02:00
iceman1001 d2421a2dd4 hf mf restore - forgot to swap keytype 2021-04-01 00:00:28 +02:00
iceman1001 5d49661da3 hf mf restore - now can use "w" to use keyfile to authenticate 2021-03-31 23:39:49 +02:00
iceman1001 b328d61c19 coverity fix 2021-03-31 17:03:20 +02:00
iceman1001 e35ebf6b69 mem info , now supports loading PEM with private key 2021-03-31 15:52:57 +02:00
Iceman 1d6b4b2722
Merge pull request #1230 from VortixDev/VortixDev-patch-mfpauth
Fix mfpauth error printout
2021-03-31 08:57:54 +02:00
Ryan Saridar b2f535f788
Make error verbose 2021-03-31 02:45:37 +01:00
Ryan Saridar 2f0b944554
Fix error byte index 2021-03-31 02:42:03 +01:00
iceman1001 62031e640c swap arrays 2021-03-30 09:34:17 +02:00
iceman1001 b7be78a8fb cbc is already done in mifare_cypher_single_block (anon) 2021-03-29 21:52:36 +02:00
iceman1001 8278c733fe wiegand decode - added binary param to decode 2021-03-29 17:38:20 +02:00
iceman1001 48b9ec1e7b layout of main help 2021-03-29 10:49:19 +02:00
iceman1001 1a16160534 text 2021-03-29 10:48:46 +02:00
iceman1001 0582f47e2d text 2021-03-29 10:46:10 +02:00
iceman1001 758488f377 text 2021-03-29 10:38:47 +02:00
iceman1001 5e963a0746 data hex2bin - talk about brain melt 2021-03-28 18:46:27 +02:00
iceman1001 a34bf3264c hf cryptorf, now uses cliparser, *not enabled commands* 2021-03-27 18:44:49 +01:00
iceman1001 be4b36e605 hf search - enabled FeliCa detection 2021-03-27 13:23:01 +01:00
iceman1001 1284a0bb6a added hf felica info\n hf felica reader, now supports cliparser and continuous mode 2021-03-27 13:22:23 +01:00
iceman1001 16d9199f52 wrong arrow 2021-03-27 12:46:24 +01:00
iceman1001 d23eadb034 wrong arrow 2021-03-27 12:45:10 +01:00
iceman1001 517b5867ff wrong arrow 2021-03-27 12:44:21 +01:00
iceman1001 f0510cc0d5 style 2021-03-27 10:21:54 +01:00
iceman1001 d46c90b231 text 2021-03-27 10:21:27 +01:00
iceman1001 40f6ff431e text 2021-03-27 10:20:54 +01:00
iceman1001 69d73a4d8d fix coverity 315653 2021-03-26 22:33:31 +01:00
iceman1001 4d6584f027 fix coverity 315652 2021-03-26 22:26:28 +01:00
iceman1001 f0b4e6651c fix cppchecker - null checks 2021-03-26 21:47:13 +01:00
iceman1001 4b8ee5a039 fix cppchecker 2021-03-26 21:44:49 +01:00
iceman1001 7574606080 hf felica sniff - now uses cliparser 2021-03-26 21:01:50 +01:00
iceman1001 b023602d83 text 2021-03-26 19:32:11 +01:00
iceman1001 96bdc45ccf text 2021-03-26 19:30:22 +01:00
iceman1001 21f311cf8c auto - optional parameter to keep searching 2021-03-26 14:09:09 +01:00
iceman1001 a1d21e56d8 fix ltrim missing param 2021-03-25 15:19:43 +01:00
iceman1001 341bebdfcc fix data hex2bin 2021-03-25 14:59:46 +01:00
iceman1001 91b47eeb1f hf felica litesim - now uses cliparser 2021-03-25 09:39:40 +01:00
iceman1001 db3719792b hf felica raw - now uses cliparser 2021-03-24 19:30:40 +01:00
iceman1001 dfa8a648ac fix 2021-03-23 19:29:29 +01:00
iceman1001 585e067ba9 data manrawdecode - now uses cliparser 2021-03-23 19:27:17 +01:00
iceman1001 e69cc3936d fw check 2021-03-23 19:22:28 +01:00
iceman1001 5ab381b28a clear - now uses cliparser 2021-03-23 17:06:53 +01:00
iceman1001 4a29d49880 data biphasedecode - now uses cliparser 2021-03-23 16:57:00 +01:00
iceman1001 200cd1d2f2 data askedgedetect - now uses cliparser 2021-03-23 15:19:22 +01:00
iceman1001 e85ae1753d data dirthreshold - now uses cliparser 2021-03-23 14:04:22 +01:00
iceman1001 d84837a12a data autocorr - now uses cliparser 2021-03-23 13:56:38 +01:00
iceman1001 d906f61957 data detectclock - now uses cliparser 2021-03-23 13:44:55 +01:00
iceman1001 7444702a65 data setgraphmarkers 2021-03-23 13:25:36 +01:00
iceman1001 9b1f7ca7a3 data iir, shiftgraphzero - now uses cliparser 2021-03-23 13:13:10 +01:00
iceman1001 2480eb2d29 data grid, zerocrossings - now use cliparser 2021-03-23 13:02:05 +01:00
iceman1001 e9dd4f6b4a data hpf, convertbitstream, getbitstream - now uses cliparser 2021-03-23 11:53:01 +01:00
iceman1001 2287390b7e data hexsamples - now use cliparser 2021-03-23 11:43:14 +01:00
iceman1001 8573695134 data bin2hex - now uses cliparser\n added a binary string input parser 2021-03-23 11:06:09 +01:00
iceman1001 22dac2d098 data clear, hex2bin - now uses cliparser 2021-03-22 21:46:48 +01:00
iceman1001 b02d076928 data ltrim, mtrim, rtrim - now uses cliparser 2021-03-22 21:11:24 +01:00
iceman1001 2250be7da1 data print - now uses cliparser 2021-03-22 20:54:08 +01:00
iceman1001 443d5a3f3a data samples - now uses cliparser 2021-03-22 18:21:35 +01:00
iceman1001 e3d5c581d4 text 2021-03-22 18:13:09 +01:00
iceman1001 d3f093ca4a data plot, hide, now uses cliparser 2021-03-22 18:07:33 +01:00
iceman1001 52b4677036 data tune, setdebugmode, now uses cliparser 2021-03-22 18:02:17 +01:00
iceman1001 b894365647 hf mfdes info - text 2021-03-17 10:44:30 +01:00
iceman1001 68033b8e2c hf mfdes info - text 2021-03-17 10:40:05 +01:00
iceman1001 e425fba4aa add new command "hw break" - to break out softwarewise from loops 2021-03-15 01:29:03 +01:00
iceman1001 692fc94a89 flush 2021-03-12 13:55:02 +01:00
iceman1001 ae0f98e8b2 trace list -t mf - now gives needed data for mf_nonce_brute to recover the nested authentication key 2021-03-12 13:54:41 +01:00
iceman1001 aae08929dd text 2021-03-11 22:45:51 +01:00
iceman1001 c5c689f50f data fsktonrz - now uses cliparser 2021-03-11 09:26:02 +01:00
iceman1001 27dafa2bb0 marking of crc bytes overwrote first hex char 2021-03-10 14:08:33 +01:00
Philippe Teuwen 64a04498bd Add reader parity errors on MFC traces 2021-03-10 13:52:26 +01:00
Philippe Teuwen 3502fbd82b Fix lf em4x05 unlock 2021-03-10 12:08:22 +01:00
Philippe Teuwen d3a960717f text 2021-03-10 11:23:13 +01:00
iceman1001 1b2091932e fix 'mem spiffs view' and bad file stats retrieval 2021-03-10 10:43:49 +01:00
iceman1001 bf49f4432b rdsc/egetsc/cgetsc - output unified 2021-03-10 05:15:36 +01:00
iceman1001 92b627a0bd hf mf rdsc - modified output 2021-03-10 04:59:44 +01:00
iceman1001 102fa451db pref - now uses cliparser everywhere 2021-03-09 22:14:57 +01:00
iceman1001 590c7ff717 fix helptext 2021-03-09 22:02:08 +01:00
iceman1001 8dddb0b3bc mem dump - optional columns 2021-03-09 21:16:51 +01:00
iceman1001 a807c504c1 added ascii to the output 2021-03-09 21:08:24 +01:00
iceman1001 bcb83e01a9 text 2021-03-09 16:16:50 +01:00
iceman1001 ba79bb7b06 fix some missing command when printing helps/markdown 2021-03-09 16:09:36 +01:00
iceman1001 af6289c99a text 2021-03-09 14:38:53 +01:00
iceman1001 ad2b0879fc added: mem spiffs view - to view a file on SPIFFS\n mem spiffs dump - now uses cliparser and NG 2021-03-09 14:38:31 +01:00
iceman1001 02aabf90d3 mem spi mount/unmount/test/check/tree/info/remove/rename/wwipe - now uses cliparser. remove/rename uses NG 2021-03-08 17:39:21 +01:00
iceman1001 59379247e6 adapt text to t55xx 2021-03-08 11:31:40 +01:00
mwalker33 b01c269c70 Update cmdlft55xx.c
Code clean and tweak
2021-03-08 19:25:14 +11:00
mwalker33 0a3c05c02c Update cmdlft55xx.c
fix toggle of ST INV and Q5/T55
fix lf t55xx brute for all downlink modes
fix lf t55xx chk -f <password file>
fix lf t55xx chk for all downlink modes
2021-03-08 13:40:06 +11:00
iceman1001 0742241994 fix lf t55 config - bitrate and macros (thanks @mwalker33) 2021-03-08 00:47:11 +01:00
iceman1001 fd656541dd fix lf t55xx wipe - calling write with correct params 2021-03-08 00:28:38 +01:00
Philippe Teuwen f2a0f3e272 replace static countones & bitcount by utils in client 2021-03-07 23:48:55 +01:00
Philippe Teuwen e5c5629cf2 Some tunings of otptear:
- make tearoff_delay_us and tearoff_enabled globals
- use tearoff_hook and remove Dbprintf in critical tearoff timing
- move initial write from MifareU_Otp_Tearoff to CmdHF14AMfuOtpTearoff and make it optional (old behavior was writing initial 00000000 when -d was not provided)
- tearoff: compare with initial write, not with previous tearoff outcome
- rephrase some messages
- track all begin and end of erase and write phases, with quite complex logic to cover multiple cases (starting in middle of erased phase, starting with write 0, ...) and report them
- check against initial write error
- repeat same timing (up to 10x) in case of write/read errors then quit
- typos
2021-03-07 23:48:55 +01:00
iceman1001 55ccd18afd lf hitag cc - now uses cliparser 2021-03-07 22:27:37 +01:00
iceman1001 fe25e70e6f string too small fix 2021-03-07 22:24:37 +01:00
iceman1001 7377a45bd0 lf t55xx write - now uses cliparser 2021-03-07 22:00:33 +01:00
iceman1001 a3b42e27cf lf t55xx read - now uses cliparser 2021-03-07 20:24:13 +01:00
iceman1001 d93bcd4074 text 2021-03-07 19:04:14 +01:00
iceman1001 827c529aea lf t55 config - now uses cliparser... and texts 2021-03-07 18:56:37 +01:00
iceman1001 964aee329f lf t55xx resetread - now uses cliparser 2021-03-07 15:08:38 +01:00
iceman1001 caf9e9cecc lf t55xx trace, info - now uses cliparser 2021-03-07 15:01:56 +01:00
iceman1001 450c7fab5b lf t55xx restore - now uses cliparser 2021-03-07 11:42:23 +01:00
iceman1001 d5ea600289 lf t55 dump - now uses cliparser 2021-03-07 11:25:17 +01:00
iceman1001 70bcfb7ffe textual, pushing a point 2021-03-07 10:44:21 +01:00
iceman1001 e4753011d8 text 2021-03-07 10:19:52 +01:00
iceman1001 14d62bf380 some lf reader used this configblock, dont remember if it was discussed on forum or discord 2021-03-07 08:58:16 +01:00
iceman1001 dff732840f mem info - now accepts input id to facility easy testing. Signature offset also triggers erase before to enable easy updates 2021-03-07 08:56:36 +01:00
Iceman e4b2a278db
Merge pull request #1217 from mwalker33/t55xx-works
T55xx works
2021-03-06 11:43:22 +01:00
mwalker33 6aa9b98afc Update cmdlft55xx.c
T55xx detect
- set default to try all downlink modes
- ensured when trying all downlink modes it starts at fixed bit.
2021-03-06 17:36:42 +11:00
iceman1001 547e462422 spelling 2021-03-05 12:55:28 +01:00
iceman1001 7416045747 demonstrate amiitool integration with mfu commands. 2021-03-05 10:23:51 +01:00
iceman1001 4c845fb859 endless happiness 2021-03-05 10:18:34 +01:00
iceman1001 39e7a58389 default to oem 900 for C15001 format 2021-03-04 09:53:01 +01:00
iceman1001 cb97b67cc5 spelling 2021-02-28 10:29:40 +01:00
iceman1001 4ab382065a cppchecker 2021-02-27 19:13:19 +01:00
iceman1001 3ee657c0f7 cppchecker 2021-02-27 19:12:03 +01:00
iceman1001 eef2a63081 cppchecker 2021-02-27 19:09:57 +01:00
iceman1001 404161d8b0 cppchecker 2021-02-27 19:08:35 +01:00
iceman1001 159a12e357 hf 14b sriwrite - now uses cliparser 2021-02-27 18:50:12 +01:00
Ave 23f831d6a9 emrtd: fix segfaults when debug print is enabled 2021-02-25 20:21:10 +03:00
iceman1001 3fd8a640c1 cppchecker - integeroverflow 2021-02-24 18:00:38 +01:00
iceman1001 b6965425bc textual, cppchecker 2021-02-24 00:17:30 +01:00
iceman1001 3cd282ce87 cppchecker 2021-02-24 00:10:13 +01:00
iceman1001 f5aa78e668 cppchecker shadow 2021-02-24 00:02:59 +01:00
iceman1001 59cd54e178 cppchecker 2021-02-23 23:04:47 +01:00
iceman1001 99dcb8122a cppchecker 2021-02-23 23:04:43 +01:00
iceman1001 4620c0b21e cppchecker fixes 2021-02-23 23:00:29 +01:00
iceman1001 6d329a0462 coverity fixes 2021-02-23 18:23:53 +01:00