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

3676 commits

Author SHA1 Message Date
iceman1001 073b47d480 fix to handle when first_byte_sum does not find a match in the possible sums array. ie, leads to a crash 2022-01-09 13:39:37 +01:00
iceman1001 0967ea1989 modified the default mfc hardcoded list to contain some more keys 2022-01-09 13:37:35 +01:00
iceman1001 28efc8b097 hf mf darkside - textual adaptation to current style 2022-01-09 13:36:29 +01:00
iceman1001 abacf673dc cppcheck fixes 2022-01-09 13:35:16 +01:00
iceman1001 0942ce7a68 refactory parity files a bit 2022-01-09 13:34:54 +01:00
iceman1001 fe9348768d use calloc instead 2022-01-09 00:33:33 +01:00
iceman1001 0254b2a63a cppcheck fixes 2022-01-08 15:29:11 +01:00
iceman1001 5ff043e5ab null key fix 2022-01-08 15:28:36 +01:00
iceman1001 0a5ae04070 coverity fixes 2022-01-08 13:27:22 +01:00
iceman1001 eaf968092c coverity fixes 2022-01-08 13:14:53 +01:00
iceman1001 256565f820 coverity fixes for mem leaks. added a macro for freeing cliparser context too 2022-01-08 13:08:51 +01:00
iceman1001 8cd19d7c87 textual / style 2022-01-08 13:01:10 +01:00
Philippe Teuwen 291a4a4aa2 silent clang warning on increasing required alignment 2022-01-08 12:15:24 +01:00
Philippe Teuwen 5a0dda6bb0 Make HFGAL_* macros available to all as PM3_* macros 2022-01-08 12:00:54 +01:00
Matt Moran cb6a1db852 Continue reading credentials if one fails (e.g. when using different site keys) 2022-01-08 18:13:29 +13:00
Philippe Teuwen 30aa7aa7d1 Adapting license headers, WIP 2022-01-08 00:40:52 +01:00
iceman1001 a432b49393 change gprox ii clone/sim to handle 20b cardnumber for the 36b format 2022-01-07 21:06:07 +01:00
iceman1001 89a05b47a8 cppcheck fixes const 2022-01-07 19:31:19 +01:00
iceman1001 2bf2bb301a cppcheck fixes 2022-01-07 19:23:42 +01:00
iceman1001 a8ccba77d6 cppcheck fixes const 2022-01-07 19:13:24 +01:00
Matt Moran 1f8217ec2e Use DesfireGetAIDList to find an available AID 
... and check that user-specified AID is available (before writing to the CAD)
 2022-01-08 00:36:59 +13:00
Matt Moran b3dc6f62ab Refactor, adds select_aid_and_auth_with_key 2022-01-07 23:59:46 +13:00
Matt Moran beefc97995 Add ability to use custom CAD key, add ability to skip some actions 
For cloning & deleting:
- Add ability to use custom Card Application Directory key (`--cadkey`)
- Add ability to skip updating the CAD (`--noupdatecad`)
- Add ability to skip creating/deleting the app and only update the CAD (`--nocreateapp`, `--nodeleteapp`)
 2022-01-07 23:57:47 +13:00
Matt Moran 69049a6621 Remove incorrect AID validation 2022-01-07 19:31:36 +13:00
iceman1001 81c6918ac5 cppcheck 2022-01-06 23:25:25 +01:00
iceman1001 d2c290c7c3 cppcheck fixes for const 2022-01-06 23:20:55 +01:00
iceman1001 6bb301f4da cppcheck fixes for const 2022-01-06 23:07:47 +01:00
iceman1001 7efd02b6e0 cppcheck fixes 2022-01-06 22:08:28 +01:00
iceman1001 72f2682544 cppcheck 2022-01-06 21:11:51 +01:00
iceman1001 6dbde61c4e cppcheck fixes 2022-01-06 21:08:22 +01:00
iceman1001 05576ba06b cppcheck fixes 2022-01-06 21:00:16 +01:00
iceman1001 0b4d584dd7 cppcheck fixes 2022-01-06 20:49:35 +01:00
Iceman 75c2462777
Merge pull request #1551 from DarkMatterMatt/feat/hf-gallagher 
Add `hf gallagher` commands
 2022-01-06 19:58:12 +01:00
iceman1001 b3731c6003 cppcheck fixes 2022-01-06 18:18:48 +01:00
Matt Moran 14b6580fcb Squashed commit of the following: 
commit 8f77179a2f
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Thu Jan 6 11:25:38 2022 +0100

    remove unused file

commit bcafc5d03c
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Thu Jan 6 11:24:04 2022 +0100

    some historical copyright adjustments, thanks @iceman1001!

commit b703bb746b
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Thu Jan 6 02:19:46 2022 +0100

    Adapting license headers, WIP

commit 8952a1f712
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Thu Jan 6 00:37:34 2022 +0100

    adapt contributing text

commit cdfb83075f
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Thu Jan 6 00:24:15 2022 +0100

    toc

commit 014817f854
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Thu Jan 6 00:15:40 2022 +0100

    Adding AUTHORS and changing licensing terms from 'GPLv2 or later' to 'GPLv3 or later' to comply with components available only under 'GPLv3 or later'. Details:

    Initial releases by Jonathan Westhues in 2005-2007 were made under GPL
    "either version 2 of the License, or (at your option) any later version"

    Since then, a number of dependencies and files were integrated to the project, but under a "GPLv3 or later" license. These components are reveng, desfire_crypto and lrpcrypto. Note that compnents cryptorf, hitag2crack and fpga-xc3s100e are also under GPLv3+ but not bound to the firmware or client source code.

    Therefore, we must mechanically upgrade the license of the whole project to GPLv3+, as made possible by the initial licensing terms and as mandated by the inclusion of GPLv3+ code.

    Still to do: update each source file header:

        Copyright (C) Proxmark3 contributors. See AUTHORS.md for details.

        This program is free software: you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
        the Free Software Foundation, either version 3 of the License, or
        (at your option) any later version.

        This program is distributed in the hope that it will be useful,
        but WITHOUT ANY WARRANTY; without even the implied warranty of
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.

        You should have received a copy of the GNU General Public License
        along with this program.  If not, see <http://www.gnu.org/licenses/>.

commit 5561466fe8
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Wed Jan 5 18:56:56 2022 +0100

    make style

commit 2d1a1dc034
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Wed Jan 5 17:57:49 2022 +0100

    make style doc/commands.json

commit fc53665e5c
Merge: a6d22ee43 c0cc09d86
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Wed Jan 5 17:52:44 2022 +0100

    Merge pull request #1552 from joswr1ght/master

    Add --no-auth support for hf mfdes createapp

commit c0cc09d86b
Author: Joshua Wright <jwright@hasborg.com>
Date:   Wed Jan 5 07:12:20 2022 -0500

    Style consistency changes for hf mfdes createapp feature addition

commit f9c96f49da
Author: Joshua Wright <jwright@hasborg.com>
Date:   Tue Jan 4 17:01:10 2022 -0500

    Update CHANGELOG with MIFARE DESFire createapp --no-auth change

commit 859b55933d
Author: Joshua Wright <jwright@hasborg.com>
Date:   Tue Jan 4 15:55:26 2022 -0500

    Add --no-auth support for hf mfdes createapp
 2022-01-07 01:08:55 +13:00
Matt Moran 533b31bc6d Format code/strings 2022-01-07 01:03:43 +13:00
Matt Moran 6f510db9fb Fix incorrect CAD was written when removing credentials 2022-01-07 00:30:25 +13:00
Matt Moran 84ff84ffd0 Add hf gallagher diversify 2022-01-07 00:05:38 +13:00
Philippe Teuwen 5561466fe8 make style 2022-01-05 18:56:56 +01:00
Joshua Wright c0cc09d86b Style consistency changes for hf mfdes createapp feature addition 2022-01-05 07:12:20 -05:00
Matt Moran 82cd44e99f Reorder function definitions 
Order is roughly:
- exported helpers
- helpers
- read -> create -> delete
- exported commands
 2022-01-06 00:11:30 +13:00
Matt Moran 02e5fb6b1c Fix incorrect comments 2022-01-06 00:00:04 +13:00
Matt Moran de30ba90d1 Merge remote-tracking branch 'upstream/master' into feat/hf-gallagher 2022-01-05 23:56:33 +13:00
Matt Moran caebfdca62 Update license from LGPL to GPL 2022-01-05 23:54:18 +13:00
Matt Moran 8ecfc4af34 Make variables & function names snake_case 2022-01-05 23:53:03 +13:00
Matt Moran fad30294aa Format styles 2022-01-05 23:08:10 +13:00
Joshua Wright 859b55933d Add --no-auth support for hf mfdes createapp 2022-01-04 15:55:26 -05:00
Matt Moran 81da8a1317 Add hf gallagher delete command 2022-01-05 00:22:34 +13:00
Matt Moran 28437f018b Check if facility already exists in CAD 
Disallow duplicate credentials for the same facility (because readers won't handle it properly - I assume they'll just use the first entry?)
 2022-01-04 22:38:30 +13:00
Matt Moran d7989caad0 Automatically choose an new valid Gallagher AID 2022-01-04 22:15:00 +13:00
Matt Moran d3da798517 Move GallagherDiversifyKey to top of file 2022-01-04 21:14:18 +13:00
iceman1001 5ddfedbad0 cppcheck fix const 2022-01-04 07:32:58 +01:00
iceman1001 a7f3a42aff cppcheck fix const 2022-01-04 07:32:21 +01:00
iceman1001 ed10409bfd cppcheck fix uninitvar 2022-01-04 07:31:10 +01:00
iceman1001 cd825bfac8 cppcheck fixes 2022-01-04 07:28:20 +01:00
Matt Moran 28844756d9 Add default MIFARE Site Key 2022-01-04 18:19:42 +13:00
Matt Moran e129bee161 Fix print level should be ERR, was FAILED 2022-01-04 18:06:20 +13:00
Matt Moran f395b28643 Extract cadAidUintToByte and cadAidByteToUint 2022-01-04 18:06:02 +13:00
Matt Moran 21b080e49a Extract selectAid and authenticate commands 2022-01-04 17:42:05 +13:00
Matt Moran 1e3ed42f54 Extract CAD_AID to a constant 2022-01-04 17:04:05 +13:00
Matt Moran 863cf16015 Add comments and logging 2022-01-04 16:59:59 +13:00
Philippe Teuwen 0f9315391a Changed drastically Hitag S ARM code to remove state machines and ease way to build new commands, Fixed Hitag S crypto mode with key or NrAr, fixed lf hitag cc, fixed pwd dump in hitagS dump with LKP 2022-01-03 22:43:58 +01:00
iceman1001 3491157345 cppcheck fixes and other minor stuff 2022-01-03 22:17:40 +01:00
iceman1001 7b61c35948 textual change to trace list -h 2022-01-03 22:12:30 +01:00
iceman1001 0a4c9f83ac fixes to hf iclass configcard mem setup, textual output, MIX->NG convertion 2022-01-03 22:08:55 +01:00
Matt Moran aed687cb96 Add basic cloning support 2022-01-03 17:02:56 +13:00
Matt Moran 7b0a85a0af Fix incorrect types in encodeCardholderCredentials 2022-01-03 16:39:18 +13:00
Philippe Teuwen 89554501bb trace list: check protocol exists and allows to run without arg 2022-01-02 00:13:20 +01:00
iceman1001 0bad12fcac cppcheck 2022-01-01 17:45:43 +01:00
iceman1001 89becb8d9f cppcheck 2022-01-01 17:43:12 +01:00
iceman1001 4919d14c13 cppcheck fix 2022-01-01 16:29:51 +01:00
iceman1001 9a746db6f9 cppcheck fixes 2022-01-01 15:59:02 +01:00
iceman1001 a85fa6dfb7 mem leak fix 2022-01-01 15:46:41 +01:00
iceman1001 ea7f2e03d3 cppcheck fixes 2022-01-01 15:38:57 +01:00
Matt Moran 13ff8d50cf Add hf gallagher reader command 2022-01-01 22:22:57 +13:00
iceman1001 77f49c8efc text - unified 2022-01-01 09:39:05 +01:00
iceman1001 debf2796cc text - unified 2022-01-01 09:25:53 +01:00
Matt Moran 491c93e715 Add CardholderCredentials struct 2022-01-01 17:34:53 +13:00
Philippe Teuwen 7a5786b9e4 fix a number of strx usages 2022-01-01 02:39:10 +01:00
iceman1001 cb5cd18ff2 make even more obvious 2021-12-31 16:14:11 +01:00
Philippe Teuwen f81b772577 gview: fix parsing and desc 2021-12-31 12:54:58 +01:00
Philippe Teuwen 23b4a47e94 make style 2021-12-31 12:45:21 +01:00
iceman1001 7265b2708b text 2021-12-31 11:11:56 +01:00
iceman1001 f9ac27c223 text 2021-12-31 09:27:26 +01:00
iceman1001 9c2b5118df hf mf gview now support user supplied password 2021-12-31 09:24:10 +01:00
iceman1001 0cb1cfee6b text 2021-12-30 22:06:43 +01:00
Philippe Teuwen eb3c48cd25 make style 2021-12-30 12:41:23 +01:00
Philippe Teuwen 02f2318326 option --force to hf mfu rdb/wrbl and document how to set version & sig on ultimate card 2021-12-30 12:11:22 +01:00
Philippe Teuwen 85def31a8d hitag1/S trace: add crc check 
Example:

[usb] pm3 --> trace load -f traces/lf_HitagS256_dump.trace
[+] loaded 272 bytes from binary file traces/lf_HitagS256_dump.trace
[+] Recorded Activity (TraceLen = 272 bytes)
[?] try `trace list -1 -t ...` to view trace.  Remember the `-1` param
[usb] pm3 --> trace list -t hitags -c
[=] downloading tracelog data from device
[+] Recorded activity (trace len = 272 bytes)
[=] start = start of start frame end = end of frame. src = source of transfer
[=] Hitag1 / Hitag2 / HitagS - Timings in ETU (8us)

      Start |        End | Src | Data (! denotes parity error)                                           | CRC | Annotation
------------+------------+-----+-------------------------------------------------------------------------+-----+--------------------
          0 |          0 | Rdr |18(5)                                                                    |     |
        117 |        117 | Tag |21  a5  b4 [73]                                                          | !crc|
          0 |          0 | Rdr |00(5) 21  a5  b4  73 [8c]                                                |  ok |
        117 |        117 | Tag |c9  00  00  aa [75]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 00 [ab]                                                            |  ok |
        117 |        117 | Tag |21  a5  b4  73 [53]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 01 [b6]                                                            |  ok |
        117 |        117 | Tag |c9  00  00  aa [75]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 02 [91]                                                            |  ok |
        117 |        117 | Tag |48  54  4f  4e [2c]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 03 [8c]                                                            |  ok |
        117 |        117 | Tag |4d  49  4b  52 [1e]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 04 [df]                                                            |  ok |
        117 |        117 | Tag |00  00  00  00 [a6]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 05 [c2]                                                            |  ok |
        117 |        117 | Tag |00  00  00  00 [a6]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 06 [e5]                                                            |  ok |
        118 |        118 | Tag |00  00  00  00 [a6]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 07 [f8]                                                            |  ok |
        118 |        118 | Tag |57  5f  4f  4b [88]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 08 [43]                                                            |  ok |
 2021-12-30 01:46:41 +01:00
Philippe Teuwen 8a85702662 hitags: don't record SOF in trace and demodulate AC frame 2021-12-30 01:11:12 +01:00
Philippe Teuwen 323f70ff7a Add partial byte annotation in Hitag traces 
Example:
[usb] pm3 --> trace load -f traces/lf_HitagS256_dump.trace
[+] loaded 287 bytes from binary file traces/lf_HitagS256_dump.trace
[+] Recorded Activity (TraceLen = 287 bytes)
[?] try `trace list -1 -t ...` to view trace.  Remember the `-1` param
[usb] pm3 --> trace list -1 -t hitags -c
[+] Recorded activity (trace len = 287 bytes)
[=] start = start of start frame end = end of frame. src = source of transfer
[=] Hitag1 / Hitag2 / HitagS - Timings in ETU (8us)

      Start |        End | Src | Data (! denotes parity error)
------------+------------+-----+-----------------------------------------
          0 |          0 | Rdr |18(5)
        117 |        117 | Tag |0f(4) 2c  ab  cc  b3  cf  32  bf [2f]
          0 |          0 | Rdr |00(5) 21  a5  b4  73 [8c]
        117 |        117 | Tag |0f(4) c9  00  00  aa [75]
          0 |          0 | Rdr |0c(4) 00 [ab]
        117 |        117 | Tag |0f(4) 21  a5  b4  73 [53]
          0 |          0 | Rdr |0c(4) 01 [b6]
        117 |        117 | Tag |0f(4) c9  00  00  aa [75]
          0 |          0 | Rdr |0c(4) 02 [91]
        117 |        117 | Tag |0f(4) 48  54  4f  4e [2c]
          0 |          0 | Rdr |0c(4) 03 [8c]
        117 |        117 | Tag |0f(4) 4d  49  4b  52 [1e]
          0 |          0 | Rdr |0c(4) 04 [df]
        117 |        117 | Tag |0f(4) 00  00  00  00 [a6]
          0 |          0 | Rdr |0c(4) 05 [c2]
        117 |        117 | Tag |0f(4) 00  00  00  00 [a6]
          0 |          0 | Rdr |0c(4) 06 [e5]
        117 |        117 | Tag |0f(4) 00  00  00  00 [a6]
          0 |          0 | Rdr |0c(4) 07 [f8]
        117 |        117 | Tag |0f(4) 57  5f  4f  4b [88]
          0 |          0 | Rdr |0c(4) 08 [43]
 2021-12-29 23:48:16 +01:00
Philippe Teuwen 62a9f5dcc2 make style 2021-12-29 16:28:50 +01:00
Philippe Teuwen 11884de016 hf mf rdbl: fix example 2021-12-29 16:27:58 +01:00
Matt Moran a1db683673 Add basic structure for hf gallagher 2021-12-29 23:42:06 +13:00
Matt Moran f0b82c6311 Extract gallagher encoding/decoding 
Change input parameters to be `arg_u640` so that we can check they are the right lengths (and not have them silently truncated)
 2021-12-29 23:10:48 +13:00
Matt Moran ac216b6cbd Add comments for common AIDs 2021-12-29 14:43:54 +13:00
iceman1001 0d38da5de2 make style 2021-12-27 19:36:42 +01:00
iceman1001 e37a1a81ec remove arpa.inet dependency 2021-12-27 19:24:52 +01:00
iceman1001 ff1d66da61 remake style and output 2021-12-27 18:27:38 +01:00
Iceman 2a2f9275cd
Merge pull request #1549 from toucan12/ksx6924 
For testing KS X 6924 (South Korea's T-money card)
 2021-12-27 17:44:02 +01:00
iceman1001 6653bdc2be zx adaptations 2021-12-27 17:42:33 +01:00
Geonyeob Kim 182973a2ab
fix the translation 2021-12-27 09:51:24 +09:00
Geonyeob Kim cfc8670909
code-style 2021-12-27 01:28:26 +09:00
Geonyeob Kim b19117b6ab
KS X 6924 - Implement the initialize card function 2021-12-27 00:40:01 +09:00
Geonyeob Kim 18258af4f2
Supports KS X 6924 2021-12-27 00:37:26 +09:00
iceman1001 1b00c89115 fixing hf 15 dump 2021-12-25 18:51:23 +01:00
Oleg Moiseenko 7da4a34d7c
Merge pull request #1547 from merlokk/desf_buffer 
Desfire dynamic buffer allocation
 2021-12-24 20:56:13 +02:00
merlokk b3f2a18ec4 top level read command dynamic memory allocation 2021-12-24 19:14:48 +02:00
iceman1001 d7291aac29 add some capabilities 2021-12-24 15:09:19 +01:00
iceman1001 4ff7514232 fixs 2021-12-24 15:06:38 +01:00
iceman1001 69ea599fee skeleton for ZX8211 2021-12-24 13:32:28 +01:00
merlokk 74fc0a236c dynamic mem encoders/decoders 2021-12-24 12:27:01 +02:00
merlokk 02316e5fc3 DesfireExchangeEx dyn memory 2021-12-24 11:51:23 +02:00
merlokk f827b85cda low level dynamic memory 2021-12-24 11:46:16 +02:00
merlokk a622cc5879 fix mifate plus exchange bug 2021-12-23 19:33:44 +02:00
iceman1001 dd08c69f7e cleaner 2021-12-22 21:09:28 +01:00
Philippe Teuwen 2389d899b1 lf cmdread: change --crc to --crc-ht 2021-12-18 14:39:54 +01:00
Philippe Teuwen b7ad0c450f lf cmdread: add --crc to add Hitag/ZX8211 CRC 2021-12-18 01:34:14 +01:00
Philippe Teuwen c3864a0ce5 lf cmdread: add -k to keep field on 2021-12-18 00:43:11 +01:00
Philippe Teuwen 628766391e add mfValidateAccessConditions to warn when dealing with invalid MFC ACL 2021-12-17 21:29:09 +01:00
iceman1001 9123eeac2d added hf mf acl to decode and print MIFARE ACLs. Thanks for the idea @mwalker33! I know you did implement one but you never pushed it ;) 2021-12-17 03:08:35 +01:00
iceman1001 6173259a03 removing unused cmds 2021-12-13 18:45:40 +01:00
iceman1001 712ee2b10e strndup fixes for mingw 2021-12-13 18:44:46 +01:00
Philippe Teuwen bad5b92ec9
Merge pull request #1542 from GhostJumper/master 
fixed some spelling
 2021-12-13 17:39:35 +01:00
Unrea1 ff71c1630d fixed spelling 2021-12-13 17:26:52 +01:00
Philippe Teuwen 4b936bc20c safer logic when touching locally g_printAndLog 2021-12-13 03:16:57 +01:00
Philippe Teuwen 2722655658 fulltext: fix bug triggering session log 2021-12-13 02:58:03 +01:00
Philippe Teuwen b68a0ee082 readline autocomplete: fix rl_attempted_completion_over in script 2021-12-13 02:32:16 +01:00
Philippe Teuwen 6597d3e5a5 readline autocomplete: complete up to next space, so complete one single word at once 2021-12-13 02:29:32 +01:00
Philippe Teuwen 0673dd206e make style 2021-12-13 00:35:10 +01:00
Philippe Teuwen f2650e7279 readline autocomplete: complete up to next space, so complete one single word at once 2021-12-13 00:25:07 +01:00
iceman1001 a348f48602 Added readline autocomplete to proxmark3 client commands. Still works with shell filenames tab complete 2021-12-12 20:12:56 +01:00
iceman1001 287a99d186 hardnested - text output adaptation 2021-11-28 21:20:13 +01:00
iceman1001 0bcaf5b47a nfc decode - now acts text files as input if they have the extension EML. hacky.. 2021-11-24 20:24:45 +01:00
iceman1001 e6cc0ed836 nfc decode - detects and prints application/json 2021-11-24 20:23:34 +01:00
iceman1001 8f32d4fc9d textual 2021-11-19 00:44:41 +01:00
iceman1001 ad9f022308 fix hf iclass dump 2021-10-27 23:20:36 +02:00
iceman1001 644da79a50 add legic crc16 to lua 2021-10-23 23:53:59 +02:00
iceman1001 982e669a77 magsafe iterates 7a/7b/7c/7d for wupa 2021-10-23 20:45:46 +02:00
iceman1001 bff057d977 style 2021-10-23 18:57:50 +02:00
iceman1001 0e5e9163a1 added apple magsafe polling, thanks to @tcprst 2021-10-23 18:54:44 +02:00
Philippe Teuwen 908200bbac Add client option to run Python script 2021-10-18 23:46:00 +02:00
iceman1001 d1de0c99ea trace list -t 14a - annotate ecp 2021-10-17 11:39:19 +02:00
iceman1001 37b89c7b11 add ehanced contactless polling to 14a reader/raw commands 2021-10-17 11:38:37 +02:00
Philippe Teuwen dbec6edfa7 make style 2021-10-16 23:44:53 +02:00
Philippe Teuwen 232843477c typos 2021-10-16 23:44:53 +02:00
Philippe Teuwen 30d71a60ff Set history_path = NULL after free, hope it will fix history with spurious filenames 2021-10-16 12:26:26 +02:00
Philippe Teuwen e5d7ce61e6 MFULC trace: detect when known key is used during auth 2021-10-15 01:31:24 +02:00
Philippe Teuwen eeb3a4eebf Fix hf mfu cauth: option -k was both for key and keep 2021-10-14 19:23:04 +02:00
Philippe Teuwen c0444d4352 fix hf mf restore help text 2021-10-13 23:25:12 +02:00
Philippe Teuwen 0749117f0b Allow hw version in offline mode, to display client info 2021-10-11 22:15:50 +02:00
Philippe Teuwen 5f6c9d8c08 client: display compilation info 2021-10-11 20:56:15 +02:00
Philippe Teuwen d240367c2a Print client info also when offline 2021-10-11 20:29:17 +02:00
Philippe Teuwen 7240f133e5 remove comment as there is no such issue with new atr list 2021-10-11 12:17:26 +02:00
Philippe Teuwen 11d38f26d1 Replace ATR list by Ludovic Rousseau list 2021-10-10 21:31:49 +02:00
iceman1001 2c72763a5a fix resource leak 2021-10-10 19:01:49 +02:00
Colin O'Flynn 719f4bfcde Fix MF-DESFIRE decoding when not using wrapped cmds 2021-10-10 12:38:27 -03:00
iceman1001 d733a66c7b smart info, smart reader, now have ATR fingerprinting 2021-10-10 16:15:29 +02:00
iceman1001 2dadba9cee null checks 2021-10-10 15:33:39 +02:00
iceman1001 67632fdc24 remove special chars... 2021-10-10 15:33:23 +02:00
iceman1001 1ab9d24b5c calloc and check. remove add char. 2021-10-10 14:26:00 +02:00
Philippe Teuwen 2d38d721a3 malloc check 2021-10-10 12:36:41 +02:00
Philippe Teuwen 1139650948 atr_scrap_eftlab.py producing atrs.h compatible with make style 2021-10-10 12:31:03 +02:00
Philippe Teuwen b7ea848f7f getAtrInfo without regex engine 2021-10-10 12:26:47 +02:00
iceman1001 7dd5943d32 lc resonate calculator stuff 2021-10-10 11:48:21 +02:00
iceman1001 c93dfb712f atr fixes and regex test 2021-10-10 11:45:43 +02:00
iceman1001 dd391cda01 first draft at having a ATR lookup list available in project 2021-10-10 09:37:39 +02:00
Philippe Teuwen 88308ea727 typos 2021-10-10 01:35:45 +02:00
Philippe Teuwen 6f6a3161a9 Fix typos, applying Fix-spelling-errors.patch from Kali, thanks Sophie! 
da550dbec7 (6e9d1bb9c071feb1a5ad25ec24296a3f6751f2d1)
 2021-10-04 20:48:55 +02:00
Philippe Teuwen 1850e9fa40 Fix hf mf dump/auto/csave MFC JSON dumps - save real ATQA/SAK 2021-09-25 01:48:52 +02:00
iceman1001 347b5c9614 textual 2021-09-22 22:30:25 +02:00
Philippe Teuwen b5b946edfe save and load raw NDEF in hf * ndefread and in nfc decode 2021-09-22 21:33:37 +02:00
iceman1001 b00506ed4f adapt hf 14a info to detect different types of FUDAN. see http://www.proxmark.org/forum/viewtopic.php?pid=41195#p41195 2021-09-21 19:59:09 +02:00
iceman1001 d3696ee2c3 Revert "Release v4.14434 - crimson" 
This reverts commit 2c4c676db2.
 2021-09-18 21:44:56 +02:00
iceman1001 2c4c676db2 Release v4.14434 - crimson 2021-09-18 21:44:55 +02:00
iceman1001 e498b66ace fix #1504 - header or no header i keyblock dynamic memory. And clear trace log 2021-09-18 12:06:59 +02:00
iceman1001 7510fcee4f text 2021-09-17 18:28:12 +02:00
iceman1001 3bfc17e110 textual 2021-09-17 17:57:08 +02:00
merlokk 9db39e2493 add emv part 2021-09-13 15:20:33 +03:00
merlokk 775faaffd6 check cov 2021-09-13 14:46:44 +03:00
Philippe Teuwen efbfe4884e Revert "Fixed typo in the key table function" 
Nested is using N
StatiCnested is using C

This reverts commit 40e513a3c8.
 2021-09-12 20:22:35 +02:00
micsen 40e513a3c8
Fixed typo in the key table function 
statiCnested to staticNested
 2021-09-12 13:58:44 +02:00
Philippe Teuwen d516e37ace text 2021-09-11 01:32:43 +02:00
iceman1001 af91f119d2 reversed when message is printed 2021-09-10 21:31:47 +02:00
iceman1001 36e86b1ce0 text 2021-09-10 21:02:33 +02:00
iceman1001 e930d49aa5 textual 2021-09-10 20:40:26 +02:00
iceman1001 cd4ee68cce text 2021-09-10 19:40:23 +02:00
iceman1001 7e3c13fa0d hf mf sim - textual 2021-09-10 18:12:12 +02:00
iceman1001 8fee7e914e hf mf sim - textual 2021-09-10 18:11:19 +02:00
merlokk 735edf60d1 increase buffer len 2021-09-08 21:43:36 +03:00
Philippe Teuwen bac58d2a66 minor, to respect symmetry with writeblock 2021-09-07 10:18:05 +02:00
Philippe Teuwen 3e39689b6e Fix #1499 hf 15 restore and fix trace list -t 15 writeblock 2021-09-07 10:04:01 +02:00
Philippe Teuwen 9f36ce1b9d cppcheck reduce variable scopes 2021-09-05 23:42:14 +02:00
Philippe Teuwen d37547917e cppcheck fix name difference declaration/definition 2021-09-05 20:35:40 +02:00
Philippe Teuwen 5eda1ea400 Fix cppcheck dereferencing null pointer fix 2021-09-04 02:14:48 +02:00
Philippe Teuwen 1092abf12e Revert "cppcheck Passing NULL after the last typed argument to a variadic function leads to undefined behaviour" 
This reverts commit 8772edb6b8.
 2021-09-04 02:01:20 +02:00
Philippe Teuwen 7fdaac0319 fix zealous fix... 2021-09-04 01:24:08 +02:00
Philippe Teuwen b9e0b57cd8 cppcheck null pointer dereference 2021-09-04 00:54:59 +02:00
Philippe Teuwen 8772edb6b8 cppcheck Passing NULL after the last typed argument to a variadic function leads to undefined behaviour 2021-09-04 00:54:59 +02:00
Philippe Teuwen 58a963d41f cppcheck different declaration & definition arg names 2021-09-04 00:54:59 +02:00
Philippe Teuwen 3c47e78597 cppcheck remove redundant assignment 2021-09-04 00:54:59 +02:00
Philippe Teuwen 0c810ff4fd cppcheck Returning an integer in a function with pointer return type is not portable 2021-09-04 00:54:59 +02:00
Philippe Teuwen ba6ef2a1bc cppcheck redundant assignment 2021-09-04 00:54:59 +02:00
Philippe Teuwen 971c0126de cppcheck clarify mix of boolean and bitwise ops 2021-09-04 00:54:59 +02:00
Philippe Teuwen d3c6c430a8 cppcheck avoid dereferencing potentially null pointer 2021-09-04 00:54:59 +02:00
Philippe Teuwen 0830cfcf1c style to prevent cppcheck duplicate assignment warning 2021-09-04 00:54:59 +02:00
Philippe Teuwen 0db962640c cppcheck fix memleak 2021-09-04 00:54:59 +02:00
iceman1001 38694a3fea text 2021-09-03 21:19:12 +02:00
iceman1001 b8a04d6d69 text 2021-09-03 21:12:02 +02:00
Philippe Teuwen ce8cd5983b update emojis 2021-09-02 21:10:31 +02:00
Adam Hořčica 0d589b75d7
typo in mfu rdbl command help 2021-08-31 23:41:13 +02:00
merlokk cd4ea58449 hf mfp fix texts 2021-08-30 12:26:09 +03:00
Richard Knoll 7a6f503161 Fix PAC/Stanley checksum calculation 
The parity bit needs to be discarded when calculating the final
checksum byte value of PAC/Stanley card IDs. Verified by scanning
a tag which is now correctly identified.
 2021-08-28 14:28:06 +01:00
merlokk d46d23d079 make style 2021-08-25 14:44:06 +03:00
Oleg Moiseenko 143d0140db
Merge pull request #1483 from merlokk/lrp_detect 
hf mfdes detect with lrp mode and hf mfdes info updates
 2021-08-25 14:24:35 +03:00
merlokk 13b0dc73d5 fix 2021-08-25 14:15:48 +03:00
Philippe Teuwen 2938baaed6 text 2021-08-25 12:58:00 +02:00
merlokk 81343f0ec1 fix info, add there desfire light tests 2021-08-25 13:57:35 +03:00
merlokk 4bf3c43c7f fix select command via iso channel (with wrapper) 2021-08-25 13:28:39 +03:00
Philippe Teuwen 2b3cd6e604 Remove PACKED on internal client struct containing pointers, it can break mem alignment 2021-08-25 11:02:17 +02:00
Philippe Teuwen ba7f1b93b9 Remove PACKED on internal client struct containing pointers, it breaks mem alignment on clang-13 MacOSX 2021-08-25 10:49:47 +02:00
Philippe Teuwen 3cadd2906e Fix clang-13 warnings about unused variables 2021-08-25 10:10:46 +02:00
Philippe Teuwen ce4eed2acf
Merge pull request #1484 from AxisRay/fix-dynamic-stack-buffer-overflow 
fix dynamic-stack-buffer-overflow
 2021-08-24 16:50:55 +02:00
Ray Lee 8998b0b46c fix dynamic-stack-buffer-overflow 2021-08-24 22:36:59 +08:00
merlokk fddf7cf6b8 desfire info updates 2021-08-24 13:11:52 +03:00
merlokk 46f2defcd3 add auto select channel to lrp 2021-08-24 12:47:29 +03:00
Ray Lee 3c51ee4547 make style 2021-08-24 16:22:55 +08:00
Ray Lee cc3e2cc3a9 use memcmp 2021-08-24 14:23:32 +08:00
Ray Lee 7b59029cdb maybe better 2021-08-24 13:22:50 +08:00
Ray Lee d6145d76e7 fix buffer overflow 2021-08-24 10:43:32 +08:00
Philippe Teuwen 1cdddc270f typo 2021-08-23 11:06:38 +02:00
iceman1001 8edcfb925b text 2021-08-23 07:25:25 +02:00
merlokk d716971430 detect lrp authentication 2021-08-22 23:12:16 +03:00
iceman1001 23190a0070 wrong size 2021-08-22 21:35:02 +02:00
iceman1001 8c646cf1ca Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-08-22 21:32:19 +02:00
iceman1001 e811b35a6f ntag i2c 2k - fast write 2021-08-22 21:32:14 +02:00
merlokk df0c24cfad lsfiles fix 2021-08-22 22:29:21 +03:00
iceman1001 9c2cbe9fbb ntag i2c 2k select sector annotation 2021-08-22 21:16:33 +02:00
iceman1001 edc300ea97 ntag i2c 2k - select sector annotation 2021-08-22 21:02:11 +02:00
Philippe Teuwen a06765e5a8 fix missing NTAG sizes 2021-08-22 17:48:05 +02:00
Philippe Teuwen fdba7c2ff8 Safe check in sprint_bytebits_bin_break 2021-08-22 17:02:44 +02:00
Philippe Teuwen 0d7f93a8e7 Fix sprint_bin usages in hf mfu and felica 2021-08-22 16:53:15 +02:00
iceman1001 3e6bad8b02 textual 2021-08-22 16:05:33 +02:00
Philippe Teuwen b63dcb707e rework desfire declarations 2021-08-22 13:56:35 +02:00
mindseyex2 4f7b8c5c05
Update cmdhfmfu.c 2021-08-21 20:32:54 -07:00
Philippe Teuwen 58dda7a809 rename static globals g_* as gs_*, keep g_ only for exported globals 2021-08-22 00:51:37 +02:00
Philippe Teuwen ab450d6f57 add --mem to hf mf nested (brought from icopyx) 2021-08-21 23:56:54 +02:00
Philippe Teuwen 0f039582b3 icopyx retval, should be more generic... 2021-08-21 23:56:03 +02:00
Philippe Teuwen e7a9ec6154 icopyx: mfu restore also pwd & pack 2021-08-21 23:55:21 +02:00
Philippe Teuwen 33edfbc0ad icopyx disable em4x50 search 2021-08-21 23:54:42 +02:00
Philippe Teuwen 0384359aa4 icopyx bootloader safeguard 2021-08-21 23:52:15 +02:00
Philippe Teuwen f6d88dced2 rename typedef structs 2021-08-21 22:09:42 +02:00
Philippe Teuwen 5fce6271ee rename typedef struct pm3_device 2021-08-21 21:41:52 +02:00
Philippe Teuwen bae5362656 rename typedef structs 2021-08-21 21:41:34 +02:00
Philippe Teuwen dd3b63ae32 rename global session 2021-08-21 20:31:05 +02:00
Philippe Teuwen 6a2f2b3979 rename global conn 2021-08-21 20:21:08 +02:00
Philippe Teuwen 8280fc3c07 rename global version_information and its struct type 2021-08-21 20:11:22 +02:00
Philippe Teuwen d88c98a786 Reduce scope of a number of globals: 
APDUInFramingEnable atsFSC uid_label_map apdu_in_framing_enable uidmapping KENC_type KMAC_type jpeg_header jpeg2k_header *card_types card_app2_limit iclass_config_types jooks jooks_figures nfc_secret desdefaultkeys aesdefaultkeys k3kdefaultkeys CardAddresses default_3des_keys default_pwd_pack UL_TYPES_ARRAY UL_MEMORY_ARRAY fdxbCountryMapping translateTable invTranslateTable preamble paradox_lut pcf7931_config config DiArray FiArray FArray crc64_table signalprop
 2021-08-21 19:56:07 +02:00
merlokk b9300e94ce make style 2021-08-21 19:14:18 +03:00
Oleg Moiseenko 6505f0cbf3
Merge pull request #1474 from merlokk/lrp_dump 
Lrp dump command
 2021-08-21 19:05:52 +03:00
merlokk efece7a753 fix print bug 2021-08-21 19:00:27 +03:00
merlokk c340e979a2 dump command works with more cases 2021-08-21 18:54:22 +03:00
Philippe Teuwen ce57637c80 rename globals GraphTraceLen OddByteParity pm3_capabilities 2021-08-21 17:53:54 +02:00
Philippe Teuwen 6e0ce662c7 reduce scope of global ice 2021-08-21 17:49:14 +02:00
Philippe Teuwen a8bb07db3a remove unused global showDemod 2021-08-21 17:42:00 +02:00
Philippe Teuwen f1f2389fb4 rename globals GraphBuffer 2021-08-21 17:39:17 +02:00
Philippe Teuwen b02fef5c70 rename globals print_lock 2021-08-21 17:18:56 +02:00
Philippe Teuwen faaa70c860 rename globals CursorCPos CursorDPos CursorScaleFactor CursorScaleFactorUnit GraphPixelsPerPoint GraphStart GraphStop GridLocked GridOffset PlotGridX PlotGridY PlotGridXdefault PlotGridYdefault 2021-08-21 17:12:50 +02:00
Philippe Teuwen e4fbfe0f40 rename globals DemodBuffer and DemodBufferLen 2021-08-21 17:12:50 +02:00
Philippe Teuwen 45d4d361e9 reduce old_action scope to static global, rename for clarity 2021-08-21 17:12:50 +02:00
merlokk cc6837a9e4 CommitReaderID works via lrp and ev2 channel 2021-08-21 17:51:28 +03:00
merlokk a78c6a7721 print transaction counter 2021-08-21 16:57:48 +03:00
merlokk d3fbf3e596 add cmd to channel 2021-08-21 16:43:21 +03:00
merlokk f645d053b9 355638 2021-08-21 16:22:51 +03:00
merlokk 77c801da33 354821 2021-08-21 16:21:13 +03:00
Oleg Moiseenko 582c9eeb7d
Merge pull request #1471 from merlokk/lrp_value 
lrp value operations
 2021-08-21 15:51:04 +03:00
merlokk 62d98f2218 added abort transaction to the channel 2021-08-21 15:45:17 +03:00
merlokk a5668a91a2 fix setconfig 2021-08-21 15:42:28 +03:00
merlokk aac6c7dea7 fix write iso mode 2021-08-21 15:38:19 +03:00
Philippe Teuwen 6197482b77 Make sure g_trace is null when not allocated 2021-08-21 14:34:20 +02:00
merlokk 0b04e2284c fix read bug 2021-08-21 15:20:42 +03:00
merlokk 4ffddb3c6d add hints 2021-08-21 15:09:13 +03:00
merlokk 3d82da8ebe fix value operations in the encoded state 2021-08-21 14:52:45 +03:00
Philippe Teuwen 4087b5a288
Merge pull request #1469 from AxisRay/fix-double-free 
Fix double free error #1467
 2021-08-21 13:51:45 +02:00
merlokk 62a9a46cc7 make style 2021-08-21 14:28:40 +03:00
Oleg Moiseenko f6cee14f14
Merge pull request #1468 from merlokk/lrp_read 
Lrp data read/write commands
 2021-08-21 14:22:40 +03:00
merlokk db2c8776c0 clear record file works, lrp transaction check code 2021-08-21 14:12:49 +03:00
Ray Lee fd314882b2 fix double free 2021-08-21 16:59:56 +08:00
merlokk 09b4c3eed1 rename 2021-08-21 00:05:04 +03:00
merlokk 10561e9969 move transaction counter 2021-08-20 23:59:11 +03:00
merlokk f17dfa4e59 fix text. read/write/value commands works 2021-08-20 23:49:53 +03:00
merlokk 87c05faffd add link 2021-08-20 23:02:52 +03:00
merlokk 1b0ffac589 createmacfile works, print lrp transaction counter 2021-08-20 22:57:07 +03:00
merlokk 9d15190832 some help 2021-08-20 20:05:01 +03:00
merlokk b6118cbde9 add iso chaining options 2021-08-20 20:00:13 +03:00
merlokk f47b6f05d0 fix mode 2021-08-20 19:47:06 +03:00
merlokk e3a7b4ad1f fix header length behavior 2021-08-20 19:46:21 +03:00
merlokk 6516cfd665 create transaction mac file 1-byte command sketch 2021-08-20 19:25:44 +03:00
merlokk 534201b6d1 lrp delete file works. value operations in the plain mode works too 2021-08-20 18:53:56 +03:00
merlokk f3b368ebb6 value operations plain get works 2021-08-20 18:48:24 +03:00