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

347 commits

Author SHA1 Message Date
Daniel Underhay
132bd6c1f7 Add colour to hf 14a and hf mfu commands 2020-03-15 19:57:47 +11:00
iceman1001
a612cc9414 device side hid demodulate use colors 2020-01-30 16:43:18 +01:00
Philippe Teuwen
33033612bc Fix delay in acquisition and DoAcquisition_config usage. Fixes #524 2020-01-15 16:17:58 +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
iceman1001
f304528fc0 add: added nrz simulation for lf. *wip* needs pattern for nrz. 2020-01-04 20:00:37 +01:00
iceman1001
9fac23567b cppcheck 2020-01-01 22:44:50 +01:00
iceman1001
21ffdec1cd chg: hitag refactoring (@anon) 2020-01-01 18:18:34 +01:00
iceman1001
93c9dc571f chg t55 timings to match offical repo when compiling for PM3OTHER 2019-11-12 19:27:34 +01:00
iceman1001
182f239d21 make style 2019-11-08 12:00:21 +01:00
iceman1001
68ac8dd979 fix: cotag use NG 2019-11-04 15:42:28 +01: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
Philippe Teuwen
eb7268cd98 lf: change macros to allow float freq, change 134 -> 134.2 2019-10-25 00:42:47 +02:00
iceman1001
c12bff8cdc fix limit sizes 2019-10-19 16:21:08 -04:00
Philippe Teuwen
395d0f9ebf make style 2019-10-13 00:48:26 +02:00
iceman1001
49caa7f962 chg cotag operates on 132kHz. textual 2019-10-10 10:34:56 +02:00
Philippe Teuwen
86a47a3282 dangerous stuff... 2019-10-09 13:03:23 +02:00
Philippe Teuwen
cce039554d Avoid hardcoded lf divisors 2019-10-09 12:05:13 +02:00
iceman1001
f142ad139b chg 'lf cmdread' - clientside checks, less wait times on device 2019-09-30 23:18:48 +02:00
iceman1001
fd88d7448e fix 'lf t55xx resetread' - NG and better fault handling 2019-09-30 19:47:36 +02:00
iceman1001
6a83a7dc1a fix 'lf cmdread' - correct report back on failure 2019-09-30 19:28:50 +02:00
iceman1001
66ccca6457 fix 'lf io watch' - now loops w correct size and crc var. 'lf awid watch' - now loops w correct size 2019-09-22 18:57:52 +02:00
iceman1001
21a7de38b8 style 2019-09-19 10:54:34 +02:00
iceman1001
e5c31886eb chg: 'lf io clone' - refactored, uses NG 2019-09-16 11:41:34 +02:00
iceman1001
4c08477ef7 chg: 'lf indala clone' - refactored , uses NG 2019-09-16 11:33:05 +02:00
Philippe Teuwen
960d8c4db3 add helper fct manchesterEncodeUint32 2019-09-15 02:09:40 +02:00
Philippe Teuwen
359399b2e6 fix hid sim long id length 2019-09-15 02:01:53 +02:00
Philippe Teuwen
59e66ce5fd lf hid sim: add support for long ID 2019-09-15 02:00:42 +02:00
Philippe Teuwen
61098c7716 lf hid sim: use generic FSK sim 2019-09-14 22:44:15 +02:00
iceman1001
2bec009778 chg: 'lf viking clone' - now uses NG 2019-09-14 19:58:17 +02:00
Philippe Teuwen
3dc4774f20 simplify fcAll 2019-09-13 10:35:17 +02:00
Philippe Teuwen
59ea79b583 CmdFSKsimTAG: swap fcH/fcL back, fix lf io/awid/pyramid sim 2019-09-13 00:39:19 +02:00
Philippe Teuwen
64d2e43592 CmdFSKsimTAG: avoid padding with very short cycles, this confused lf io sim 2019-09-13 00:39:19 +02:00
iceman1001
3821a03a40 chg: 'lf t55xx wipe p' - now takes a password for wipe 
chg: 'lf t55xx wakeup' - uses NG
 2019-09-12 21:20:40 +02:00
iceman1001
75f4a6123c textual 2019-09-12 17:38:13 +02:00
Philippe Teuwen
d19754567d summer restructuring: 
* .h include only the strict minimum for their own parsing
  * this forces all files to include explicitment their needs and not count on far streched dependencies
  * this helps Makefile to rebuild only the minimum
  * according to this rule, most standalone .h are now gone
  * big app.h is gone
  * remove seldom __cplusplus, if c++ happens, everything will have to be done properly anyway
* all unrequired include were removed
* split common/ into common/ (client+arm) and common_arm/ (os+bootloader)
  * bring zlib to common/
  * bring stuff not really/not yet used in common back to armsrc/ or client/
  * bring liblua into client/
  * bring uart into client/
  * move some portions of code around (dbprint, protocols,...)
* rename unused files into *_disabled.[ch] to make it explicit
* rename soft Uarts between 14a, 14b and iclass, so a standalone could use several without clash
* remove PrintAndLogDevice
* move deprecated-hid-flasher from client to tools
* Makefiles
  * treat deps in armsrc/ as in client/
  * client: stop on warning (-Werror), same as for armsrc/

Tested on:

* all standalone modes
* Linux
 2019-08-11 21:42:01 +02:00
Philippe Teuwen
1354aec556 typos 2019-08-06 13:51:10 +02:00
Philippe Teuwen
517f0886ba make style 2019-08-03 20:20:08 +02:00
Philippe Teuwen
a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
iceman1001
65feeeafc8 chg: 'lf t55xx deviceconfig - a compact output' 2019-08-03 18:48:08 +02:00
iceman1001
0320455090 chg 'lf t55xx deviceconfig - color adaptations 2019-08-03 09:53:08 -04:00
iceman1001
f643a7a5a4 chg: 'lf t55xx deviceconfig' - matrix styled output 2019-08-03 15:26:46 +02:00
Philippe Teuwen
5061869efd help iceman reverting last 2019-08-03 10:57:59 +02:00
iceman1001
bf2dc0304b revert last 2019-08-03 04:43:01 -04:00
iceman1001
9f4620c92c make style 2019-07-27 17:48:52 -04:00
iceman1001
283060f962 chg: renaming a struct 2019-07-27 21:15:43 +02:00
iceman1001
c951e54ff2 chg: 'lf t55xx deviceconfig' - change text when not configured 2019-07-27 10:06:38 +02:00
iceman1001
548c2ed998 make style 2019-07-27 03:54:01 -04:00
iceman1001
b4eb41ee66 chg: 't55' more style 2019-07-27 09:50:24 +02:00
iceman1001
a597382530 chg: 't55' - adapting to codestyle, added some colors to message outputs, change comments 2019-07-27 09:36:16 +02:00
mwalker33
3211f35062 Added set default timings 2019-07-25 21:00:30 +10:00
mwalker33
77d96ff3b7 Bug Fix Timing order 
Timing for backward compatibility
 2019-07-25 20:01:03 +10:00
mwalker33
b16f2fdaba Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-07-24 08:15:38 +10:00
mwalker33
cdc3787008 clean 2019-07-24 08:12:25 +10:00
Philippe Teuwen
ac233a346a make style 2019-07-23 23:43:30 +02:00
mwalker33
5de04f84e9 Restored * 8 
Revert back to store and use the full value (*8) for the timing.
 2019-07-23 20:12:05 +10:00
mwalker33
4e0e69ed63 Added T55 downlink mode support 2019-07-23 09:50:28 +10:00
merlokk
20d13d5509 added PACKED attribute for structures and reorganize include folder 2019-07-16 14:50:38 +03:00
iceman1001
a48f2e232f convert NG 2019-06-13 12:23:25 -04:00
Philippe Teuwen
a55e597e36 make style 2019-06-07 21:40:33 +02:00
Philippe Teuwen
732bc766f9 Reduce some var scopes 2019-06-07 18:41:39 +02:00
Philippe Teuwen
4761ea13f7 MF_DBGLEVEL => DBGLEVEL (pm3 side) 2019-06-06 10:05:09 +02:00
Philippe Teuwen
3b12ba2e93 replace usb_poll_validate_length() by data_available() that supports USART too 2019-06-03 00:01:08 +02:00
iceman1001
74fb740c21 fix: lf em 4x05 - use correct paritytest (@marshmellow)\nchg: lf em 4x05_read\n chg: lf em 4x05_write - uses NG 2019-05-28 05:15:12 -04:00
iceman1001
0d1438d156 chg: lf psksim - uses NG 2019-05-24 09:11:30 -04:00
iceman1001
e727fe5818 chf: lf asksim - uses NG 2019-05-24 07:06:08 -04:00
iceman1001
263d662783 chg: lf fsksim - uses NG 2019-05-23 13:16:06 -04:00
iceman1001
0564931450 fix: lf sim - if called with empty graphbuffer all strange things happend, like turning on HF field 2019-05-23 10:51:19 -04:00
iceman1001
f8dbf6138a fix: lf sim - dont forget to PACK your structs on both sides\n chg: data convertbitstream - converts bit to max/min in order to facilitate demodulation of simulation data 2019-05-23 06:12:20 -04:00
iceman1001
794d109f30 chg: lf t55 - fixes / read block uses NG 2019-05-22 11:59:39 -04:00
iceman1001
d7f1ab2175 chg: lf cmdread - now uses NG 2019-05-20 09:15:45 -04:00
iceman1001
801cb95967 fix: 'lf t55xx write' - wrong bitshift 2019-05-13 13:36:54 +02:00
iceman1001
d2a4ade2af chg: lf t55xx write - now uses NG frames. 2019-05-13 13:23:53 +02:00
Philippe Teuwen
2c10482279 all LF sim: client waits till button pressed 2019-05-09 00:08:59 +02:00
Philippe Teuwen
0a4b90ac20 Simplify color & banner logic 2019-04-30 13:02:27 +02:00
iceman1001
ab6870c573 style 2019-04-28 11:08:41 +02:00
Philippe Teuwen
1c136c8fc6 Merge branch 'master' into experimental_varlen 
* master:
  rework Dbprintf & add color support
  use color macros
  doc magic
  archive and fix hid-flasher
  update standalone readme
 2019-04-26 10:48:28 +02:00
Philippe Teuwen
cb452c98ba rework Dbprintf & add color support 2019-04-26 10:36:06 +02:00
Philippe Teuwen
482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
iceman1001
4ab2212346 style 2019-04-13 08:50:05 +02:00
iceman1001
ef610f373a style 2019-04-07 16:21:27 +02:00
Philippe Teuwen
7485c5ed2e armsrc BitStream -> bits 2019-04-07 12:23:34 +02:00
Philippe Teuwen
a52a0bf537 args names 2019-04-06 20:21:03 +02:00
Philippe Teuwen
21b063da93 t55xx readblock: don't delay acquisition too much else we're sometimes off by one (observed when reading P1B1 on several cards) 2019-03-31 03:02:09 +02:00
Philippe Teuwen
4b00dd1053 lf write: leds 2019-03-31 01:14:20 +01:00
Philippe Teuwen
032062cfe9 Indala 64 on T55x7: use PSK1 2019-03-30 23:01:22 +01:00
iceman1001
248135682c mix in proxmark code.. 2019-03-15 00:40:29 +01:00
iceman1001
2563fa0472 moved some macro 2019-03-13 09:10:52 +01:00
Philippe Teuwen
091ddb26f0 lfops fcAll: avoid division by zero 2019-03-13 00:27:03 +01:00
Philippe Teuwen
d9308d912d fix: shifting signed 32-bit value by 31 bits is undefined behaviour 2019-03-13 00:07:40 +01:00
Philippe Teuwen
4aeff95259 T55xx_ChkPwds: fix always false cond 2019-03-12 23:53:39 +01:00
Philippe Teuwen
61905d2b19 lfops: add ledcontrol in API 2019-03-12 23:51:30 +01:00
Philippe Teuwen
ebeab59bc4 lfops: remove always true conds 2019-03-12 23:50:43 +01:00
Philippe Teuwen
961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen
0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen
8a7c6825b5 armsrc: fix mix of spaces & tabs 2019-03-09 20:34:41 +01:00
Philippe Teuwen
60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
iceman1001
8991fa172d FIX: wrong define 2019-01-29 15:47:44 +01:00
iceman1001
0bec6038b7 CHG: adjusted compiling for older devices 2019-01-23 10:57:49 +01:00
iceman1001
a5833fe390 CHG: remove strange thr 0x43 in LF sampling 
CHG: refactor cotag init
 2019-01-12 12:10:31 +01:00
iceman1001
f215ebef80 Refactored 'lf t55xx brute', split it up into two commands. 
- lf t55xx brute  (tries bruteforcing a range of pwds
- lf t55xx chk    (uses dictionary file or RDV4 flashmem)

FIX: adjust lf sim (@marshmellow42)  see 7008cf9c15
"attempt to speed up the loops waiting for carrier signal to go high or low
by only checking for a halt (button press or usbpol) every 256th loop
iteration. some users were experiencing modulating reactions to be too slow.

ADD: 'lf t55xx chk'
It uses @marshmellows42 idea behind commit  (6178b085a0)
With calculating a baseline (read block0 32times and average the signal-ish) and sampling only 1024 signal data. The algo then proceeds to calc the average and keep track of the candidate which is given the most difference in signal data average value.    I do some squaring and shifting for this.
The candidate is then send back to client to be tested properly with  trymodulation like before.

This seems to work good on t55xx card which has a ASK configuration.

WORK-IN-PROGRESS
 2019-01-11 14:46:27 +01:00