Commit graph

269 commits

Author SHA1 Message Date
iceman1001 da197e1999 CHG: 'lf t55xx wipe c' - now accepts user provided configuration block to configure a wiped tag with.
ADD: 'lf t55xx protect' -  Sets password and enables password protection in configuration block.   It tries to validate its writes aswell.

Samples:
lf t55xx protect n 11223344            - set pwd to 11223344
lf t55xx protect n 01020304 p 11223344 - change a password protected tag from 11223344 to 01020304

To remove the password protection, you need to remember the password :)
lf t55xx wipe p 11223344               - wipes whole tag, removes password protection bits.
2019-09-14 18:27:58 +02:00
Ludovic Rousseau f961c1c551 Fix typos
Thanks to Debian lintian for the reports:
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf dont don't
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf succesful successful
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf Uknown Unknown
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf requestes requests
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf unkown unknown
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf ambigous ambiguous
2019-09-14 17:53:24 +02:00
Ludovic Rousseau a1852eaa4b Fix typos
Thanks to Debian lintian for the reports:
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 formated formatted
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 succesfully successfully
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Skiped Skipped
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 standart standard
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 supress suppress
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 successfull successful
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Succeded Succeeded
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Overriden Overridden
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 aquire acquire
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 occured occurred
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 delimeter delimiter
2019-09-14 17:44:58 +02:00
mwalker33 c3756f1903 T55xx DLMode Update 2019-09-14 14:13:55 +10:00
iceman1001 250be16876 chg: 'lf t55 write v' - validation of data. After a write, the command tries to read the block and see if it matches the data entered.
This can fail because of password,  not correct configuration settings before. Also validating a block0 write is harder, some modulations are not that perfect.
This is however a nice step forward.
2019-09-13 21:25:39 +02:00
iceman1001 af02ee871d chg: 'lf t55xx info c' - renamed from "d" to "c", takes a block0 and print info.
chg: 'lf t55xx config c'  - now takes a block0 and use as configuration.

usage:
lf t55xx config c 000880E8
lf t55xx info c 000880E8
2019-09-13 20:50:00 +02:00
iceman1001 f1307e703c style 2019-09-13 16:32:37 +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 c3a0d7d88a chg: 'lf t55xx info p' - got some more love, now can read with password :)
chg: 'lf t55xx dump p' - less outputs and now can read with password :)
chg: 'lf t55xx trace 1' - can now decode trace from a saved trace. However you must have correct configuration set in order to work.
chg: 'lf t55xx wipe p' - now can use a password to write to configblock first.
2019-09-12 17:34:55 +02:00
iceman1001 7b773c571b chg: 'lf t55xx dump p 11223344' - less verbose output. 2019-09-09 15:19:00 +02:00
Philippe Teuwen 2022df1068 make style 2019-08-30 10:45:52 +02:00
iceman1001 8d9751ebe4 fix: uint cant be negative.. 2019-08-28 21:16:09 +02:00
Matthias Konrath e259b26d60 Streamlined the naming conventen and types. 2019-08-28 10:45:45 +02:00
Matthias Konrath 1ce10cfea6 Added additional checks (loadFileDICTIONARY_safe). 2019-08-28 10:09:01 +02:00
Matthias Konrath ae7b0de2c9 Fixed a typo and added and improved the checks for the returned data of loadFileDICTIONARY_safe. 2019-08-28 09:49:21 +02:00
Matthias Konrath 9dc3c39a95 Added additional checks to the from load dictionary returned data points. 2019-08-28 09:45:11 +02:00
Matthias Konrath 225b18d5fc Implemented a function to safely load dictionaries. 2019-08-28 09:34:46 +02:00
Philippe Teuwen 6ac9d2f0fb lf t55xx chk: load dic with searchFile 2019-08-26 13:46:53 +02:00
Philippe Teuwen 23044c00d0 rename and move dict files 2019-08-22 22:16:33 +02:00
Iceman a0f261c1e0 chg: moved fileutils from loclass 2019-08-21 14:41:33 +02:00
Philippe Teuwen 47b60d84de make style 2019-08-11 23:53:45 +02:00
Philippe Teuwen 3e96c27c18 remove clang warning 2019-08-11 21:42:01 +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 a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
iceman1001 ca53711b8d chg: lf t55xx - helptext 2019-07-28 09:21:02 +02:00
iceman1001 283060f962 chg: renaming a struct 2019-07-27 21:15:43 +02:00
iceman1001 d7c967b65d chg: 'codestyle' 2019-07-27 10:25:03 +02:00
iceman1001 e9b493ead6 style 2019-07-27 02:39:30 -04: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
Philippe Teuwen ac18114909 Remove long unsigned int warning 2019-07-23 22:46:58 +02:00
Philippe Teuwen 11e5131604
Merge pull request #284 from mwalker33/master
T55x7 Downlink mode support added
2019-07-23 22:42:47 +02:00
Philippe Teuwen 9beabaabf5 make style 2019-07-23 21:33:52 +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
cjbrigato 5c3676ad81 ADD: Early SPIFFS implementation see #257, UPDATE HF_COLIN accordingly 2019-07-22 22:56:06 +02:00
Philippe Teuwen 55602bf833 Fix few zelaous WARNING->ERR 2019-07-14 12:17:34 +02:00
Philippe Teuwen 8bf4b4ad97 Promote WARNING to ERR on some error msgs 2019-07-14 00:35:18 +02:00
Philippe Teuwen b0dbbd3683 make style 2019-07-13 00:38:30 +02:00
Philippe Teuwen 844d732297 Replace ukbhit by kbd_enter_pressed, not requiring tcgetattr:
Note that it behaves differently now
* it looks for Enter key only, not any key
* it "eats" the input, no need for (void)getchar() after it
* it works the same no matter the value of ICANON
* the mingw version has been adapted to act the similarly

This should fix its usage on Android where tcgetattr always returns -1
2019-07-11 13:01:34 +02:00
iceman1001 a6fc729f22 style 2019-06-08 10:11:18 -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
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 e727fe5818 chf: lf asksim - uses NG 2019-05-24 07:06:08 -04:00
iceman1001 98b75e43a5 fix: lf t55xx wipe 2019-05-24 06:22:43 -04:00
iceman1001 794d109f30 chg: lf t55 - fixes / read block uses NG 2019-05-22 11:59:39 -04:00
iceman1001 d546f39534 chg: cmdlft55xx return codes 2019-05-22 08:48:23 -04:00
iceman1001 ad394a2d6b chg: lf em 410x_sim - reworked to NG\n chg: lf em 410x_demod - now can demod the simulation data. 2019-05-22 08:32:30 -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 290f2b625b Automated upgrades SendCommandOLD/MIX 0,0,0,NULL,0 -> NG and SendCommandOLD ....,NULL,0 -> MIX 2019-05-07 19:51:33 +02:00
Philippe Teuwen 32bb9511ec Replace WITH_LF by dynamic detection in client 2019-05-02 00:02:38 +02:00
Philippe Teuwen ca43afa19b begin of dynamic capabilities handling in client 2019-05-01 20:48:15 +02:00
Philippe Teuwen 820a6d99a9 better offline mode 2019-04-30 23:52:40 +02:00
Philippe Teuwen f1deb865db Merge branch 'master' into experimental_varlen
* master:
  ltrim cmd before display
  hf mf eload: fix absence of filename
  detect wrong numOfBlocks / numOfSectors arguments
  safeFile*: accept when suffix is already provided
  loadFile*: accept when suffix is already provided
  textual,  to reflect which repo.
  LoadEML: don't complain on the last \n
2019-04-28 22:53:12 +02:00
Philippe Teuwen 405f24522e loadFile*: accept when suffix is already provided 2019-04-28 19:21:04 +02:00
Philippe Teuwen c4766b2649 Semi-Automated SendCommand -> SendCommandOLD 2019-04-19 23:01:13 +02:00
Philippe Teuwen 1b6a45ac17 propagate CmdsParse return value 2019-04-19 00:47:51 +02:00
Philippe Teuwen 482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen 533667ea6d Better Reply structs 2019-04-17 23:44:48 +02:00
Philippe Teuwen be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +02:00
iceman1001 436910605b unified Proxmark3 text 2019-04-16 20:00:25 +02:00
Philippe Teuwen 9676d788e0 style 2019-04-14 13:37:53 +02:00
Philippe Teuwen 5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
iceman1001 dae0016bb2 times times times 2019-04-13 03:01:31 +02:00
iceman1001 22f8440183 struct 2019-04-13 02:51:33 +02:00
iceman1001 1cb83e78a5 localtime, gmtime replaced 2019-04-13 02:45:53 +02:00
Philippe Teuwen 8aa5b42cdf Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-12 02:07:11 +02:00
Philippe Teuwen 919cfb5841 more [-Wmissing-field-initializers] 2019-04-10 15:01:19 +02:00
Philippe Teuwen 0ab6de64d4 structs: initializes explicitely all fields, so we can detect when we really forgot one [-Wmissing-field-initializers] 2019-04-10 13:59:00 +02:00
Philippe Teuwen 3d6d58aae5 internal help fcts -> static 2019-04-10 13:06:05 +02:00
Philippe Teuwen cc0454d5d2 tag unused Cmd [-Wunused-parameter] 2019-04-10 12:23:40 +02:00
iceman1001 1809d6c839 unused 2019-04-10 08:52:45 +02:00
iceman1001 b0d627bae5 check returnvalue 2019-04-08 14:41:06 +02:00
iceman1001 dcb83d2962 styles 2019-04-08 10:01:57 +02:00
Philippe Teuwen 7259a27f05 Change printT55xxBlock API 2019-04-06 22:04:02 +02:00
Philippe Teuwen 41f36ca20b make style 2019-04-06 19:09:01 +02:00
iceman1001 116837e9a0 chg: 'lf t55xx info' - text layout 2019-04-04 20:06:15 +02:00
iceman1001 38162917dc Add: new lua scripting support for some t55xx commands.
core.t55xx_detect()    - same as 'lf t55xx detect'
  core.t55xx_readblock() - read t55xx block, don't forget to run detect before.  Returns actual blockdata.
2019-04-03 19:48:00 +02:00
Philippe Teuwen 64ce30c06c make style 2019-04-02 22:32:45 +02:00
Philippe Teuwen 5225722a50 t55xx info: fix q5 condition 2019-04-02 22:08:50 +02:00
iceman1001 4c007beefd textual 2019-04-02 10:36:32 +02:00
iceman1001 4eff3521a7 Chg: 'lf t55xx info' - now prints if its a known config block 2019-04-02 10:33:25 +02:00
Philippe Teuwen d448549524 t55xx info: tag out of spec FSKa modulations in standard mode 2019-03-31 21:30:30 +02:00
Philippe Teuwen 045eda93e9 t55xx config: allow to toggle on/off i/q5/st 2019-03-31 19:42:36 +02:00
Philippe Teuwen e88fa75fd0 Revamped t55xx info: support offline block0, Q5, fix extended, add warns etc 2019-03-31 19:06:36 +02:00
Philippe Teuwen 720c410278 Fix lf t55xx trace: read the correct block 2019-03-31 01:13:59 +01:00
Philippe Teuwen db4aa08b78 make style 2019-03-28 14:19:41 +01:00
iceman1001 54e8eafa49 fix: 'lf t55xx chk'
fix: 'lf t55xx brute'
fix: 'lf t55xx recoverpwd'
 - now works like they should again.
2019-03-26 20:21:10 +01:00
iceman1001 834832be31 chg 'lf t55xx brute' - AquireData returns isnoise, but a pwd protected card signa looks like noise. 2019-03-26 16:23:19 +01:00
iceman1001 9133a9164f chg: 'lf t55xx chk' - refactored to use loadDictionary 2019-03-26 16:18:40 +01:00
iceman1001 52be3f4fe5 chg: 'lf indala clone' - differnt input parms. '-L' gives a long UID.
chg: 'lf indala demod' - tries to descramble parts,  and detection is changed.  Still issues with PSK2..
2019-03-26 09:09:43 +01:00
iceman1001 2534d02000 text 2019-03-20 22:04:35 +01:00
iceman1001 2276779b01 style 2019-03-18 23:55:39 +01:00
iceman1001 cc9a99ed57 string formats 2019-03-18 17:46:52 +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