rfidrig/proxmark3
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-09-11 18:29:22 -07:00
Code Issues Packages Projects Releases Wiki Activity
14,832 Commits 3 Branches 20 Tags
0b65f2bc9e835885378e32e1fe05076e29bc05e3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Philippe Teuwen 4b7a8f02d4 fix 'lf ti demod' segfault 2022-01-11 15:06:22 +01:00
Philippe Teuwen b15f7c4789 Inject readline markers only if using readline 2022-01-11 14:27:07 +01:00
Philippe Teuwen 105d5334db make style to remove zx 2022-01-11 02:15:54 +01:00
Philippe Teuwen 65cc181307 update license header 2022-01-11 00:38:10 +01:00
Philippe Teuwen 21061d6d55 Removing client/android library cmake, not needed anymore 2022-01-10 10:27:39 +01:00
Philippe Teuwen 081edec89b text 2022-01-09 17:52:16 +01:00
Philippe Teuwen dee65c8036 recover_pk: better warning if OpenSSL doesn't provide required curve (Fedora I'm looking at you) 
cf https://bugzilla.redhat.com/show_bug.cgi?id=1019390#c25
 2022-01-09 17:49:46 +01:00
Philippe Teuwen 1a408d62a5 simplify release tests as PLATFORM doesn't influence tests 2022-01-09 17:06:26 +01:00
Philippe Teuwen f11ae25213 Disable ht2crack5gpu as ht2crack5opencl supercedes it and ht2crack5gpu can be difficult to get running on setups supporting OpenCL on more than one Nvidia GPU 2022-01-09 16:34:31 +01:00
Philippe Teuwen 6b0b9682aa arch docker 2022-01-09 16:09:50 +01:00
Philippe Teuwen bb098c4eab Disable zx for the release as it's still WIP 2022-01-09 14:46:28 +01:00
Philippe Teuwen 33ef5f4243 use ARRAYLEN 2022-01-09 14:25:10 +01:00
Philippe Teuwen 2269ad6914 Remove ARRAY_LENGTH, we've already ARRAYLEN 2022-01-09 14:19:48 +01:00
Philippe Teuwen 5a4584358c make style 2022-01-09 14:10:26 +01:00
Philippe Teuwen 9686e4712b text 2022-01-09 13:41:16 +01:00
Philippe Teuwen 12a01eb487 mailmap 2022-01-08 14:25:12 +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
Philippe Teuwen 4acbcb8b42 fix mailmap 2022-01-08 02:03:08 +01:00
Philippe Teuwen e34870a732 text 2022-01-08 01:47:30 +01:00
Philippe Teuwen 8f402c5861 text 2022-01-08 01:26:51 +01:00
Philippe Teuwen 89fe7639e0 Merge pull request #1554 from startrk1995/15693-sniff-rdv4-flashmem 
15693 sniff rdv4 flashmem
 2022-01-08 01:23:21 +01:00
Philippe Teuwen be18b9478d fix ldscript 2022-01-08 01:12:37 +01:00
Philippe Teuwen 30aa7aa7d1 Adapting license headers, WIP 2022-01-08 00:40:52 +01:00
Philippe Teuwen 0d8971916f Add mailmap 2022-01-07 01:57:48 +01:00
Philippe Teuwen ad5e2b46a1 fix tests 2022-01-06 21:00:52 +01:00
Philippe Teuwen 2562811433 Revert "get android cmake running on host, only for testing" 
This reverts commit 3edf9a0975.
 2022-01-06 20:26:20 +01:00
Philippe Teuwen ac681a5836 fix Android CMake 2022-01-06 20:24:18 +01:00
Philippe Teuwen 3edf9a0975 get android cmake running on host, only for testing 2022-01-06 20:18:08 +01:00
Philippe Teuwen e618fbcd28 typo 2022-01-06 20:14:58 +01:00
Philippe Teuwen 3d61cf1eed release checklist 2022-01-06 20:08:17 +01:00
Philippe Teuwen ebba11b3f5 make style 2022-01-06 20:05:26 +01:00
Philippe Teuwen a315254a88 style 2022-01-06 19:46:35 +01:00
Philippe Teuwen 9718af480a Avoid com port in commands.json 2022-01-06 15:18:56 +01:00
Philippe Teuwen 8f77179a2f remove unused file 2022-01-06 11:25:38 +01:00
Philippe Teuwen bcafc5d03c some historical copyright adjustments, thanks @iceman1001! 2022-01-06 11:24:04 +01:00
Philippe Teuwen b703bb746b Adapting license headers, WIP 2022-01-06 02:20:38 +01:00
Philippe Teuwen 8952a1f712 adapt contributing text 2022-01-06 00:37:34 +01:00
Philippe Teuwen cdfb83075f toc 2022-01-06 00:24:15 +01:00
Philippe Teuwen 014817f854 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/>.
 2022-01-06 00:22:44 +01:00
Philippe Teuwen 5561466fe8 make style 2022-01-05 18:56:56 +01:00
Philippe Teuwen 2d1a1dc034 make style doc/commands.json 2022-01-05 17:57:49 +01:00
Philippe Teuwen fc53665e5c Merge pull request #1552 from joswr1ght/master 
Add --no-auth support for hf mfdes createapp
 2022-01-05 17:52:44 +01:00
Philippe Teuwen a6d22ee435 Merge pull request #1553 from zkldi/patch-1 
Use pacman -Syu instead of pacman -Sy
 2022-01-05 11:35:41 +01:00
Philippe Teuwen c522046392 make style on doc/commands.json 2022-01-03 22:46:19 +01: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
Philippe Teuwen 89554501bb trace list: check protocol exists and allows to run without arg 2022-01-02 00:13:20 +01:00
Philippe Teuwen 7a5786b9e4 fix a number of strx usages 2022-01-01 02:39:10 +01:00
Philippe Teuwen a4a51a0833 update commands.json 2021-12-31 12:55:10 +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
Philippe Teuwen ca44df03d1 reorder magic notes 2021-12-30 23:01:45 +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 e5c20fc850 Add HitagS trace 
Acquired with:
[usb] pm3 --> lf hitag reader --01
[#] Authenticating using nr,ar pair:
[#] 00 00 00 00 00 00 00 00
[#] Page[ 0]: 73 B4 A5 21
[#] Page[ 1]: AA 00 00 C9
[#] Page[ 2]: 4E 4F 54 48
[#] Page[ 3]: 52 4B 49 4D
[#] Page[ 4]: 00 00 00 00
[#] Page[ 5]: 00 00 00 00
[#] Page[ 6]: 00 00 00 00
[#] Page[ 7]: 4B 4F 5F 57
 2021-12-29 17:13:13 +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
Philippe Teuwen e68c56b89c update notes on ultimate card: presets 2021-12-29 16:01:24 +01:00
Philippe Teuwen 1c1de3142b update notes on ultimate card 2021-12-29 14:49:42 +01:00
Philippe Teuwen 3a7c114d45 update notes on ultimate card 2021-12-29 13:44:19 +01:00
Philippe Teuwen 13f7ca0fb3 update notes on ultimate card 2021-12-29 03:24:42 +01:00
Philippe Teuwen 17b369cc52 Backport mbedtls fix for gcc 11.1 2021-12-18 23:42:25 +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
Philippe Teuwen 9e666e2ebe docker kali 2021-12-15 01:42:01 +01:00
Philippe Teuwen acb23acfc5 docker parrot 2021-12-15 01:27:24 +01:00
Philippe Teuwen 4beb851cfc docker build-all script 2021-12-15 01:08:05 +01:00
Philippe Teuwen c104ec275b docker ubuntu 2021-12-15 01:06:19 +01:00
Philippe Teuwen f664b426c8 docker fedora-35 2021-12-15 00:28:25 +01:00
Philippe Teuwen 2997bd5bf5 fix release tests 2021-12-14 22:44:38 +01:00
Philippe Teuwen bad5b92ec9 Merge pull request #1542 from GhostJumper/master 
fixed some spelling
 2021-12-13 17:39:35 +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 a5d491d67a Missing src in cmake files 2021-12-13 02:07:44 +01:00
Philippe Teuwen ce2148b22c namespace-protect static vars in standalone modes to avoid conflits when merged with dankarmulti 2021-12-13 01:56:57 +01:00
Philippe Teuwen 0b96ed9865 standalone: take examples not requiring flash in dankarmulti 2021-12-13 01:29:43 +01:00
Philippe Teuwen 0379f01d74 checks: Add missing standalone and adapt checklist instructions 2021-12-13 01:06:29 +01:00
Philippe Teuwen d61d624b45 tabs 2021-12-13 00:42:02 +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
Philippe Teuwen 5ede492544 Merge pull request #1525 from xxr3376/patch-1 
Fix typo in CUID soft-bricked recovery command
 2021-10-26 17:52:56 +02:00
Philippe Teuwen 908200bbac Add client option to run Python script 2021-10-18 23:46:00 +02:00
Philippe Teuwen 2820c22288 uniformize changelog 2021-10-18 23:21:18 +02:00
Philippe Teuwen b9c47ed6cc changelog 2021-10-18 23:10:15 +02:00
Philippe Teuwen 4a458b2b79 typos 2021-10-18 22:35:12 +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 f4487abed7 Merge pull request #1520 from FlUxIuS/master 
Adding iCS tags default key from ICopy-X
 2021-10-15 13:52:35 +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 ca741cdfea Add MFULC auth trace with default key 2021-10-14 19:23:45 +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 af40da27cd Ignore new QT build file 2021-10-14 09:50:55 +02:00