RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-25 00:25:48 +08:00
Code Issues Projects Releases Packages Wiki Activity
14068 commits 3 branches 15 tags 88 MiB
Commit graph

586 commits

Author SHA1 Message Date
Philippe Teuwen
4ec7bca270 Add option to define extra symbols for 'lf cmdread', required e.g. for Hitag Micro and for talking to HT2 in emulation mode 2020-09-17 17:18:14 +02:00
Philippe Teuwen
ecbcba18dd identify gen3 2020-09-11 18:17:58 +02:00
iceman1001
5b695153b6 improved staticnonce tristate processing 2020-09-11 16:15:58 +02:00
iceman1001
866f4b6313 hf 14a info - ntag21x identification 2020-09-10 20:40:12 +02:00
iceman1001
9ced99a853 cident super card 2020-09-10 01:31:54 +02:00
Ave
f1146d360f
Introduce compatible write support to hf mfu wrbl 2020-09-07 22:34:44 +03:00
Philippe Teuwen
e3b8e868ea hf 14a config: force RATS 2020-09-07 15:09:24 +02:00
iceman1001
5d357a6039 style 2020-09-07 10:39:15 +02:00
Philippe Teuwen
2fc36d73c9 hf 14a config: better options 2020-09-07 10:24:12 +02:00
Philippe Teuwen
b751354ea2 hf 14a: add config loopholes to deal with badly configured cards: invalid ATQA, invalid BCC, invalid SAK 2020-09-07 00:50:27 +02:00
iceman1001
7c0510a0b2 added PPS 2020-09-06 11:29:51 +02:00
Eloff
70be7ef4d8 Magic gen 3 cards support 2020-09-05 22:32:11 +03:00
tharexde
c49e2d7ba9 solved 2020-09-05 13:25:57 +02:00
iceman1001
9d43bfbb01 textual and added one new error code PM3_EPARTIAL 2020-09-03 10:30:30 +02:00
iceman1001
e10333e21a new error define 2020-09-02 12:38:19 +02:00
iceman1001
09faa2fc13 first nibble 2020-08-28 10:14:36 +02:00
iceman1001
cda72aef40 Q5/T5555 has a fix 06 first byte in the configblock. Thanks @mwalker33! 2020-08-28 10:03:33 +02:00
iceman1001
2be85939f7 fix: hf 15 cetsuid. hf 15 sim 2020-08-17 08:52:24 +02:00
iceman1001
49aa198c88 annotate cryptorf 2020-08-16 09:59:41 +02:00
iceman1001
729cbb1874 prepp cryptorf @baloncu 2020-08-16 09:28:49 +02:00
iceman1001
858a93fb35 prepp cryptorf @baloncu 2020-08-16 09:23:34 +02:00
iceman1001
6bd0138f14 add a clear screen for ansi enabled terms 2020-08-13 17:42:46 +02:00
iceman1001
ccbfdf9e88 add: mem spiffs wipe 2020-08-08 12:33:12 +02:00
iceman1001
e147bdc71b renamed readtagfile to view\nrenamed clone to restore\nrefactored reader, info, dump, rdbl, wrbl to be on device side. Commands now also seamless works with NON_SECURE_MPAGE 2020-07-29 11:02:30 +02:00
iceman1001
50d2597fcb remove some cluttering down of list when cardhelper is active 2020-07-29 10:19:25 +02:00
iceman1001
b986818bd5 some defines to make it more readable 2020-07-29 10:18:25 +02:00
iceman1001
a1529b44ca fix auth and 2020-07-19 20:45:47 +02:00
iceman1001
8d5315b6af fixes to mode 2020-07-15 11:34:14 +02:00
iceman1001
7aedd9c7fe textual 2020-07-13 12:28:30 +02:00
Philippe Teuwen
eb61524923 Merge branch 'master' into fpga 
* master: (27 commits)
  fix a bug in demodParadox()
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  fix #833  - missing some configblocks and spelling
  remove verichip.
  chg 'lf t55xx info' - detection of t55x7 configuration blocks
  remove
  disable verichip stuff.  should be inside FDX already
  textual
  lf t55 configblock detection updated
  textual
  fix: missing define on some mingw
  chg: hf mf decrypt - helptext (thanks @AdamLaurie)
  Update bt_manual_v10.md
  textual
  ...
 2020-07-11 15:25:20 +02:00
tharexde
59372cb5d4 added new command "4x50_wipe" 2020-07-09 01:58:16 +02:00
iceman1001
ce24e6acbb fpga merge hell, all compiles 2020-07-08 09:45:49 +02:00
iceman1001
d83a45f0cb fpga merge changes 2020-07-06 15:16:00 +02:00
iceman1001
7d1a278197 merge hell p.x 2020-07-03 21:33:17 +02:00
tharexde
942493970e renamed 'sread' to 'read' 2020-06-28 21:38:19 +02:00
tharexde
eddaf70ef9 added timeout value if there's no tag on device 2020-06-28 21:35:49 +02:00
tharexde
972ad78a40 rearranged defines 2020-06-26 14:21:54 +02:00
tharexde
3cf04e6cb9 added 4x50_sread 2020-06-26 14:21:29 +02:00
tharexde
cdb57c9c2b Merge branch 'master' into dev_em4x50_info_write 
merge conflict
 2020-06-22 21:04:48 +02:00
iceman1001
b59131d349 chg: 'lf em/hid/io/awid watch' - colors, unified, NG 2020-06-22 14:56:13 +02:00
iceman1001
683954316a chg: 'lf em 410x_watch' - now uses NG and on deviceside only 2020-06-22 13:24:33 +02:00
iceman1001
ba6bc0ecef chg: 'lf io watch' - uses NG and reports back to client 2020-06-22 12:57:28 +02:00
tharexde
cfeb869dab added write and write_password functions 2020-06-16 23:26:28 +02:00
tharexde
1adc0de21d added EM4x50 info function 2020-06-15 14:30:50 +02:00
tharexde
b99f7213e8 added EM4x50 info function 2020-06-15 14:30:18 +02:00
Bjoern Kerler
631be7af32 Fixes 2020-06-13 15:11:10 +02:00
Bjoern Kerler
5adc8e876a Fix DES authentification and format picc 2020-06-13 14:19:21 +02:00
slurdge
c11c7ab545 Add support for client getting bigbufsize 2020-06-10 23:03:03 +02:00
Philippe Teuwen
90775638b1 Revert "fix: osx doesn't like target directive" 
This reverts commit 690db96a7d.
 2020-06-08 11:07:45 +02:00
iceman1001
690db96a7d fix: osx doesn't like target directive 2020-06-07 22:05:54 +02:00
iceman1001
a9d89c7d06 fix: RAMFUNC 2020-06-07 19:46:41 +02:00
iceman1001
00ece05e79 added python3 scripts has their own folder 2020-05-26 11:30:37 +02:00
Philippe Teuwen
a6f76444de Put logfiles in subdir 2020-05-24 01:20:43 +02:00
Philippe Teuwen
f54f8103ac fix pathsep in subdirs 2020-05-24 01:03:23 +02:00
Philippe Teuwen
ef586c2a41 version info also for client, still cmake to do 2020-05-20 21:11:45 +02:00
Philippe Teuwen
cb8d589fc4 armsrc: clarify static vars vs global vars, part 3 2020-05-19 18:12:40 +02:00
Philippe Teuwen
2ba350903a more tracelog rework 2020-05-19 02:14:51 +02:00
Philippe Teuwen
1c8c1d82ea fix coverity 267211 & 267206 logically dead code 2020-05-14 01:01:48 +02:00
Philippe Teuwen
edb1c85cd3 fix colored readline prompt bug 2020-05-07 21:56:09 +02:00
Philippe Teuwen
fbd0a7e284 typo 2020-04-28 19:58:07 +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
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
iceman1001
0e2ac41717 annotage desfire more 2020-04-10 10:28:15 +02:00
Bjoern Kerler
7191aa8b14 Fix signature command. Special response 0x9190 ? 2020-04-10 00:56:37 +02:00
Bjoern Kerler
3b915d343b Add delete aid and minor fix 2020-04-09 19:51:35 +02:00
Bjoern Kerler
057e611b6d Fix bugs, improve error reporting, add format picc and createapplication 2020-04-09 17:15:45 +02:00
Bjoern Kerler
a3ea353dab Improve hf mfdes and cleanup 2020-04-08 22:44:51 +02:00
iceman1001
a0874248c7 chg more pm3 fail codes 2020-04-08 13:27:13 +02:00
iceman1001
d889a9a2d4 style 2020-04-08 05:03:27 +02:00
Bjoern Kerler
3833b8ee3b Add Mifare Desfire GetDFNames and improve HF MFDES Enum output 2020-04-07 21:30:12 +02:00
iceman1001
34adf411c3 layout, text, colors - mfu info, 15 info 2020-04-04 12:17:55 +02:00
iceman1001
cf47e50267 define additional frame 2020-03-19 12:18:29 +01:00
iceman1001
fe0d9c8d9f hf mfdes enum - fixes WIP 2020-03-17 11:37:38 +01:00
iceman1001
5f29601947 add desfire light signature verification check 2020-03-17 01:50:45 +01:00
iceman1001
437504eae6 fix: hf mfu pwdgen - xyz forgot header 2020-03-13 12:09:49 +01:00
iceman1001
8a3f2d03ac style 2020-03-09 16:54:42 +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
iceman1001
b6dcfbf078 chg: allow to download ´lf config´ settings to client 2020-03-05 11:16:05 +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
iceman1001
3fa5858af9 textual 2020-01-20 11:47:13 +01:00
iceman1001
e85fabf015 chg: 'lf hitag list' - improved hitag annotation 2020-01-20 11:37:10 +01:00
iceman1001
69bb285524 fix: 'hf lto info' - now correctly selects and prints LTO-CM uid. 2020-01-17 13:44:41 +01:00
Philippe Teuwen
b57f40e3d7 make style 2020-01-15 19:26:12 +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
iceman1001
6e3dde9d76 add 'hf plot' - from offical repo (piwi) 2020-01-12 16:45:24 +01:00
iceman1001
0869cbc6ad Fix: 'lf config' - calling without param messes up all device settings. 2020-01-09 19:28:44 +01:00
iceman1001
f304528fc0 add: added nrz simulation for lf. *wip* needs pattern for nrz. 2020-01-04 20:00:37 +01:00
iceman1001
0219c6b125 more defines 2019-12-24 11:30:46 +01:00
iceman1001
aeb3f74c10 Add: 'hf lto list' - annotation for LTO-CM 2019-12-24 00:57:15 +01:00
iceman1001
a6a48f0e6d Chg 'hf 14a info' - static/fixed nonce detection 2019-12-23 15:23:04 +01:00
iceman1001
bd50760a24 LTO-CM commands defines 2019-12-22 11:20:39 +01:00
iceman1001
3ddf7a0ce5 iso15 - add some annotation for write mulit 2019-12-20 11:23:27 +01:00
Thomas Sutter
bb53a40adb Add auth1 output - experimental. 
Add auth2 command - experimental.
 2019-12-17 13:09:14 +01:00
Thomas Sutter
a65cfc5f4b Fix auth1 response. 2019-12-17 08:19:42 +01:00
merlokk
1efc731fac refactoring and break operation via keyboard 2019-11-29 17:23:30 +02:00
unknown
1b6566cd5c Added support for some ISO15693 custom NXP commands 2019-11-22 13:55:09 +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
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
Thomas Sutter
601b8d281a Add command request system code. 
Add command request specification version.
Add command reset mode.
Make Style.
 2019-11-04 10:24:29 +01:00
Thomas Sutter
2e60cb4fa6 Add write without encryption command. 2019-10-29 11:14:38 +01:00
Thomas Sutter
498c4b8377 Refactor FeliCa structs. 2019-10-29 10:22:47 +01:00
Philippe Teuwen
eb7268cd98 lf: change macros to allow float freq, change 134 -> 134.2 2019-10-25 00:42:47 +02:00
Thomas Sutter
bfd5214cd5 Add read_without_encryption command. 2019-10-24 16:08:44 +02:00
Thomas Sutter
3b0447fbb3 Draft read without encryption 2019-10-24 08:44:20 +02:00
Thomas Sutter
1f7dd3e2a7 Add request response command for felica Mode. 2019-10-23 14:48:23 +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
iceman1001
065a1b6848 chg: enforce PACKED on more structs 2019-10-17 22:32:09 +02:00
Philippe Teuwen
3fce47d023 Add hw tia to trigger a new Timing Interval Acquisition 2019-10-15 15:02:34 +02:00
iceman1001
76f7763893 motorola 2019-10-11 23:14:57 +02:00
iceman1001
371a0e3ee0 coverity 226308 2019-10-10 11:13:14 +02:00
iceman1001
07a23b202c coverity 226308 - fix logically dead code 2019-10-09 13:56:01 +02:00
Philippe Teuwen
86a47a3282 dangerous stuff... 2019-10-09 13:03:23 +02:00
Philippe Teuwen
3560cf5466 bootrom: remove deprecated CMD_SETUP_WRITE 2019-10-05 19:10:40 +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
mwalker33
40b1d3bea7 samples to skip (unint32_t) 
Use unit32_t for all samples to skip
 2019-09-30 19:22:26 +10:00
mwalker33
cf0d72e172 lf sniff offset 
Added samples to skip to lf config
 2019-09-29 10:43:01 +10:00
iceman1001
b2c24c8010 add - continuously measure LF antenna 2019-09-24 13:06:43 +02:00
Philippe Teuwen
11dcc4787d mfc magic: add some defines 2019-09-21 23:50:32 +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
59e66ce5fd lf hid sim: add support for long ID 2019-09-15 02:00:42 +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
iceman1001
a5bcecd05c wait define.. 2019-09-12 17:39:57 +02:00
Iceman
341703d9a7 chg: 'hf iclass sim' - better iClass protocol implementation 2019-09-11 13:09:08 +02:00
Philippe Teuwen
6385ee960f searchFile for firmwares 2019-09-09 19:55:27 +02:00
Iceman
01950bd962 chg more ansi color 2019-09-05 15:46:40 +02:00
Philippe Teuwen
43055ae6a7 searchFile for cmdscripts 2019-09-04 23:29:03 +02:00
Philippe Teuwen
4d31b2399b reintroduce PREFIX and use relative paths for finding share/ when installed, independently of PREFIX 2019-08-30 21:36:10 +02:00
Philippe Teuwen
2022df1068 make style 2019-08-30 10:45:52 +02:00
Philippe Teuwen
08a5de1f0e searchFile traces 2019-08-30 08:32:34 +02:00
Philippe Teuwen
ca8aee33ea move iclass_dump.bin in resources/ 2019-08-30 01:23:10 +02:00
iceman1001
94f6a402e8 chg. prep for eload.. 2019-08-28 21:12:18 +02:00
Philippe Teuwen
8c26e07ceb use searchFile to find dictionaries 2019-08-23 22:08:36 +02:00
Philippe Teuwen
34a0fdb9d6 reorganize lua script dir defs 2019-08-23 22:07:45 +02:00
Philippe Teuwen
c709ee7c10 rework PREFIX for future make install 2019-08-23 20:55:50 +02:00
Philippe Teuwen
595b8a1885 introduce PREFIX for pm3 system directory and move to common.h 2019-08-22 19:36:20 +02:00
Iceman
c69d599a3f
Update protocols.h 
From https://github.com/Proxmark/proxmark3/pull/855  (@pwpiwi)
 2019-08-21 14:49:55 +02:00
Philippe Teuwen
fdcc885aa9 Use /dev/tty on OSX rather than /dev/cu 
See https://stackoverflow.com/questions/8632586/macos-whats-the-difference-between-dev-tty-and-dev-cu/8632603
 2019-08-20 23:21:22 +02:00
Philippe Teuwen
847b6bcc33 remove tabs 2019-08-13 17:51:11 +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
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
d84a316b4c fix MCK, maths... facepalm 2019-08-07 14:55:29 +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
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
8b3159c83d Use more defines when using main clock or master clock 2019-08-06 13:40:08 +02:00