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

15381 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iceman1001 7d7b608485 text 2022-03-19 20:24:16 +01:00
iceman1001 507d5a43ba new param to view command to print all keys nicely and also print all found value blocks, if any 2022-03-19 20:23:11 +01:00
Iceman ff5be54f45
Merge pull request #1628 from equipter/master 
update mfc_default_keys.dic
 2022-03-19 20:17:55 +01:00
Andy 4decd73ea8
update mfc_default_keys.dic 
added 2 keys. 4 different cards, 1 staff 3 student all had same keys in same places
 2022-03-19 18:32:16 +00:00
Yann GASCUEL d1e186dbe9 iso15: fix 2SC (FSK) slow decoding 
Previous decoding "count" constants have too large scale that may bug
with some answer. With those new constants, this bug can't happend anymore.
 2022-03-16 17:36:37 +01:00
Yann GASCUEL abb840558f iso15: add support for slow and 2SC to GetIso15693AnswerFromTag() 
Allow running raw iso15 cmd expecting slow and/or dual subcarriers
answers. E.g. sending slow 2SC inventory ("hf 15 raw -c -d 250100") is
now working.
 2022-03-16 17:25:27 +01:00
Yann GASCUEL 3aaa824238 Merge branch 'iso15sniffslow1sc' into iso15rawSlowAnd2SC 2022-03-16 16:12:07 +01:00
Yann GASCUEL f65ca5f14c iso15 sniff: add support for slow answers with single subcarrier 
Before this commit, slow answers was only supported for dual
subcarriers answers.
 2022-03-16 16:11:50 +01:00
Yann GASCUEL a387f6774e iso15: move FSK code up (before all functions that may use it) 2022-03-16 16:09:57 +01:00
Yann GASCUEL 6fb74b976f iso15: fpga: add support for 2SC in READER_MODE_RECEIVE_AMPLITUDE 
FPGA_HF_READER_MODE_RECEIVE_AMPLITUDE | FPGA_HF_READER_2SUBCARRIERS_424_484_KHZ
flags will return 2 fsk bits (same ones as in sniffing mode: '10' =>
424kHz, '01' => 484kHz, '11' => unknown signal and '00' for no signal
received) in addition to the signal amplitude (on 14 bits) on 424kHz.
 2022-03-16 16:09:50 +01:00
Yann GASCUEL 3880ef8da3 iso15 sniff: add support for slow answers with single subcarrier 
Before this commit, slow answers was only supported for dual
subcarriers answers.
 2022-03-16 16:00:02 +01:00
Yann GASCUEL 352850d158 iso15: update TODO / BUGS / ISSUES with support of iso15 2SC sniff 2022-03-16 15:54:14 +01:00
Yann GASCUEL c5f216558c iso15sniff: add an "iclass" bool parameter to SniffIso15693() 
This is required to disable ISO15 flags parsing when sniffing iClass
because those flags don't exist in iClass coms (iClass iso15 based
communications are always fast and using only one subcarrier).
 2022-03-16 11:26:07 +01:00
joetomasone 974b762f0f
Update T5577_Guide.md 
Added infomation on traceability data and Keysy
 2022-03-14 14:46:07 -04:00
iceman1001 63612c9375 data diff - handle different lengths 2022-03-13 21:42:38 +01:00
iceman1001 85f16fd471 textual 2022-03-13 04:45:32 +01:00
iceman1001 15b8eb5935 coverity fixes 2022-03-13 04:27:23 +01:00
iceman1001 a45082e045 increase string line array 2022-03-13 03:57:10 +01:00
iceman1001 1953cd953b codeQL fix 2022-03-13 03:54:37 +01:00
iceman1001 a7d099bc2b remove debug statement 2022-03-13 03:08:46 +01:00
iceman1001 7fe8354b47 added ascii to diff command output 2022-03-13 03:04:04 +01:00
iceman1001 1916fa31b5 build error 2022-03-12 20:05:27 +01:00
iceman1001 1222d995ef remove c param 2022-03-12 19:21:09 +01:00
iceman1001 8a54e103cc added a new command 2022-03-12 18:57:56 +01:00
iceman1001 045f30d00d refactoring function to download file from spiffs 2022-03-12 18:57:06 +01:00
Yann GASCUEL 6d37410d33 iso15 sniff: fix alignment 2022-03-08 17:29:34 +01:00
Iceman 085faa189b
Merge pull request #1620 from lnv42/standalone15 
Make HF_15SNIFF standalone mode compatible with old PM3 (without flashmem)
 2022-03-08 16:10:02 +01:00
Philippe Teuwen f256e14831 text, to test CodeQL fix by github 2022-03-08 16:03:08 +01:00
Yann GASCUEL 3e784557fc iso15 sniff: improve iso15 FSK decoding (ARM part) 2022-03-08 10:11:34 +01:00
Yann GASCUEL b2c5a52fd7 iso15 sniff: remove unused FPGA hi_read_fsk.v 2022-03-08 10:11:25 +01:00
Yann GASCUEL 07013a5aaf iso15 sniff: commit some unused FPGA FSK code for history 2022-03-08 10:11:22 +01:00
Yann GASCUEL 38d49097f9 iso15 sniffing: intragrate 2SC sniffing in same FPGA mode 
switching Fpgamode while sniffing with FpgaWriteConfWord() was
sometimes too long so the tag answer start was lost.
Now, (only with FPGA_BITSTREAM_HF_15) with "FPGA_HF_READER_MODE_SNIFF_AMPLITUDE |
FPGA_HF_READER_2SUBCARRIERS_424_484_KHZ": the amplitude is shrank
from its 2 LSB bits and those 2 bits are now used to return the current
frequency. From my tests, this 2 bits reduction does not affect
quality of 1SC sniffing, but it may have slightly reduced the
receiving range.

FPGA FSK decoding code is also improved.
 2022-03-08 10:11:14 +01:00
Yann GASCUEL 1f7bce5580 iso15 sniffing: add support for dual subcarriers tag answers 2022-03-08 10:11:08 +01:00
Yann GASCUEL 9010a4b828 make HF_15SNIFF standalone mode compatible with old pm3 (without flash) 2022-03-08 10:10:17 +01:00
nemanjan00 e4c641b708 Add first and last block for READ_MULTI_BLOCK 2022-03-07 02:09:36 +01:00
Philippe Teuwen 1818fc6b52
Merge pull request #1617 from s00se/patch-1 
Update instructions for Termux
 2022-03-06 22:31:20 +01:00
s00se a4f15bd2db
Update instructions for Termux 
Remove "tested setups". This seems extraneous.
Direct users to F-Droid for Termux
Use correct directory from git clone
 2022-03-06 13:16:25 -07:00
Philippe Teuwen 355bc88827 fix typo 2022-03-03 01:11:11 +01:00
iceman1001 a13b770abb linking in the new guide 2022-03-02 21:46:04 +01:00
Iceman 24ebcb13e8
Merge pull request #1614 from maxieds/patch-1 
Create Mac-OS-X-Compile-From-Source-Instructions.md
 2022-03-02 21:40:47 +01:00
Maxie D. Schmidt 074f40e9f8
Update Mac-OS-X-Compile-From-Source-Instructions.md 2022-03-02 05:30:49 -05:00
Philippe Teuwen e1a00f609f USER not defined on some platforms like Archlinux 2022-03-02 10:27:58 +01:00
Philippe Teuwen bf522bf663 make accessrights: Silent error when no bluetooth group 2022-03-02 10:27:58 +01:00
Maxie D. Schmidt 76bb9ed575
Update Mac-OS-X-Compile-From-Source-Instructions.md 2022-03-01 15:58:45 -05:00
Maxie D. Schmidt eb85ba4ebd
Create Mac-OS-X-Compile-From-Source-Instructions.md 
New documentation file to provide installation from source instructions on MacOS. This procedure has been tested on MacOS Big Sur.
 2022-03-01 15:44:05 -05:00
Philippe Teuwen ab5213126d test removal of qt5 symlink hack for osx 2022-02-28 17:00:23 +01:00
Philippe Teuwen 5fb37ee406 Try to remove symlink hack for openssl in osx CI 2022-02-28 16:17:37 +01:00
Philippe Teuwen 14ce85a3c7 oops again, but I blame someone else who will recognize himself ;) 2022-02-28 16:14:53 +01:00
Philippe Teuwen 17fc498786 mfd_aes_brute: add openssl include path for macports too, just in case 2022-02-28 16:13:04 +01:00
Philippe Teuwen 91df68d8cd oops typo in copy/paste 2022-02-28 16:02:13 +01:00