RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-16 04:09:10 +08:00
Code Issues Projects Releases Packages Wiki Activity
6909 commits 3 branches 15 tags 87 MiB
Commit graph

4350 commits

Author SHA1 Message Date
Philippe Teuwen
9825f521b4 Fix clang issue where generated .d are sometimes newer than .o 2019-08-22 21:05:45 +02:00
Philippe Teuwen
40b6956a22 script list: print dir tree 2019-08-22 19:53:23 +02:00
Philippe Teuwen
595b8a1885 introduce PREFIX for pm3 system directory and move to common.h 2019-08-22 19:36:20 +02:00
iceman1001
ab38130c3e chg: some more checks in pathing 2019-08-22 17:44:08 +02:00
Matthias Konrath
abb69e2dc9 Further improved the hardautopwn feature. 2019-08-22 14:55:06 +02:00
Matthias Konrath
407078d90a Experimental hardautopwn implementation. 2019-08-22 12:49:26 +02:00
Philippe Teuwen
9ae27cd73c scripts list / scripts run: look also in the new lua scripts paths 2019-08-22 00:32:15 +02:00
Philippe Teuwen
3c6500a1b2 Lua: look for scripts also in ~/.proxmark/{luascripts,lualibs} and /usr/local/share/proxmark3/... 2019-08-21 23:53:27 +02:00
Philippe Teuwen
a8ee33baf4 change scripts/ to luascripts/ 2019-08-21 23:17:01 +02:00
Philippe Teuwen
fb00690957 rename and +x few eml helper scripts 2019-08-21 22:45:06 +02:00
Iceman
56267ea623 readd fileutils 2019-08-21 14:43:22 +02:00
Iceman
a0f261c1e0 chg: moved fileutils from loclass 2019-08-21 14:41:33 +02:00
Iceman
4e627f09c0 add: proxmark3 -v/--version - for easiness to detect version in offline mode and installs 2019-08-21 12:52:59 +02:00
Iceman
fea5d88278 add: detect unfused / write once magic tags, from https://github.com/nfc-tools/libnfc/pull/554 2019-08-20 14:53:52 +02:00
Philippe Teuwen
589f1e9d3e client/Makefile: add missing deps 2019-08-19 21:50:16 +03:00
Philippe Teuwen
0449527e2a adapt client/Makefile to new mbedtls & zlib way of working, remove unneeded dirs 2019-08-19 21:50:16 +03:00
Philippe Teuwen
0115efe190 isolate reveng, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen
6ebae499aa rework fpga_compress & isolate zlib: use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen
aebfe0af19 rework mfkey Makefile and move util_posix to common, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen
829934886f rework tinycbor Makefile, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen
7b78833800 rework liblua Makefile and skip clients compilation, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen
9767c075d9 rework jansson Makefile, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen
f4c810f83b allow override of CFLAG & alike, remove /opt paths 2019-08-19 21:50:16 +03:00
iceman1001
f06846e2d0 chg: 'hf iclass loclass' - break attack earlier if one csn byte recovery fails. No need to try run it. and some colors... 2019-08-19 20:24:08 +02:00
Philippe Teuwen
ab2100879e Get btpin/btfactory available in FPC DEV builds 2019-08-19 17:47:11 +02:00
root
63b47a003e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-18 17:06:58 +02:00
iceman1001
f2e77bfbe4 chg: some tabs converted 2019-08-17 15:59:11 +02:00
Philippe Teuwen
4d16f3e7d2 fix reveng: unsigned long on Mingw64 is only 32b, hopefully limits.h can help 2019-08-15 19:24:50 +02:00
Philippe Teuwen
f008b965d5 missing include 2019-08-14 23:06:14 +02:00
root
d770e4c57a remove debugstatements 2019-08-14 22:59:14 +02:00
Philippe Teuwen
a187968967 Hmm, let's try to fix reveng on 32b 2019-08-14 22:19:52 +02:00
Philippe Teuwen
2f029d0d9d remove comment 2019-08-14 21:54:43 +02:00
Philippe Teuwen
ea601f4052 fix reveng for all platforms else than WIN32 2019-08-14 21:53:04 +02:00
Philippe Teuwen
db0ac1639b em4x watch & read: collect enough samples to cover EM XL tags 2019-08-13 22:57:54 +02:00
Philippe Teuwen
252929bed4 fix lf read command parsing bug 2019-08-13 20:30:19 +02:00
cjbrigato
961f98c125 SPIFFS : FIXES FS corruption against high numbero f current losses, high number of files manipulation. FIXES LOG_BLOCK erasing handlers. FIXES Garbage Collector. Overall, SPIFFS should now be WAY MORE resilient to any form of misbehavior. In case of corrupted filesystem (should still be readable !), spamming 'mem spiffs check' from the client will ensure at least 2 new free 4k blocks each tile (if number of LOG_PAGE available is enough) and in the same pass will move/reorganize the LOG_PAGES of contextual blocks. Yiha 2019-08-13 17:39:48 +02:00
iceman1001
de1093d5d9 textual 2019-08-12 16:32:27 -04:00
iceman1001
bbc324f9fe follow status pattern 2019-08-12 16:31:57 -04:00
Philippe Teuwen
01ce580e7b make btpin & btfactory accessible in BTADDON builds 2019-08-12 18:58:28 +02:00
Colin J. Brigato
cb39be8c47
Fixes Compilation on OSX 2019-08-12 12:39:16 +02:00
Philippe Teuwen
47b60d84de make style 2019-08-11 23:53:45 +02:00
Philippe Teuwen
8b0a80ec98 add missing include for whereami.c in android 2019-08-11 21:42:01 +02:00
Philippe Teuwen
3e96c27c18 remove clang warning 2019-08-11 21:42:01 +02:00
Philippe Teuwen
80b4e81130 Fix fpga_compress race condition and isolate it in tools 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
Iceman
b7d412d27b Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-10 21:04:25 +02:00
Iceman
a36b784ecd chg: help text commands now green 2019-08-10 18:34:02 +02:00
Iceman
3f9613b87f chg: script run dumptoemul - better fail messages 2019-08-10 18:20:20 +02:00
Iceman
b06274623f fix: hf iclass dump - now also save EML 2019-08-10 18:05:24 +02:00
Philippe Teuwen
ceda9f9f4b
Merge pull request #310 from ViRb3/rework-help 
Rework hitag2 read/write help
 2019-08-09 22:16:21 +02:00
Philippe Teuwen
5051ea429d typo 2019-08-09 13:02:10 +02:00
Philippe Teuwen
c58937b5f5 client: clean deps while cleaning objects 2019-08-09 12:12:22 +02:00
Philippe Teuwen
5a6c9e7863 hf tune: mask 32b dword to 16b 2019-08-07 13:04:36 +02:00
Philippe Teuwen
bc28eb04e4 Revert 00350db and add waiting time extension request mechanism, see issue #265 2019-08-07 13:04:34 +02:00
Philippe Teuwen
e057fa6fa0 Add time measurements of recv packets on client side 2019-08-07 13:04:31 +02:00
Philippe Teuwen
9b44590f8d make style 2019-08-07 13:04:26 +02:00
Philippe Teuwen
12a0540d91 mf sim: add option to pass explicitly atqa/sak and reject explicitly unknown vals for option t 2019-08-07 01:32:37 +02:00
Philippe Teuwen
4615354864 mf sim: respect DBG_NONE and explicit ATQA/SAK usage 2019-08-07 00:47:32 +02:00
Victor
d158ffebfd Note that hitag1 read/write not yet implemented 2019-08-06 19:13:38 +01:00
Victor
67887a83d3 Rework hitag2 read/write help 2019-08-06 19:08:51 +01:00
Philippe Teuwen
1354aec556 typos 2019-08-06 13:51:10 +02:00
iceman1001
25748b0746 style 2019-08-05 12:01:11 -04:00
iceman1001
f317e3247a chg: 'lf nedap' - decoding / encoding of Nedap. (anon) 2019-08-05 17:43:53 +02:00
Philippe Teuwen
6f47e12797
Merge pull request #308 from cjbrigato/patch-1 
FIXes # 174 and more (OSX > 10.4 num_Cpus) the good way
 2019-08-05 00:41:20 +02:00
Philippe Teuwen
7a620ddaa7 remove redundant conditions 2019-08-05 00:31:51 +02:00
Colin J. Brigato
38e4e8d80c
FIXes OSX > 10.4 num_Cpus() the good and posix way 
sysconf() is  part of IEEE Std 1003.1-1988 (POSIX.1).
Fortunately, it *is* available to OSX `>=10.5`.
At least on `~10.14`, the old unposix `sysctl` osx way was lost, at least in portable environments.
This fixes it, but will not be compatible with OSX > 10.4. 
So i'm sorry but here we loose compatibility with Macs olders than 2005. (🤣)
 2019-08-05 00:27:15 +02:00
iceman1001
18d2c24e9e chg: 'trace list' - abort when ENTER key is pressed 2019-08-04 19:13:54 +02:00
Philippe Teuwen
f40600f997 make style 2019-08-04 16:57:06 +02:00
Philippe Teuwen
1cb039255e Add client option -i to stay in interactive mode after a script or command 
From 5a3f474331
with some fix in the logical flow
 2019-08-04 15:34:18 +02:00
Philippe Teuwen
88d2a61c0b typo 2019-08-04 12:58:36 +02:00
iceman1001
a90e5e1858 chg: legic cmds uses return macros. 
chg: hf search started to use macros
 2019-08-03 23:36:55 +02:00
Philippe Teuwen
60bfc37f35 remove more dummy cmds 2019-08-03 22:52:32 +02:00
Philippe Teuwen
61538bd635 thinfilm simulation when on battery 2019-08-03 22:37:01 +02:00
Philippe Teuwen
25f358955b make hf search robust to various HF configurations 2019-08-03 22:14:12 +02:00
Philippe Teuwen
4a3fb3ccf1 split nfcbarcode from iso14443a 2019-08-03 22:14:12 +02:00
Iceman
e4972e8810
Merge pull request #305 from ViRb3/better-warn 
Better warn user of hardcoded hitag info
 2019-08-03 20:01:18 +02:00
Philippe Teuwen
017b3357ed Comment Felica simulation in client, there is no corresponding code in ARM 2019-08-03 19:57:57 +02:00
Philippe Teuwen
a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
Philippe Teuwen
cbf5c717f7 Remove unused CMD_* 2019-08-03 19:48:02 +02:00
Victor
a0193fa903 Better warn user of hardcoded hitag info 2019-08-03 18:29:02 +01:00
iceman1001
52065adcfa chg: 'hf topaz reader' - more verbose 2019-08-02 11:37:35 -04:00
iceman1001
0747cf9ec0 add more keys (@anon) 2019-08-02 09:48:42 -04:00
Philippe Teuwen
ab74d2b798 Revert ARRAYLEN on whereami.c, bag of bones... 2019-08-02 08:06:30 +02:00
Philippe Teuwen
0eae1e2563 make style 2019-08-02 00:26:48 +02:00
Philippe Teuwen
865a7c3ad4 Add thinfilm simulation 2019-08-02 00:26:07 +02:00
Philippe Teuwen
824e0ae3e4 use thinfilm trace with hf thinfilm list 2019-08-01 20:15:46 +02:00
Philippe Teuwen
3bc5f7688d thinfilm trace 2019-08-01 20:06:07 +02:00
iceman1001
63a7f8a4c4 fix: 'hf topaz reader' - not crashing when trying to read a thinfilm 2019-08-01 12:36:50 -04:00
iceman1001
5a2d0c4cc1 chg: 'hf thinfilm info' - print text 2019-08-01 12:22:51 -04:00
iceman1001
2a054438ab chg: 'hf thinfilm info' - fixed manufacture lookup 2019-08-01 12:16:33 -04:00
Philippe Teuwen
7bdcf3cff5 thinfilm, show raw data if unknown encoding 2019-08-01 18:03:41 +02:00
Philippe Teuwen
85c0f3e9e3 thinfilm partial info when verbose 2019-08-01 17:49:35 +02:00
iceman1001
10c949a47e chg: 'hf thinfilm info' - versbose mode and sanity checks 2019-08-01 11:33:00 -04:00
iceman1001
2400418067 style 2019-08-01 11:15:39 -04:00
iceman1001
faf68081b0 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-01 11:11:07 -04:00
iceman1001
a331090c6a Chg : 'hf thinfilm info' - added crc check 2019-08-01 11:09:51 -04:00
Philippe Teuwen
8f6c048481 thinfilm: fix urls with 0xFE terminator 2019-08-01 17:07:07 +02:00
Philippe Teuwen
3fb442798d thinfilm usage typo 2019-08-01 15:49:58 +02:00
iceman1001
fbff51c88d Add: hf thinfilm info - support to read and decode Kovio Thinfilm NCT tags 2019-08-01 09:39:33 -04:00
Philippe Teuwen
733a7d836d more ARRAYLEN 2019-08-01 00:14:09 +02:00
Philippe Teuwen
f276dca3f1 less hardcoded sizes and more ARRAYLEN 2019-07-31 23:45:17 +02:00
iceman1001
74288ad128 chg: hf topaz - got some love 2019-07-31 15:43:00 -04:00
Philippe Teuwen
98624037ad hf mfu: please no extended ascii char 2019-07-31 12:43:15 +02:00
Philippe Teuwen
f0c939b1bc hf mfu: avoid hardcoded array size 2019-07-31 12:14:44 +02:00
Philippe Teuwen
5edd342d4c Add NTAG_I2C_1K support to hf mfu, thanks JP Szikora 2019-07-31 12:04:32 +02:00
iceman1001
4c9b95c216 chg: flash messge 2019-07-30 14:31:10 -04:00
iceman1001
6d1c996251 chg: flashing - test messages 2019-07-30 19:22:24 +02:00
netvader
8abbbe4d5e
Update default_keys.dic 
add hotel key from alltours
 2019-07-29 11:03:20 +02:00
Philippe Teuwen
c6b8e199fd fix usart cmd descriptions 2019-07-28 21:08:50 +02:00
Philippe Teuwen
c83ff9da0f make style 2019-07-28 19:24:00 +02:00
Philippe Teuwen
5854ab19dd client tells when over TCP 2019-07-28 19:23:37 +02:00
iceman1001
a25814bda4 ADD: 'trace list' - annotate nano signature 2019-07-28 14:23:30 +02:00
iceman1001
00350db238 Chg: hf tune - increase timeout vaules. fix #265 2019-07-28 03:29:31 -04:00
iceman1001
c5b8df449d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-07-28 09:22:30 +02:00
iceman1001
ca53711b8d chg: lf t55xx - helptext 2019-07-28 09:21:02 +02:00
iceman1001
9f4620c92c make style 2019-07-27 17:48:52 -04:00
iceman1001
f433e26e3b Add: 'hf mfu info' - now does orinality check against ECC. (@pwpivi) 
Adapted to prefered codestyle and added references.
 2019-07-27 23:44:23 +02:00
iceman1001
283060f962 chg: renaming a struct 2019-07-27 21:15:43 +02:00
iceman1001
e99910694b chg: some more key, thanks @Ollibolli 2019-07-27 15:06:58 +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
Iceman
b7ba46d38e
Merge pull request #292 from netvader/patch-1 
Update default_keys.dic
 2019-07-26 23:53:15 +02:00
netvader
54a18ebf2b
Update default_keys.dic 
added some keys from clever fit gym, hotel room turkey, and simonsvoss key card
 2019-07-26 22:45:16 +02:00
3ldidi94
ee152657c6
Add one more key 
Found a new key that is not in this dic file, so I add it.
 2019-07-26 11:43:21 +02:00
mwalker33
9085465c38 Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-07-25 21:00:41 +10:00
mwalker33
3211f35062 Added set default timings 2019-07-25 21:00:30 +10:00
mwalker33
b222161941
Merge branch 'master' into master 2019-07-25 20:12:00 +10:00
mwalker33
77d96ff3b7 Bug Fix Timing order 
Timing for backward compatibility
 2019-07-25 20:01:03 +10:00
Philippe Teuwen
c0eb19acb1 remove tabs 2019-07-24 00:52:24 +02: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
ab043a68b8 remove space in filename 2019-07-23 23:44:41 +02: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
7e84a546c5 GetFromDevice leftovers 2019-07-23 21:45:06 +02:00
Philippe Teuwen
544fb30ce6 typos 2019-07-23 21:40:01 +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
cjbrigato
70cd0d844b FIX : Tereifying typo 2019-07-23 07:39:34 +02: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
daae890667 Bootrom & flasher changes: 
* use macros for versions
* activate UNDERSTANDS_VERSION in bootrom
* fix missing break; bug in bootrom
* force flash_load to reject images > 256k if bootloader not up to date
* move logic from flasher to flash
 2019-07-20 10:48:40 +02:00
slurdge
68aa9d631d Flasher support for versionning 
Only bootrom with version > 1.0.0 will allow 512K writes
 2019-07-20 10:47:24 +02:00
Philippe Teuwen
8e6258936c make style 2019-07-19 13:18:35 +02:00
Philippe Teuwen
33f2cb0981 Rework flasher exit on error 2019-07-19 13:15:32 +02:00
Philippe Teuwen
f6f14f82d4 Add option -i to flasher to query Pm3 for its memory size, and some doc tuning 2019-07-19 13:02:12 +02:00
Philippe Teuwen
44278272a4 typo 2019-07-19 12:39:23 +02:00
slurdge
7bf3255a6c Flasher support for 512K flash 
A better way would be to cut the connecting function and flashing function and to move the whole mem computation to flash.c
Working flasher
 2019-07-19 12:35:04 +02:00
Philippe Teuwen
4e9e7d6da0 temporary fix to get Appveyor happy. Will need more tuning later. 2019-07-18 23:50:45 +02:00