RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-05 23:17:58 +08:00
Code Issues Projects Releases Packages Wiki Activity
11450 commits 3 branches 14 tags 88 MiB
Commit graph

2632 commits

Author SHA1 Message Date
tharexde
f930e78650 added write and write_password functions 2020-06-16 23:24:44 +02:00
tharexde
b1b6f0d8b7 added write and write_password functions 2020-06-16 23:24:35 +02:00
tharexde
ef9ccde512 added EM4x50 info function 2020-06-15 14:32:51 +02:00
tharexde
f5ff2c12eb added EM4x50 info function 2020-06-15 14:32:44 +02:00
tharexde
1fe83eaf25 added EM4x50 info function 2020-06-15 14:32:34 +02:00
tharexde
ffec9d5a18 added EM4x50 info function 2020-06-15 14:32:23 +02:00
iceman1001
62ce1cdf13 chg: increase stack size - hf mfu simlation needs it 2020-06-14 12:16:27 +02:00
iceman1001
88a42c6108 chg: ntag215/amiibo, empty header, use hardcoded values 2020-06-14 07:41:21 +02:00
iceman1001
e71e70bd9d minor 2020-06-12 17:50:11 +02:00
iceman1001
3832cf26fd color 2020-06-11 19:20:59 +02:00
Philippe Teuwen
54cbaf5b87 textual 2020-06-11 13:24:55 +02:00
slurdge
05ed3f7018 Second try to fix appveyor 2020-06-11 12:12:20 +02:00
slurdge
53c5456f7a Fix ptr arithmetic hopefully 2020-06-11 11:35:15 +02:00
slurdge
35857f535d Compute the max usage 2020-06-11 11:14:53 +02:00
slurdge
c11c7ab545 Add support for client getting bigbufsize 2020-06-10 23:03:03 +02:00
slurdge
df4bdc89ea Fix BIGBUF_SIZE used in #WITH_FLASH 2020-06-10 19:06:40 +02:00
slurdge
c89fc81fcf Make BigBuf take dynamically the available space with a fixed (4K) stack 2020-06-10 12:41:18 +02:00
iceman1001
ea73746d32 text 2020-06-10 09:02:58 +02:00
iceman1001
9d1cbaddf9 text 2020-06-10 08:56:45 +02:00
Philippe Teuwen
e3e33a6501 Use SumAdc also in ListenReaderField 2020-06-10 01:09:58 +02:00
Philippe Teuwen
0ce3be2f34 Reintroduce AvgAdv, avoid *64 as it could easily overflow 
This reverts partly commit 9189dc8563.
 2020-06-10 00:10:39 +02:00
iceman1001
9189dc8563 applied theremin patch, adc values are summed, remember to divide when read 2020-06-09 23:37:56 +02:00
Philippe Teuwen
224cb2ffd7 make style 2020-06-08 03:15:10 +02:00
Iceman
fc1f137f0c
Merge pull request #759 from slurdge/lz4_new 
[WIP] Zlib->LZ4 change
 2020-06-07 18:43:44 +02:00
slurdge
33781b1fd8 Move most of libs to thumb mode. 2020-06-07 17:29:25 +02:00
iceman1001
4e29909cc2 chg: pointer casting to sort out array out of bonds 2020-06-07 15:59:06 +02:00
iceman1001
09548ecf51 cleaning some code 2020-06-07 13:56:21 +02:00
Philippe Teuwen
381b47f64e lz4: add memmove to arm string.c 2020-06-07 12:46:34 +02:00
Philippe Teuwen
d48fcbf5eb lz4stream info to int: use memcpy 2020-06-07 12:46:05 +02:00
slurdge
1a8eff5d42 add lz4 to arm side 2020-06-05 16:24:05 +02:00
Philippe Teuwen
6980429bd4 ARM: remove contradictory flag -fno-strict-aliasing as we have -fstrict-aliasing in Makefile.common 2020-06-02 14:12:28 +02:00
iceman1001
89f43c1221 cppchecker 2020-06-02 12:58:37 +02:00
iceman1001
e67c515451 fix cppchecker 2020-06-02 12:49:18 +02:00
iceman1001
3d67bde0d9 old->mix 2020-05-27 17:58:34 +02:00
Philippe Teuwen
f30ccd0f51 Makefile: fix cp version for armsrc 2020-05-22 13:43:57 +02:00
Philippe Teuwen
8e12285f66 introduce CROSS_*FLAGS for cross-compilation 2020-05-21 19:28:42 +02:00
Philippe Teuwen
e2a20631c7 remove section version_information for client 2020-05-20 21:11:45 +02:00
Philippe Teuwen
577380ae48 color ARM/FPGA version sections 2020-05-20 21:11:45 +02:00
Philippe Teuwen
0172b0638b Makefile: wrap sh and perl calls 2020-05-20 21:11:45 +02:00
Philippe Teuwen
ef586c2a41 version info also for client, still cmake to do 2020-05-20 21:11:45 +02:00
iceman1001
35886fab91 chg: must have a default return value 2020-05-20 18:30:41 +02:00
iceman1001
30be05ec3f chg: removed debugstatements, the code doesnt use them 2020-05-20 18:28:43 +02:00
iceman1001
b22ea6f846 fix: matty_run eloadcard 2020-05-20 18:28:10 +02:00
Philippe Teuwen
be42995f8a Less fantasy in the LogTrace usages regarding timestamps 2020-05-19 20:19:44 +02:00
Philippe Teuwen
37ae102e38 LogTrace error msg 2020-05-19 19:09:25 +02:00
Philippe Teuwen
cb8d589fc4 armsrc: clarify static vars vs global vars, part 3 2020-05-19 18:12:40 +02:00
Philippe Teuwen
b556810776 armsrc: clarify static vars vs global vars, part 2 2020-05-19 17:25:58 +02:00
iceman1001
4d355192bf remove inline 2020-05-19 17:16:23 +02:00
iceman1001
47634f5550 change: remove inline directive in armsrc, since we are optimizing for size 2020-05-19 17:15:07 +02:00
Philippe Teuwen
3e7512a5d5 armsrc: clarify static vars vs global vars 2020-05-19 17:05:43 +02:00
Philippe Teuwen
fbaf634779 legicrf & gcc 10: Remove inline warning 2020-05-19 16:34:00 +02:00
Philippe Teuwen
23d754c85f fix max duration in LogTrace 2020-05-19 02:48:03 +02:00
Philippe Teuwen
a999243a45 use tracelog struct in arm too 2020-05-19 02:39:39 +02:00
Philippe Teuwen
4dac94c772 clarify BUTTON macro usages 2020-05-15 00:00:42 +02:00
Philippe Teuwen
3f71be870b cppcheck on hf_mattyrun 2020-05-14 23:26:41 +02:00
Philippe Teuwen
3c44ef39f7 fix REV macros & hitagS 2020-05-14 17:52:09 +02:00
Philippe Teuwen
98a254ba65 hitagS, untested 2020-05-14 17:17:23 +02:00
iceman1001
12e942febc coverity - remove bad shift, (untested) 2020-05-14 09:59:06 +02:00
iceman1001
ed11e4a093 cppcheck fix, assign a value 2020-05-14 09:18:51 +02:00
Philippe Teuwen
ffdd338dea make style 2020-05-14 01:04:26 +02:00
Philippe Teuwen
1c8c1d82ea fix coverity 267211 & 267206 logically dead code 2020-05-14 01:01:48 +02:00
Philippe Teuwen
c43b9085f9 fix coverity 274112 unintended sign extension 2020-05-14 00:31:22 +02:00
iceman1001
b4cc7a9ad3 coverity fix, stricter checks for available memory when checking mifare keys 2020-05-13 13:40:52 +02:00
iceman1001
6e7a8e1bfc chg: enforce stricter limit checks for available pwds in flash mem 2020-05-13 13:26:02 +02:00
Philippe Teuwen
1ee8696e47 Fix issue #729. Avoid stalling on non-rdv4 when polling for FeliCa without card in proximity 2020-05-13 00:36:52 +02:00
iceman1001
8f188a5329 redundant 2020-05-12 10:27:54 +02:00
iceman1001
00b67e2cdd remove warnings of unused 2020-05-11 22:12:46 +02:00
Dmitriy Loginoov
8b8d60c667 Fixed compiler warnings. 2020-05-11 18:18:47 +03:00
Dmitriy Loginoov
91b8569391 Added changelog line, fixed mode order in Makefiles, added line to documentation. 2020-05-11 17:52:35 +03:00
Dmitriy Loginoov
f4e8fc89a8 Rewrited lf_em4100rwc standalone mode, added card bruteforce mode. 2020-05-11 16:58:16 +03:00
Philippe Teuwen
8160131119 fix standalone warnings 2020-05-11 13:48:57 +02:00
Philippe Teuwen
5f1ff72f7c arm: fix warnings discarded-qualifiers 2020-05-11 13:48:57 +02:00
Philippe Teuwen
026707b960 arm: fix prototypes 2020-05-11 13:48:57 +02:00
Philippe Teuwen
838d345918 resolve inline warnings 2020-05-11 13:48:57 +02:00
Philippe Teuwen
99b55a36e4 arm: remove redundant declarations 2020-05-11 13:48:57 +02:00
Philippe Teuwen
2f293e211a show compiler version 2020-05-11 10:21:32 +02:00
Philippe Teuwen
93c1be689a lfsampling: interruptible only when logging not yet triggered 2020-05-09 00:23:46 +02:00
iceman1001
a96e94b872 coverity fix 2020-05-08 21:13:01 +02:00
iceman1001
3720ff144d coverity nags 2020-05-08 16:26:58 +02:00
iceman1001
3716d4d823 convert OLD->MIX 2020-05-08 12:42:10 +02:00
Philippe Teuwen
0cb21c89c3 doc 2020-05-02 23:11:49 +02:00
iceman1001
00fb88ee4c cppcheck fix, make var conditional 2020-04-29 20:34:47 +02:00
iceman1001
f1f3742333 coverity fix 279922 2020-04-29 20:09:23 +02:00
Philippe Teuwen
1410d4d9b5 lf sim: better to return err on faulty offset, thanks @iceman 2020-04-29 20:07:04 +02:00
Philippe Teuwen
b3f84bf7b3 make style 2020-04-29 19:41:45 +02:00
Philippe Teuwen
a626725477 lf sim: fix offset of last packet 2020-04-29 19:41:10 +02:00
Philippe Teuwen
155d30ce49 coverity fix 226278 and offset computation as side effect 2020-04-29 19:19:26 +02:00
iceman1001
4c640805b6 coverity fix: 267208 2020-04-29 16:57:52 +02:00
iceman1001
ae14272117 coverity fix: 279923, flawed logic. how to signal to device to use the default keys? 2020-04-28 14:46:40 +02:00
iceman1001
f1cdb68c52 fix: cppchecker complains on null. Not sure if that should be a valid call. I guess @cjbrigato will let me know if I messed up 2020-04-28 13:30:43 +02:00
Philippe Teuwen
04a16ddeb5 msdsal fix bug after var de-shadowing, move stuff around 2020-04-26 17:44:45 +02:00
iceman1001
f416fa9b4f cppchecker fixes 2020-04-26 12:56:19 +02:00
Philippe Teuwen
0219aed591 arraylen 2020-04-24 18:44:42 +02:00
Philippe Teuwen
011f973e7f make style 2020-04-24 18:21:38 +02:00
Philippe Teuwen
0fe80c4a2d sorting modes 2020-04-24 18:20:37 +02:00
Philippe Teuwen
773b27954d rename standalone template 2020-04-24 18:11:27 +02:00
Philippe Teuwen
9db1c10230 new HF_MSDSAL as default standalone 2020-04-24 17:54:12 +02:00
Salvador Mendoza
9c4bfa5dcb Update hf_msdsal.c 2020-04-24 16:42:41 +02:00
Salvador Mendoza
d98897c3d5 Update iso14443a.h 2020-04-24 16:42:40 +02:00
Salvador Mendoza
a06d05cc95 Update iso14443a.c 2020-04-24 16:42:40 +02:00
Salvador Mendoza
9cd58bd9f0 Create hf_msdsal.c 2020-04-24 16:42:40 +02:00
Salvador Mendoza
88d9ad2829 Update iso14443a.c 2020-04-24 16:42:40 +02:00
Salvador Mendoza
ae1cb436ae Update iso14443a.h 2020-04-24 16:42:40 +02:00
Salvador Mendoza
3535c2ffb0 Update iso14443a.c 2020-04-24 16:42:40 +02:00
Salvador Mendoza
80c98455ac Update Makefile.inc 2020-04-24 16:42:40 +02:00
Salvador Mendoza
7f0e759b60 Update Makefile.hal 2020-04-24 16:42:40 +02:00
Philippe Teuwen
af43bdd728 doc 2020-04-23 22:36:15 +02:00
Philippe Teuwen
8bdda55115 Fix prompt colors in log -> spurious space in color macros -> adjust lots of files... 2020-04-22 02:22:55 +02:00
Philippe Teuwen
a68b8983f2 make style 2020-04-21 01:56:51 +02:00
Nahuel Grisolía
da81424348 OTP-TEAR 2020-04-18 21:37:31 +02:00
iceman1001
c6473afcc1 text 2020-04-16 09:53:31 +02:00
Philippe Teuwen
94192d0976 make style 2020-04-16 09:01:14 +02:00
iceman1001
054f28e783 fix #682 - hf mf sim - not working good with MCT Tool app. Actually it didnt work at all 2020-04-14 16:18:14 +02:00
Bjoern Kerler
e543637897 PICC Format fixes 2020-04-13 01:19:26 +02:00
Bjoern Kerler
f7c40e83bd Make style 2020-04-13 01:00:06 +02:00
Bjoern Kerler
4501805709 Port des on device to mbedtls_des 2020-04-12 20:58:41 +02:00
Bjoern Kerler
c06864dcc7 Rename due to name conflict 2020-04-12 18:09:14 +02:00
Bjoern Kerler
309ec0d942 Fixes 2020-04-12 17:59:46 +02:00
Bjoern Kerler
44e9d13d1a Make style 2020-04-12 17:41:36 +02:00
Bjoern Kerler
f76de40982 Rework auth for client and device 2020-04-12 17:39:11 +02:00
Bjoern Kerler
7aa27cfefb Auth of des, 3des and aes working. 2020-04-12 17:10:27 +02:00
Bjoern Kerler
637103224d Fixes 2020-04-11 11:32:31 +02:00
Bjoern Kerler
63c7710976 Fix 2k3 key handling 2020-04-11 03:05:46 +02:00
Bjoern Kerler
6afc8d39a4 Add 2k3 des iso support preparation 2020-04-11 02:56:48 +02:00
Bjoern Kerler
37aa19ad6c Add 2k3 des iso support preparation 2020-04-11 02:56:08 +02:00
Bjoern Kerler
4c2f98ac3d Add first 3K3 support. Improve algo error handling 2020-04-11 02:32:55 +02:00
Bjoern Kerler
fceae52e68 Add 3K3 basic support 2020-04-11 01:39:24 +02:00
Bjoern Kerler
52b41fc883
Merge pull request #22 from RfidResearchGroup/master 
Update
 2020-04-10 23:01:52 +02:00
Bjoern Kerler
70b000bc79 Make style 2020-04-10 22:59:55 +02:00
Bjoern Kerler
08469f940a Replace MIX and OLD Commands 2020-04-10 22:52:16 +02:00
Bjoern Kerler
68faa88e6a Auth test 2020-04-10 21:02:46 +02:00
iceman1001
732c012be7 adjustments 2020-04-10 10:27:28 +02:00
Bjoern Kerler
82323b14e2 Make style 2020-04-10 01:18:48 +02:00
Bjoern Kerler
c9b27732f5 Make ISO auth work 2020-04-10 00:14:45 +02:00
Bjoern Kerler
c4831ccd9b Do not deselect at end of auth 2020-04-10 00:03:23 +02:00
Bjoern Kerler
8983324c21 Make host cmds more flexible 2020-04-09 23:49:14 +02:00
Bjoern Kerler
8571a770fe Make auth random 2020-04-09 23:30:49 +02:00
Bjoern Kerler
d49885dd12 Fix des auth 2020-04-09 23:16:18 +02:00
Bjoern Kerler
7aba4ffff1 Fix frame command for auth 2020-04-09 22:39:31 +02:00
iceman1001
75eff352c9 MIX 2020-04-08 05:29:22 +02:00
iceman1001
342a85ef7e MIX 2020-04-08 05:27:54 +02:00
iceman1001
a42a817ff3 MIX, also removeed returning mem, since its not used. We use downloadEMbuffer instead 2020-04-08 05:27:27 +02:00
iceman1001
c155b62111 MIX 2020-04-08 05:15:39 +02:00
iceman1001
5ef16fe016 mix 2020-04-08 05:14:19 +02:00
Bjoern Kerler
3833b8ee3b Add Mifare Desfire GetDFNames and improve HF MFDES Enum output 2020-04-07 21:30:12 +02:00
Bjoern Kerler
26975187ee Fix desfire aes authentification 2020-04-07 09:14:44 +02:00
iceman1001
95b48f25ef coverity fix 2020-04-06 10:55:18 +02:00
mwalker33
b9371d2915 Timing Bug 2020-04-05 12:11:45 +10:00
iceman1001
34adf411c3 layout, text, colors - mfu info, 15 info 2020-04-04 12:17:55 +02:00
Iceman
4920bd8ab0
Update Makefile.hal 2020-03-30 16:31:54 +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
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
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
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
20547d773b cppchecker - buffer overflow 2020-03-24 13:27:33 +01:00
iceman1001
90a9c215de cppchecker missing includes 2020-03-24 11:59:22 +01:00
iceman1001
b63495cce7 cppchecker missing includes 2020-03-24 11:56:03 +01:00
iceman1001
a8aadb2751 cppchecker missing includes 2020-03-24 11:45:57 +01:00
iceman1001
1f5de5debd hitag sniff, use edgemode 2020-03-24 10:08:11 +01:00
Artem Gnatyuk
0abba96eb6 Add my modes after merging. 2020-03-22 00:03:16 +07:00
Artem Gnatyuk
3fb4045c16 Merge branch 'master' into lf_emul 2020-03-21 23:47:09 +07:00
Artem Gnatyuk
c36d86bc01 Make style 2020-03-21 21:39:30 +07:00
Artem Gnatyuk
097595cdef [RDV4] Readed IDs store to file in spiffs 2020-03-21 21:27:57 +07:00
Artem Gnatyuk
311f43172f LF_EM4100EMULV1 - renamed to LF_EM4100EMUL. Make more easy control. Short click - switch slot and satrt simulation 
LF_EM4100EMULV2 - deleted.
LF_EM4100EMULV3 - renamed to LF_EM4100RWC
 2020-03-21 15:48:16 +07:00
iceman1001
8ef3f34384 update ex4x05 timing, @mwalker (@marshmellow42, 1ebf9f2560) 2020-03-20 11:09:23 +01:00
iceman1001
fe0d9c8d9f hf mfdes enum - fixes WIP 2020-03-17 11:37:38 +01:00
iceman1001
1cb495e40b add desfire light signature verification check 2020-03-17 01:50:27 +01:00
iceman1001
7a7a3d014e hf mfdes info - remake to work with Desfire Light. Switch to apdu framing. WIP 2020-03-16 21:51:45 +01:00
Daniel Underhay
132bd6c1f7 Add colour to hf 14a and hf mfu commands 2020-03-15 19:57:47 +11:00
Philippe Teuwen
7ad649130a fix lf_icehid on gcc v8 2020-03-13 18:19:12 +01:00
root
aa0c2845cb more temp fix for PRIx32, PRIu32 : lf_icehid , hf_young 2020-03-13 13:15:06 -04:00
Philippe Teuwen
78a2a6891f Add PRIx64 for gcc-arm-none-eabi v8 2020-03-13 18:03:57 +01:00
iceman1001
f13149826c cppchecker format macro 2020-03-13 13:52:55 +01:00
iceman1001
294d2aa96b cppchecker 2020-03-13 13:52:29 +01:00
iceman1001
f6e013c7fc cppchecker 2020-03-13 13:52:23 +01:00
Iceman
d63d6d0978
Merge pull request #575 from bosb/fix_hitags_sim 
hitagS fix sim + write
 2020-03-11 12:57:12 +01:00
iceman1001
57788d5751 whitespace 2020-03-10 17:11:57 +01:00
iceman1001
f805e5c7c7 whitespace 2020-03-10 17:10:05 +01:00
iceman1001
a751684a31 style 2020-03-09 17:11:11 +01:00
iceman1001
59bae5000c style 2020-03-09 16:57:13 +01:00
iceman1001
074f6c374e add: hf mf personlize - Personalize the UID of a Mifare Classic EV1 card (@pwpiwi) see 0b4efbdef2 2020-03-09 11:02:26 +01:00
Artem Gnatyuk
a4b8c14e1e Fix version number 2020-03-08 00:13:13 +07:00
Artem Gnatyuk
4b07fecd6b Add missed files 2020-03-08 00:07:38 +07:00
Artem Gnatyuk
618925b15c Final version 2020-03-07 23:25:24 +07:00
bosb
0cde69ee22 cleanup 2020-03-06 17:08:08 +01:00
iceman1001
393d998ad9 fix downloading lf config 2020-03-05 11:27:42 +01:00
iceman1001
b6dcfbf078 chg: allow to download ´lf config´ settings to client 2020-03-05 11:16:05 +01:00
bosb
95b759a799 removed duplicate code 2020-03-01 22:48:49 +01:00
iceman1001
4bd9f183df fix coverity 267206 2020-03-01 17:11:25 +01:00
iceman1001
d11716110f fix coverity 267215 2020-03-01 16:39:25 +01:00
bosb
05dc1f7e5f fix send frame, some config bytes from tag, use global dbg level 2020-02-29 18:35:56 +01:00
iceman1001
9dc419cec5 partial fix for mattyrun 2020-02-28 10:01:52 +01:00
bosb
33ba0c6f36 hitags fix uid sim + write 2020-02-25 20:19:00 +01:00
iceman1001
743325e90f chg: make it slower 2020-02-24 20:39:12 +01:00
iceman1001
cfcb049459 chg: hitag2 now obeys 'lf conf' divisor setting 2020-02-23 10:45:23 +01:00
iceman1001
d0241ed24f does this solve opensuse warning? 2020-02-22 19:59:54 +01:00
iceman1001
802e62285b debug print hitag2 for cleaner client outputs 2020-02-22 13:34:15 +01:00
iceman1001
181a659bc0 trying another loop 2020-02-22 13:32:42 +01:00
iceman1001
b304adeeca hitag, determine adc levels to get better demodulation 2020-02-22 13:16:04 +01:00
iceman1001
2ec4bc9a0e old->mix 2020-02-22 13:14:43 +01:00
Thorsten Bosbach
912cbe9713 hitagS print whole memory + print succeeded challenges 2020-02-14 18:33:13 +01:00
iceman1001
36f2234121 fix HF simulation 2020-02-12 10:29:00 +01:00
iceman1001
3924d71f37 too small chararray 2020-02-04 21:57:33 +01:00
iceman1001
a9ffcc6892 textual 2020-02-04 17:37:19 +01:00
iceman1001
9bf26c080d chg: icehid now records HID/AWID/IO/EM4100.. 2020-02-03 21:39:44 +01:00
iceman1001
4be59e295f whitespace 2020-02-03 21:37:51 +01:00
iceman1001
4f912abaf6 Add 'lf_icehid' - new standalone mode for reading lf HID credentials and store it to RDV4 flashmem 2020-01-30 17:05:59 +01:00
iceman1001
a612cc9414 device side hid demodulate use colors 2020-01-30 16:43:18 +01:00
Michael Farrell
4c76d54c9a add standalone module for sniffing iso14a to flash 
This module is intentionally simple, and doesn't do anything fancy.
 2020-01-30 21:41:09 +11:00
iceman1001
e25300843e chg: fchk/chk keys - tiny bit faster 2020-01-29 17:30:42 +01:00
iceman1001
9448ec4052 hitagstuff 2020-01-29 17:26:08 +01:00
iceman1001
60b444d5d8 no inline 2020-01-29 08:18:45 +01:00
iceman1001
ebc04ea27e hitag sim changes 2020-01-29 05:14:18 +01:00
iceman1001
a9a57e4a92 forgot header 2020-01-29 05:12:36 +01:00
iceman1001
04bca3cdb7 fix partial data acqusitions not use bigbuff_malloc 2020-01-29 04:37:10 +01:00
iceman1001
cf65145353 less waiting 2020-01-24 20:12:34 +01:00
iceman1001
688fb78235 fix for compiling with pm3others 2020-01-22 21:14:05 +01:00
iceman1001
fc1cede778 fix: #536 2020-01-22 18:43:20 +01:00
Iceman
9b1aa02c77
Merge pull request #535 from RfidResearchGroup/hitag 
Hitag
 2020-01-22 17:49:40 +01:00
iceman1001
48f7b3bdb6 same param names 2020-01-22 17:41:59 +01:00
Iceman
53927b6a5c
Merge pull request #532 from RfidResearchGroup/hitag 
Hitag
 2020-01-22 13:21:19 +01:00
iceman1001
e0cd9c38da test: hitag to use decimation on sample to save space 2020-01-22 13:13:04 +01:00
iceman1001
fc2e11a6cd rename function 2020-01-22 13:12:09 +01:00
iceman1001
f4b3488a09 chg: 'hf mf static' - now uses file on spiffs for key transfers. speedup on RDV4 2020-01-22 13:11:20 +01:00
Iceman
8835f6678c
Merge pull request #531 from RfidResearchGroup/hitag 
Hitag
 2020-01-22 13:06:18 +01:00
Iceman
03bae8f9b8
Merge pull request #530 from 7homasSutter/master 
Fix FeliCa Light Dump
 2020-01-21 18:50:01 +01:00
Thomas Sutter
35131a52c9 Fix FeliCa Light Dump function 2020-01-21 18:07:18 +01:00
iceman1001
f04be0c044 chg: hitag write - works 2020-01-20 11:58:22 +01:00
iceman1001
cb67feee19 documentation 2020-01-17 17:06:46 +01:00
iceman1001
df5083603c first attempt 2020-01-17 15:02:21 +01:00
iceman1001
f25beac361 less checks in time critical loops 2020-01-17 14:25:57 +01:00
iceman1001
56bb7f21dc rename define T0 2020-01-17 14:25:28 +01:00
iceman1001
958754edf4 enforce following lf config 2020-01-16 10:42:39 +01:00
Philippe Teuwen
091a594063 hitag: more timings 2020-01-16 01:12:34 +01:00
Philippe Teuwen
631c11e22c hitag: use defines 2020-01-16 00:57:21 +01:00
Philippe Teuwen
f2eec56fb7 hitag: cosmetic 2020-01-16 00:49:05 +01:00
Philippe Teuwen
9df6fa8e8e hitag: stop detecting if response header is corrupted 2020-01-16 00:26:39 +01:00
Philippe Teuwen
7a27f5dddb rephrase debug 2020-01-16 00:26:39 +01:00
Philippe Teuwen
870bbd1f77 hitag: comment data dump 2020-01-16 00:26:39 +01:00
Philippe Teuwen
d2fb44710f Abort when Manchester goes wrong rather than outputting wrong values 2020-01-16 00:26:39 +01:00
Philippe Teuwen
52640422f1 hitag: wip timings in trace, still "lf hitag list" hangs quite often... 2020-01-16 00:06:47 +01:00
Philippe Teuwen
3d95590fc9 hitag: comment debug messages in critical loop 2020-01-15 23:26:02 +01:00
Philippe Teuwen
65de9ca2c2 hitag: RX was logged twice 2020-01-15 23:25:30 +01:00
Philippe Teuwen
aa0879eee4 reduce window included in wait_1 before response to avoid phantom symbols 2020-01-15 23:22:42 +01:00
Philippe Teuwen
da048ea491 fix hitag demodulation when first positive period is not detected 2020-01-15 22:07:49 +01:00
Philippe Teuwen
b2db893e83 fix hitag demodulation when ending on unexpected period count + completion with last half 2020-01-15 21:14:16 +01:00
Philippe Teuwen
b57f40e3d7 make style 2020-01-15 19:26:12 +01:00
Philippe Teuwen
78a6aa389b Merge branch 'master' into hitag 
* master:
  style
 2020-01-15 19:25:39 +01:00
Philippe Teuwen
7c33eeb7d5 style 2020-01-15 19:25:29 +01:00
Philippe Teuwen
5eef25bb5f fix again delay in acquisition 2020-01-15 19:19:58 +01:00
Philippe Teuwen
8ec57a7281 clear bit first in pushBit so we don't need initialized buff 2020-01-15 17:29:01 +01:00
Philippe Teuwen
cfc76098c5 Merge branch 'master' into hitag 
* master:
  Fix delay in acquisition and DoAcquisition_config usage. Fixes #524
  chg: 'data samples' - colors
  only set new timeout if its faster :)
 2020-01-15 16:28:27 +01:00
Philippe Teuwen
33033612bc Fix delay in acquisition and DoAcquisition_config usage. Fixes #524 2020-01-15 16:17:58 +01:00
iceman1001
2412961411 only set new timeout if its faster :) 2020-01-15 12:47:40 +01:00
Philippe Teuwen
6c0d6f0655 hitag: wip 2020-01-15 02:02:42 +01:00
Philippe Teuwen
4154f3dd1a fix compilation 2020-01-14 22:58:38 +01:00
iceman1001
89bae75c55 hitag signal refactoring 2020-01-14 22:08:43 +01:00
iceman1001
b37a4c14eb Add 'hf mf staticnonce' - a nested find all key solution command for tags that has a static nonce. \n See https://github.com/RfidResearchGroup/proxmark3/issues/133 \n See https://github.com/Proxmark/proxmark3/issues/899 \n This solution is based upon the ideas and solutions of @uzlonewolf and @xtigmh . Thanks! 2020-01-14 16:00:31 +01:00
Philippe Teuwen
fe5b3b0911 fix compilation bug 2020-01-13 11:36:39 +01:00
iceman1001
eb9f67635b chg: enable/disable hf fpga tracing 2020-01-13 10:34:59 +01:00
iceman1001
6fa188062c style 2020-01-12 17:30:29 +01:00
iceman1001
ed67936892 style 2020-01-12 17:28:12 +01:00
iceman1001
355a7e4458 noo 2020-01-12 17:21:19 +01:00
iceman1001
6e3dde9d76 add 'hf plot' - from offical repo (piwi) 2020-01-12 16:45:24 +01:00
iceman1001
2e37c04a15 Add: 'hf plot' - implement function from offical repo (piwi) 2020-01-12 15:33:06 +01:00
iceman1001
621eb12976 fix: lf simulation, wrong offsets in majormode 2020-01-12 00:30:23 +01:00
iceman1001
0869cbc6ad Fix: 'lf config' - calling without param messes up all device settings. 2020-01-09 19:28:44 +01:00
iceman1001
9662556ccb style 2020-01-07 22:19:59 +01:00
iceman1001
2bfbcb20ac Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-01-07 22:05:56 +01:00
iceman1001
f7156e7485 chg: adapted lfsampling, and swapped from 'silent' logic to the more natural 'verbose' logic 2020-01-07 22:05:01 +01:00
danshuk
2cac27ed53 chg: lf pac sim *wip* 2020-01-06 19:38:44 +00:00
iceman1001
a62aed9fe9 add: added nrz simulation for lf. *wip* 2020-01-04 20:01:06 +01:00
iceman1001
f304528fc0 add: added nrz simulation for lf. *wip* needs pattern for nrz. 2020-01-04 20:00:37 +01:00
iceman1001
c97775e907 style 2020-01-04 16:16:43 +01:00
iceman1001
110446799c coverty 263981 2020-01-04 15:55:50 +01:00
iceman1001
51ad5c2332 cppcheck 2020-01-03 18:55:13 +01:00
iceman1001
5b51f4b4ee cppcheck 2020-01-02 15:34:50 +01:00
iceman1001
9fac23567b cppcheck 2020-01-01 22:44:50 +01:00
Iceman
3d2b0f6a90
Merge pull request #504 from bosb/hitags_fixes 
Fix hitagS reader output
 2020-01-01 22:17:31 +01:00
iceman1001
608d38c4b5 cppcheck 2020-01-01 22:13:24 +01:00
Thorsten Bosbach
1d9c771a43 guard debug output 2020-01-01 22:11:50 +01:00
Thorsten Bosbach
3e90f831ff changelog entry + print load file content 2020-01-01 21:15:40 +01:00
iceman1001
1815730783 style 2020-01-01 20:54:10 +01:00
iceman1001
2b76c8b669 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-01-01 20:50:03 +01:00
iceman1001
0dc6f38741 cppcheck 2020-01-01 20:48:21 +01:00
iceman1001
ffb596373f cppcheck 2020-01-01 20:48:11 +01:00
iceman1001
27f7dd6dec some function def (hitag) 2020-01-01 20:47:39 +01:00
iceman1001
ca85559309 some function def (hitag) 2020-01-01 20:47:27 +01:00
iceman1001
21ffdec1cd chg: hitag refactoring (@anon) 2020-01-01 18:18:34 +01:00
osboxes.org
7a22d334e2 style 2019-12-31 22:31:43 +01:00
osboxes.org
944242d929 style 2019-12-31 21:32:24 +01:00
Thorsten Bosbach
714d5105e7 fix hitagS read/info output 2019-12-31 17:22:10 +01:00
iceman1001
7dc65bf0f7 cppcheck 2019-12-30 22:21:41 +01:00
iceman1001
56d25b0786 cppcheck 2019-12-30 21:40:31 +01:00
iceman1001
fd4edc390f cppcheck 2019-12-30 21:39:48 +01:00
iceman1001
eb635a2efc cppcheck 2019-12-30 21:37:56 +01:00
iceman1001
2cfe4d33c5 cppcheck 2019-12-30 21:31:59 +01:00
iceman1001
e5db57747c cppcheck 2019-12-30 21:31:56 +01:00
iceman1001
e2f59d215f cppcheck 2019-12-30 21:29:04 +01:00
iceman1001
ddaa884064 cppcheck 2019-12-30 21:22:51 +01:00
iceman1001
7eac4818ab cppcheck 2019-12-30 21:19:51 +01:00
iceman1001
60719c7788 cppcheck 2019-12-30 21:17:37 +01:00
iceman1001
1c94056057 cppcheck 2019-12-30 21:17:02 +01:00
iceman1001
f428b016c1 cppcheck 2019-12-30 21:11:18 +01:00
iceman1001
fb0eb35710 style 2019-12-30 16:27:51 +01:00
iceman1001
3a18fe6ea1 fix: some more adaptations 2019-12-30 13:25:15 +01:00
iceman1001
0c8ead0bd6 fix: forgot some changes 2019-12-30 13:11:44 +01:00
iceman1001
6121d816e7 Chg: faster authentication by lower timeout limit. (@pwpiwi) 2019-12-30 12:50:44 +01:00
iceman1001
657061f8d5 fix: use defines.. 2019-12-26 23:41:30 +01:00
iceman1001
094c9905b0 hitag rework - WIP 2019-12-24 10:20:07 +01:00
iceman1001
a6a48f0e6d Chg 'hf 14a info' - static/fixed nonce detection 2019-12-23 15:23:04 +01:00
iceman1001
bd70689de2 hf mf nested: break bad loop if timeout (@uzlonewolf) 2019-12-14 12:45:07 +01:00
unknown
ecaf919365 Hf15FindAfi WaitForResponse loop 2019-11-27 21:14:31 +02:00
unknown
931d115ef8 HF15FindAfi now uses reply_ng and added LeaveFieldOn option for HF15Raw 2019-11-27 15:11:43 +02:00
iceman1001
585ce7556c add empty command to enable client side to break loops on device side, like sim 2019-11-18 18:48:21 +01:00
iceman1001
93c9dc571f chg t55 timings to match offical repo when compiling for PM3OTHER 2019-11-12 19:27:34 +01:00
bogiton
5e72d6e714
Update hf_bog.c 2019-11-08 17:42:17 +00:00
iceman1001
182f239d21 make style 2019-11-08 12:00:21 +01:00
iceman1001
5cca8616cb Add: 'hf mfu otptear' - draft of @fukmar implementation for a tear-off attack against OTP block on Mifare Ultralight based card. 2019-11-08 10:28:29 +01:00
iceman1001
014a3dee99 fix: iclass simulation (iceman) 2019-11-07 09:43:32 +01:00
iceman1001
68ac8dd979 fix: cotag use NG 2019-11-04 15:42:28 +01:00
iceman1001
c1e88f1a9b fix: cotag on device side... 2019-11-04 15:13:59 +01:00
bogiton
85acdfe109
Update hf_bog.c 2019-11-02 18:06:02 +00:00
iceman1001
f7256b77f7 fix: lf fdx sim - now two pm3 (one sim other read) will detect. Also works against proper verichip reader. 2019-11-02 18:10:39 +01:00
Thomas Sutter
b4c1333ac3 Remove unused comments. 
Change boolean for src.
 2019-11-01 15:37:53 +01:00
Thomas Sutter
42fd13985f Make style. 2019-11-01 15:19:09 +01:00
Thomas Sutter
dadad1dacf Fix felica sniffing. 2019-11-01 15:06:48 +01:00
Thomas Sutter
1a852e02c7 Fix sniffing command. 
Refactor hf list felica.
 2019-10-30 13:35:03 +01:00
Thomas Sutter
eba19c0bd6 Make style. 2019-10-29 13:35:09 +01:00
Thomas Sutter
498c4b8377 Refactor FeliCa structs. 2019-10-29 10:22:47 +01:00
Philippe Teuwen
129b1c4b1f make sure all .c include their own .h 2019-10-26 18:56:36 +02:00
Philippe Teuwen
eb7268cd98 lf: change macros to allow float freq, change 134 -> 134.2 2019-10-25 00:42:47 +02:00
Philippe Teuwen
cb06bea448
Merge pull request #451 from 7homasSutter/felica_support_read_without_encryption 
Felica support: add commands request response and read without encryption
 2019-10-24 21:33:27 +02:00
Thomas Sutter
bfd5214cd5 Add read_without_encryption command. 2019-10-24 16:08:44 +02:00
Philippe Teuwen
0b48147485
Merge pull request #447 from 7homasSutter/felica_support_request_service 
Felica support: add command request service
 2019-10-24 12:32:25 +02:00
Philippe Teuwen
2e47e00e94
Merge pull request #449 from mwalker33/dev 
Broken "lf em 410x_sim" fix
 2019-10-24 12:31:50 +02:00
mwalker33
fc800d97b5 Update appmain.c 2019-10-24 19:06:59 +11:00
Philippe Teuwen
e872ac58f7 coverity 263770 fix dead code 2019-10-24 01:30:54 +02:00
Thomas Sutter
2274383129 Remove crc methode. Add CRC macro. 
Change help text for request service.
 2019-10-23 09:21:43 +02:00
Thomas Sutter
3f56116615 Add felica request service all nodes command. 
Make style.
 2019-10-22 17:03:54 +02:00
Thomas Sutter
6144e2d09b Add felica request service command. 
Add cmd parser functions.
 2019-10-22 15:56:05 +02:00
Thomas Sutter
e7f7810d22 Make style. Change DBG_DEBUG. Refactor CRC calculation 2019-10-21 09:59:15 +02:00
Thomas Sutter
ce4c651853 Merge remote-tracking branch 'upstream/master' into felica_support_request_service 
# Conflicts:
#	armsrc/felica.c
#	client/cmdhffelica.c
 2019-10-20 18:40:16 +02:00
Thomas Sutter
f7d4f2e9f3 Unfinished request service commands. 2019-10-20 18:28:07 +02:00
iceman1001
0dd9e66bcf text 2019-10-19 23:40:34 +02:00
iceman1001
0a978d8f8c fix: clarity 2019-10-19 16:31:10 -04:00
iceman1001
729bf52437 fix: no crypto auth in MFU 2019-10-19 16:25:51 -04:00
iceman1001
768bf22311 rename 2019-10-19 16:21:19 -04:00
iceman1001
c12bff8cdc fix limit sizes 2019-10-19 16:21:08 -04:00
iceman1001
29468ee817 fix: wrong mess len 2019-10-19 16:12:33 -04:00
iceman1001
5c0d6b1c9c no need 2019-10-19 16:06:27 -04:00
iceman1001
3620236725 shadow 2019-10-19 16:04:16 -04:00
iceman1001
21f93ef12a shadowing 2019-10-19 15:57:16 -04:00
Philippe Teuwen
6ba85af199 quick fix for felica, we can't leave repo broken so long... 2019-10-18 22:42:56 +02:00
Philippe Teuwen
39fd6b1910 coverity: separate crypto1 fcts ARM<>host into create/destroy and init/deinit 2019-10-18 16:58:24 +02:00
iceman1001
5fcb5f0ca5 coverity 226278 2019-10-18 12:46:20 +02:00
iceman1001
3cd053218f chg: wait until ready 2019-10-17 20:08:17 +02:00
Iceman
a5e94c5a1d
Merge pull request #443 from 7homasSutter/master 
Add reader and raw command for FeliCa standard cards
 2019-10-17 14:02:22 +02:00
Philippe Teuwen
945fb82b48 make style 2019-10-17 13:58:22 +02:00
Thomas Sutter
376e367d45 Make Style and remove some comments. 2019-10-17 13:48:34 +02:00
Thomas Sutter
4da87d3f96 Fix Client Response for RAW command. Client should receives now all response octects. 2019-10-17 11:46:59 +02:00
iceman1001
51022d4329 textual 2019-10-16 14:24:23 -04:00
Thomas Sutter
9d3331511b Fix FeliCa select_card. Selection works now for FeliCa standard cards. 
Fix SendRaw data.
Add some new unfinished cmds.
 2019-10-16 14:17:52 +02:00
Philippe Teuwen
8ea04a42a6 Use GetTickCountDelta when possible 2019-10-16 00:03:53 +02:00
Philippe Teuwen
f9157c946d SLCK detection: use more available SpinDelay 2019-10-15 18:53:29 +02:00
Philippe Teuwen
bf3ae7f007 perform startup delay also during TIA 2019-10-15 18:07:28 +02:00
Philippe Teuwen
3fce47d023 Add hw tia to trigger a new Timing Interval Acquisition 2019-10-15 15:02:34 +02:00
Philippe Teuwen
c7d84ce239 hw status: Detect slow clock drift problems 2019-10-15 14:07:20 +02:00
Philippe Teuwen
395d0f9ebf make style 2019-10-13 00:48:26 +02:00
iceman1001
76f7763893 motorola 2019-10-11 23:14:57 +02:00
iceman1001
8416bdb485 coverity 226278 2019-10-10 12:41:12 +02:00
iceman1001
9f54495412 coverity 226214 2019-10-10 11:54:23 +02:00
iceman1001
7435663ea1 coverity 226262 2019-10-10 11:36:28 +02:00
iceman1001
49caa7f962 chg cotag operates on 132kHz. textual 2019-10-10 10:34:56 +02:00
iceman1001
93b3f3e27d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-10-10 07:36:35 +02:00
iceman1001
f909039d01 frame 2019-10-10 07:34:30 +02:00
Philippe Teuwen
fb1e7879e1 coverity 226393 - missing break in mifaresim 2019-10-09 23:44:46 +02:00
Philippe Teuwen
2024f87ed3 coverity 226201 2019-10-09 22:48:54 +02:00
Philippe Teuwen
bc35a96690 coverity 226497 2019-10-09 21:34:41 +02:00
iceman1001
3361715121 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-10-09 13:11:26 +02:00
iceman1001
1ec34e00b6 coverity 226386 - fix operands dont.. 2019-10-09 13:05:23 +02:00
Philippe Teuwen
86a47a3282 dangerous stuff... 2019-10-09 13:03:23 +02:00
iceman1001
efe5e33acb coverity 226283 - fix out-of-bounds. Maybe a bit too large buffer now. 2019-10-09 12:48:43 +02:00
Philippe Teuwen
98d641dba5 WaitUS/WaitMS: accept uint32_t 2019-10-09 12:06:45 +02:00
Philippe Teuwen
cce039554d Avoid hardcoded lf divisors 2019-10-09 12:05:13 +02:00
iceman1001
a337611708 coverity 226386, u8 can never be larger than 256 2019-10-09 10:59:10 +02:00
iceman1001
8c4a42ff36 consider null termination 2019-10-09 10:36:34 +02:00
iceman1001
fb7728974e strlen checks 2019-10-09 10:33:42 +02:00
Philippe Teuwen
b9424795ea remove unused vars 2019-10-05 20:00:33 +02:00
Philippe Teuwen
3560cf5466 bootrom: remove deprecated CMD_SETUP_WRITE 2019-10-05 19:10:40 +02:00
iceman1001
b8776b593e fix: sneaky bug in magic detection where bigbuf wasnt emptied before next run 2019-10-04 14:21:04 +02:00
iceman1001
ebb2ac6f66 adjusting check button timings 2019-10-04 10:24:04 +02:00
Philippe Teuwen
42cb2a32e8 lf config alone shows current config 2019-10-03 22:11:16 +02:00
Philippe Teuwen
df08e7970c fix divisor<>freq computations, add q to lf tune 2019-10-03 21:18:37 +02:00
Philippe Teuwen
f29ad0fba2 macros for divisors and fix lf optimal freq display 2019-10-03 18:32:27 +02:00
Philippe Teuwen
6df9eea950 voltage config divisor printing 2019-10-03 17:45:43 +02:00