Commit graph

8647 commits

Author SHA1 Message Date
iceman1001
3f54fdf252 textual 2020-04-01 09:49:11 +02:00
iceman1001
b0a76d5f02 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-01 09:28:14 +02:00
iceman1001
426246178f textual 2020-04-01 09:27:50 +02:00
iceman1001
d633340a1a Chg: 'data ndef' - cleaner output if called with no hex 2020-04-01 09:26:39 +02:00
iceman1001
83e92c6455 Add: 'hf mfu ndef' - read and parse NDEF type2 records 2020-04-01 09:25:54 +02:00
Oleg Moiseenko
842ec5f7d5
Merge pull request #633 from merlokk/sfix
ndef signature1 length fix
2020-03-31 19:26:29 +03:00
merlokk
737ebf9ab8 ndef signature1 length fix 2020-03-31 19:26:09 +03:00
Oleg Moiseenko
a70eec9a79
Merge pull request #632 from merlokk/mfp_fix
fix mfp behavior in info command
2020-03-31 19:13:50 +03:00
merlokk
6d3c13c49a fix mfp behavior in info command 2020-03-31 19:13:03 +03:00
Iceman
62a9746a24
Merge pull request #631 from uhei/trace-generic-doc
Doc: Update trace notes
2020-03-31 17:58:03 +02:00
Uli Heilmeier
0f6a1cd8c3 Doc: Update trace notes
First draft of some informations regarding trace command.
2020-03-31 17:54:51 +02:00
Oleg Moiseenko
aba229716b
Merge pull request #630 from merlokk/sig2
signatures v1 and v2 for ndef
2020-03-31 18:32:10 +03:00
merlokk
5b9c51fb7e signature decode r and s works 2020-03-31 18:30:44 +03:00
merlokk
38004f9db5 decode works 2020-03-31 18:25:17 +03:00
merlokk
74243fcb03 signatures v1 and v2 2020-03-31 18:09:41 +03:00
iceman1001
8dd19a00c5 support v2.0 ndef sigs 2020-03-31 16:11:01 +02:00
iceman1001
63e06e1738 textual 2020-03-31 16:05:19 +02:00
iceman1001
5618f71ac7 textual 2020-03-31 15:56:34 +02:00
iceman1001
160f150dce fixing NDEF 2020-03-31 15:47:33 +02:00
iceman1001
6eb36c5438 added new command 'data ndef' - for easy decoding of NDEF messages inside pm3 client 2020-03-31 15:33:07 +02:00
iceman1001
30eadac43d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-03-31 09:44:45 +02:00
iceman1001
392da6400a chg: waiting for shiftregisters (@pwpiwi) 2020-03-31 09:44:36 +02:00
iceman1001
e13a25902f added more sigs 2020-03-31 08:11:27 +02:00
iceman1001
978dde98a9 added more sigs 2020-03-31 08:06:45 +02:00
iceman1001
8eef5d188c fix coverity 226432 2020-03-30 22:25:00 +02:00
Iceman
09d9688800
Update 4_Advanced-compilation-parameters.md 2020-03-30 16:36:05 +02:00
Iceman
4920bd8ab0
Update Makefile.hal 2020-03-30 16:31:54 +02:00
Iceman
9ca14acf5e
Update Mac-OS-X-Homebrew-Installation-Instructions.md 2020-03-30 15:27:32 +02:00
Iceman
7f87482d2d
Merge pull request #629 from uhei/makefile_checks
Makefile: target checks for macOS
2020-03-30 15:24:02 +02:00
iceman1001
4178017536 chg: hf legic dump - change filename template 2020-03-30 15:18:25 +02:00
iceman1001
690a2b89e0 textual 2020-03-30 15:16:11 +02:00
iceman1001
83a5ffbb10 textual 2020-03-30 15:12:37 +02:00
iceman1001
924ad84c59 textual 2020-03-30 15:12:06 +02:00
iceman1001
c8b51ccf25 chg: legic standalone - now saves read cards to flashmemory (RDV4)\n also simulates correct cardtype.\n It goes direct into recording / reading a tag. Once a complete dump is done, it starts to simulate 2020-03-30 15:11:48 +02:00
Uli Heilmeier
0733310300 Makefile: target checks for macOS
recode is missing on macOS by default.
grep on macOS is BSD grep by default.
2020-03-30 11:03:43 +02:00
Iceman
7af2457158
Merge pull request #625 from uhei/legic-standalone
Standalone mode: Adding Legic Prime read/sim run
2020-03-30 10:59:35 +02:00
Uli Heilmeier
db02a1f306 HF_Legic: remove global variable and cleanup
As requested by @iceman1001:
* removed global variable
* updated according to make style
* added entry in CHANGELOG.md
2020-03-30 10:22:45 +02:00
Iceman
a1ae0523ac
Merge pull request #626 from Windslab/patch-1
textual
2020-03-29 07:53:13 +02:00
iceman1001
b70a78f9ed Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-03-29 07:48:36 +02:00
iceman1001
a79a11256a revert 2020-03-29 07:48:01 +02:00
Winds
9356549bc6
textual
Correcting a script name
2020-03-28 18:23:05 +03:00
Iceman
efeff2d0f6
Update cheatsheet.md 2020-03-28 15:05:52 +01:00
Uli Heilmeier
8c8a86cb83 Standalone mode: Adding Legic Prime read/sim run
This commit adds a standalone mode for Legic Prime.
It reads and simulates a Legic tag.
Tested with MIM1024 tags.
MIM256 and MIM512 should work to. We just read the data and for simulating
we pretend to be a MIM1024 card.

Co-authored-by: Stefanie Hofmann <>
2020-03-27 14:08:45 +01:00
iceman1001
82d99522b4 textual 2020-03-27 11:56:47 +01:00
iceman1001
ffb8ad9873 defaults 2020-03-26 21:04:58 +01:00
iceman1001
063b393eba textual 2020-03-26 20:36:38 +01:00
iceman1001
15726268bf fix: hf mf fchk - exit on button press 2020-03-26 09:30:59 +01:00
iceman1001
5e21566201 coverity 274112 - unintended sign extension 2020-03-25 17:41:10 +01:00
iceman1001
b0b5bcda76 textual 2020-03-25 17:27:19 +01:00
iceman1001
a9571d26b0 fix coverity 274113 2020-03-25 16:49:19 +01:00