RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-25 01:36:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
8641 commits 3 branches 14 tags 85 MiB
Commit graph

264 commits

Author SHA1 Message Date
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
iceman1001 f2e77bfbe4 chg: some tabs converted 2019-08-17 15:59:11 +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
Iceman b06274623f fix: hf iclass dump - now also save EML 2019-08-10 18:05:24 +02:00
Philippe Teuwen a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
Philippe Teuwen 733a7d836d more ARRAYLEN 2019-08-01 00:14:09 +02:00
Philippe Teuwen 9beabaabf5 make style 2019-07-23 21:33:52 +02:00
cjbrigato 5c3676ad81 ADD: Early SPIFFS implementation see #257, UPDATE HF_COLIN accordingly 2019-07-22 22:56:06 +02:00
Philippe Teuwen 8bf4b4ad97 Promote WARNING to ERR on some error msgs 2019-07-14 00:35:18 +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
Philippe Teuwen 732bc766f9 Reduce some var scopes 2019-06-07 18:41:39 +02:00
iceman1001 0740d14faa chg: some unifiying return values 2019-05-15 10:24:06 +02:00
Philippe Teuwen 2f71d951e1 iclass: avoid last ping in fast modes 2019-05-08 19:16:37 +02:00
Philippe Teuwen 2f1061f95b rework ping 2019-05-07 23:35:09 +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
iceman1001 39272ba1fb convert sendOLD -> MIX for simple cmds 2019-05-07 19:13:14 +02:00
iceman1001 0cedfc7b2b chg: list should always be available, since we can now load / save trace files. 2019-05-02 10:42:02 +02:00
Philippe Teuwen 78fdffddf7 Replace WITH_ICLASS by dynamic detection in client 2019-05-01 23:20:18 +02:00
Philippe Teuwen ca43afa19b begin of dynamic capabilities handling in client 2019-05-01 20:48:15 +02:00
Philippe Teuwen 4f11ef048f style 2019-05-01 01:38:52 +02:00
Philippe Teuwen 27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
iceman1001 2dea3684ae fix: 'hf iclass eload' - enable NG (Thanks @doegox) 
chg: 'hf iclass chk' - now uses fast push mode
 2019-04-30 14:19:26 +02:00
iceman1001 481d70b0da chg: 'hf iclass eload' - use fast push mode. 2019-04-30 12:14:46 +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 1dbcb712c3 safeFile*: accept when suffix is already provided 2019-04-28 20:42:57 +02:00
Philippe Teuwen 7331b7d6d2 Merge branch 'master' into experimental_varlen 
* master:
  Add ref to new mifaresim.h in standalone modes
  fix: Standalone/hf_colin now compiles
  Update readme.md
  chg: hitag compile flag optional
  fix: standalonemode matty_run now compiles
  typo
  smallfix
  chg: fpga lf simulation
  chg: 'fpga lf sim' - 25% both on sides.
 2019-04-19 23:17:36 +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 0e855f647a typo 2019-04-18 10:45:24 +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 5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
Philippe Teuwen 05374fce07 Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes] 2019-04-12 19:41:56 +02:00
iceman1001 a872f04c1e textual 2019-04-11 17:19:48 +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 b6345a5df7 style 2019-04-07 18:44:15 +02:00
iceman1001 0b455607a9 fsize can't be zero 2019-04-07 12:41:29 +02:00
iceman1001 ad97aa3d29 chg: 'hf iclass sim' - void*, should be uin8_t* 2019-04-05 00:08:36 +02:00
iceman1001 7a152dc383 fix: duplicate break 2019-04-04 22:11:30 +02:00
Philippe Teuwen db4aa08b78 make style 2019-03-28 14:19:41 +01:00
iceman1001 35da3707d3 fix: 'hf iclass decrypt' - use after free 2019-03-15 22:07:21 +01:00
osboxes.org 9c2736d1eb spaces 2019-03-14 12:30:32 +01:00
iceman1001 e5a71fdd26 fix: 'hf iclass clone' - missing fclose 2019-03-14 10:01:07 +01:00
iceman1001 35bc4a975e rename SNOOP -> SNIFF 2019-03-12 13:15:39 +01:00
Philippe Teuwen 961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen da6cdf014b Keep string syntax in color macros 2019-03-10 00:56:00 +01:00
Philippe Teuwen 0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen 0d9223a547 client: fix mix of spaces & tabs 2019-03-09 23:35:06 +01:00
iceman1001 112411042f cleaning up 2019-03-09 21:59:00 +01:00
iceman1001 cc81b5bed9 fix: tolower 2019-03-09 12:31:29 +01:00
iceman1001 cc9ec2d79c textual 2019-03-09 11:30:26 +01:00
Philippe Teuwen 60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
iceman1001 cea5b5214d chg: colors 2019-02-24 14:51:21 +01:00
iceman1001 6d63b3fbed fix: mem leaks. 2019-02-21 16:17:49 +01:00
iceman1001 91d6836a47 fix: mem leaks. 2019-02-21 15:34:31 +01:00
iceman1001 18db34ffb0 chg: use calloc 2019-01-30 20:18:50 +01:00
iceman1001 66c82d16b0 chg: calloc calls 2019-01-21 09:02:00 +01:00
iceman1001 0fb0c35308 CHG: 'mem load' - the possibility to upload default_iclass_keys.dic, default_keys.dic, default_pwd.dic to predefined flashmemory sections. These will be used in pwd / key checking algorithms on device. 
CHG: 'script run read_pwd_mem.lua' - script now can print those uploaded dictionary files.

How to upload
pm3 --> mem load f default_iclass_keys i
pm3 --> mem load f default_keys m
pm3 --> mem load f default_pwd t

How to validate / view
PM3 -->scr run read_pwd_mem -o 237568 -k 8
pm3 -->scr run read_pwd_mem -o 241664 -k 6
pm3 -->scr run read_pwd_mem -o 245760 -k 4
 2019-01-01 18:01:40 +01:00
Chris 3beb14a25c chg: 'hf iclass lookup' - its not an online command... 2018-11-25 14:35:47 +01:00
Chris 25292eab2e fix: more warnings. 2018-11-14 15:13:17 +01:00
merlokk 586cbd2137 hiclass 2018-11-14 11:33:45 +02:00
Chris d58786ed74 chg: 'hf iclass chk' - remove some printing 2018-11-05 22:30:46 +01:00
Chris 1d322686bb CHG: added possible SE credential identification text 2018-09-15 12:58:50 +02:00
Chris e536cb082f chg: removed warning 2018-07-04 13:08:59 +02:00
Chris dfa4f62ab6 chg: 'hf iclass chk' textual info 2018-07-01 11:56:08 +02:00
Chris 2b294912ee chg: 'hf iclass chk' - enabled credit/debit key selction 
chg:  'hf iclass lookup'  - enabled credit/debit key selction
fix: first item in dictionary file now correct identified
chg: code cleanup
 2018-06-30 22:47:07 +02:00
Chris cd3fc9242e chg: iclass output 2018-06-30 18:34:58 +02:00
iceman1001 939b727c42 chg: converting malloc calls -> calloc which zeros out the allocated memory 2018-05-03 19:42:16 +02:00
iceman1001 53feba2bbe fix: 'hf iclass eload 'should increase data array to upload... 2018-05-03 11:00:15 +02:00
iceman1001 baf6beec2e chg: unified download 2018-05-02 19:51:10 +02:00
iceman1001 207fa2b574 add: potential fix for OSX uses, by @piwi 
chg:  adapting fix to support iceman forks extended commands.
 2018-05-02 08:11:29 +02:00
iceman1001 9577dad1aa chg: 'hf iclass reader - getfrombigbuf has now timeout 2018-04-27 16:48:59 +02:00
iceman1001 c41013d394 chg: printandlogex now deals with string which has inital newline char. 2018-04-27 11:22:30 +02:00
iceman1001 71ce6e07ee CHG: moved trace commands into its own category (from hf) 
'trace list'

there will also the load / save of trace buffer come.

For backwardfunctionality the old commands still works.
 2018-03-18 18:00:41 +01:00
iceman1001 24482211ad chg: the dot progress is not logged anymore. Force fflush afterwards. 2018-03-05 20:07:29 +01:00
iceman1001 40cc0a402b chG: adjust some "." progress dots, that shouldn't use NORMAL.. 2018-03-01 14:10:52 +01:00
Brian Pow a4fa0144eb migrate PrintfAndLog() to PrintAndLogDevice() 2018-02-22 23:17:46 +08:00
Brian Pow 78647f4502 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:48 +08:00
Brian Pow 8f9c81ae81 Rename prnlog() to PrintfAndLog() 2018-02-13 00:12:50 +08:00
Brian Pow b1d414c680 CHG: replace 'samples:' with 'Examples:', unify some usage text 2018-02-09 22:56:16 +08:00
iceman1001 39de74cb78 fix: wrong block 2018-02-08 12:39:35 +01:00
iceman1001 220614ca10 fix: 'hf iclass reader' - drop field when finished. 2018-02-08 12:34:13 +01:00
iceman1001 b31afcfc31 fix: 'hf iclass reader' - missing CC 2018-02-08 12:18:40 +01:00
iceman1001 2847a147b5 fix: 'hf iclass dump', missing CC 2018-02-08 12:15:47 +01:00
iceman1001 f6d314d09e chg: iclass dump textual.. 2018-02-08 11:03:11 +01:00
iceman1001 28e73824e1 chg: 'hf iclass dump' - more texts 2018-02-08 10:49:44 +01:00
iceman1001 30e9395590 fix: 'hf iclass lookup' - exit when failed to load dictionary file 2018-02-08 10:32:14 +01:00
iceman1001 7bf6e0d089 fix: 'hf iclass chk' - checking keys outside the first chunk of 128. 2018-02-08 09:30:34 +01:00
iceman1001 120abf10bc chg: tests with ansi-colors 2018-02-07 14:08:57 +01:00
iceman1001 debf4e3327 chg: 'analyse hid' moved to 'hf iclass permute' un/permute function is moved. 2018-02-04 17:19:08 +01:00
iceman1001 6605d92fbb chg: tried making the reselect more stable. 
chg: 'hf iclass readblk'
chg: 'hf iclass writeblk'
chg: 'hf iclass dump'
chg: 'hf iclass clone'
        all commands now has 'v'  verbose parameter for more detailed output.
 2018-02-04 12:25:55 +01:00
iceman1001 6a9ddf6e69 chg 'hf iclass chk' - increased timeout, switch off antenna before each run in order to reset card, three retires. all this make it more stable. 2018-02-04 10:20:38 +01:00
iceman1001 dc25f9212f FIX: 'hf iclass sim 2' 
FIX: 'hf iclass sim 4'
FIX: 'hf iclass loclass' - this fixes the bug where loclass assumes the epurse value is all zeros, while it now should save the epurse value during the simulation if it is updated/read.

I assume a empty valid epurse, while an all zero epurse is too much easy to detect as a anomaly.
 2018-02-04 00:52:29 +01:00
iceman1001 ccfdd60c09 chg: textual 2018-02-01 21:39:34 +01:00