Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-21 23:36:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
1776 commits 3 branches 11 tags 34 MiB
Commit graph

51 commits

Author SHA1 Message Date
pwpiwi c48c4d7856 New: implementing hf mf hardnested 
This implements the attack described in
	Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened
	Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on
	Computer and Communications Security, 2015
It uses precomputed tables for many bitflip properties (not only two as in the paper)
and is therefore quite efficient. To prevent failing it doesn't do
differential analysis with several nonce bytes' Sum(a8) properties (each of them
may be wrongly guessed) - instead it concentrates on one nonce byte and tries all
Sum(a8) property guesses sequentially (ordered by probability). The brute force phase
makes use of aczid's bit sliced brute forcer (https://github.com/aczid/crypto1_bs).
Includes runtime CPU-detection to leverage modern (and old) SIMD instructions
with a single executable.
 2017-05-31 07:30:56 +02:00
pwpiwi fb9acd4588 Update/cleanup Makefiles (#265) 
- add new target "make mfkey" to build mfkey32 and mfkey64
- include above when "make all"
- fix Qt detection for Kali Linux
- create and use dependency files when building client
- create client/lualibs/usb_cmd.lua from include/usb_cmd.h when building client
- add Windows *.exe files with "make tarbin"
- For the time being don't include Makefile.common in Makefile and client/Makefile
- set com3 as default flashing port for Windows (including mingw)
- remove static targets snooper and cli. Remove their sources as well.
 2017-03-31 16:04:04 +02:00
James Chambers 4b12061bee fix recvLen variable name in hf_reader 2017-02-20 14:31:21 -05:00
marshmellow42 e04475c421 Add @Iceman1001 s cotag read 
also needed to include some of icemans timer additions.
 2017-02-03 00:14:34 -05:00
William Robinet 63744b5681 Typos 2016-02-17 15:44:18 +01:00
marshmellow42 709665b5d1 lf viking build / lf awid refactor / lfdemod.c debugMode==2 
lf viking from other users - just put my spin on it
lf awid refactored code - possible to make it not 26bit specific now
with minor chanages
lfdemod.c now supports extra debug printing if `data setdebug` = 2 when
not on device (on client not arm)
 2015-11-22 00:00:32 -05:00
marshmellow42 66837a0302 Add lf t55xx resetread cmd + fix clone cmds 
resetread cmd to determine start of streaming bits of ata5577 or
compatible chips...
fixed lf clone bugs introduced while refactoring recently...
 2015-10-30 23:23:27 -04:00
marshmellow42 be2d41b73a updates to lf t55xx commands 
fix wakeup cmd per @iceman1001
fix dump and read cmds
clean up write command
allow page 1 read/write (block 3 is writable)(ata5577 only)
remove duplicate code
 2015-10-22 16:19:23 -04:00
marshmellow42 c54dff4f4a Merge remote-tracking branch 'Proxmark/master' into iclass 
Conflicts:
	CHANGELOG.md
 2015-10-07 09:34:47 -04:00
marshmellow42 3ac22ee1cf use read instead of readcheck except to auth 2015-07-23 01:12:02 -04:00
Martin Holst Swende e2012d1bd3 Implemented 'hw status' and 'hw ping', put back client-side cacheing of 'hw version' 2015-07-21 23:18:51 +02:00
marshmellow42 6b659d2406 Merge remote-tracking branch 'upstream/master' into iclass 2015-07-20 21:26:35 -04:00
marshmellow42 aa53efc340 iclass additions 
multiple contributors - thanks!
 2015-07-20 13:41:40 -04:00
Craig Young c0c35f9bb6 Adding CMD_AWID_DEMOD_FSK to commands.lua 2015-07-13 16:18:59 -04:00
pwpiwi 132a02179c fixing iso 14443b (issue #103): 
- fix: treat empty commands as error
- deleting dead code
- rename USB-Commands (ISO14443 -> iso14443B)
 2015-06-18 09:49:22 +02:00
marshmellow42 1c4c0b0681 add @Iceman1001 s sha1 scripting changes. 2015-05-30 21:51:15 -04:00
marshmellow42 9d87eb6650 MF ultralight code cleanup 2015-05-18 13:11:00 -04:00
marshmellow42 9ccfb3a8bc @iceman1001 's updated lualibs 2015-05-13 21:36:20 -04:00
marshmellow42 f168b2633b MF Ultralight - Iceman's updates + mine 
Beginning of Ultralight additions.
detection of Ultralight Types added
dump command now auto detects type
can authenticate Ultralight C
 2015-04-29 18:27:31 -04:00
marshmellow42 8e0cf02308 minor change to lf em4x menu & iceman script... 
...updates
 2015-04-10 00:06:59 -04:00
marshmellow42 411105e036 added nexwatch demod & iceman lua 
added nexwatch demod (also added to lf search)
added iceman's lua script adjustments
 2015-04-08 14:19:03 -04:00
marshmellow42 872e3d4d6f NEW lf simpsk 2015-02-21 21:36:02 -05:00
marshmellow42 40148ab609 Merge remote-tracking branch 'upstream/master' 2015-02-19 21:38:17 -05:00
marshmellow42 abd6112fc4 Revert "Revert "lf simask, lf simfsk and bug fixes"" 
This reverts commit e396001c47.
 2015-02-19 21:35:34 -05:00
marshmellow42 e396001c47 Revert "lf simask, lf simfsk and bug fixes" 
This reverts commit fb0c84c3df.
 2015-02-19 21:22:05 -05:00
marshmellow42 fb0c84c3df lf simask, lf simfsk and bug fixes 2015-02-19 21:21:11 -05:00
iceman1001 33315928fb CHG: added some more token-tags. 2015-02-16 19:05:59 +01:00
iceman1001 a6cfa75035 add: lots of new toytypes in default_toys.lua 
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
 2015-02-04 11:49:21 +01:00
iceman1001 5149e37e66 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
 2015-01-20 09:32:53 +01:00
Martin Holst Swende f44a01235c Merge branch 'master' of https://github.com/iceman1001/ForPm3 2015-01-09 21:50:36 +01:00
Martin Holst Swende 31d1caa526 Reverted some minor things, altered other things to get it to compile cleanly 2015-01-08 17:51:52 +01:00
iceman1001 03d7b60f2b ADD: default_toys.lua a script which identify tnp3xx tags 2015-01-08 17:36:01 +01:00
iceman1001 b915fda392 FIX: a solution for the issue "hf mf esave - always saves 4K" 
FIX: a solution for the issue "hf eload, esave, cload, save - filepath variable too short"
CHG: minor code clean up.
ADD: AES / CRC16 for lua. (and tnp3xx scripts.)
ADD: tnp3dump.lua  script to dump tnp3xx tags.
ADD: tnp3sim.lua script to let PM3 imitate an tnp3xx tag. Needs to be tested live
 2015-01-07 22:00:29 +01:00
iceman1001 3af373f352 CHG: Added support for tnp3xx in lua scripts. 
ADD: a save file function in lua.
 2015-01-07 20:45:43 +01:00
marshmellow42 66707a3b3c LF Demod bug fixes and add lf em em410xdemod 
fixed a few bugs in lf demod that the streamlining added.  added new lf
em em410xdemod command that loops until button pressed. (similar to lf
hid fskdemod
 2014-12-29 15:32:53 -05:00
Martin Holst Swende fdefed663f Some more lua-scripts and library fixes from iceman, including more default keys 2014-08-29 09:11:36 +02:00
Martin Holst Swende 5b1311fba2 Various scripts from iceman 2014-08-29 09:09:23 +02:00
martin.holst@gmail.com 4c367827b5 Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html 2013-11-07 11:32:13 +00:00
martin.holst@gmail.com b11542a7f6 Minor fix in html skeleton 2013-10-31 18:24:03 +00:00
martin.holst@gmail.com e26df8425a Some more tinkering with a generic 13.56MHz reader, still not finished 2013-10-31 10:35:03 +00:00
martin.holst@gmail.com 5198f2e23c First steps towards creating a generic HF reader/identifier. A coop with Asper. 2013-10-30 21:10:47 +00:00
martin.holst@gmail.com 62a95012e9 Changed html template, in order to make it more generic and be usable on other types of data than mifare, now supports different highlighters. Implemented are NDEF and Mifare 2013-10-30 18:21:42 +00:00
martin.holst@gmail.com c44241fdea Fixed minor errors 2013-10-20 18:47:15 +00:00
martin.holst@gmail.com 6742c089b1 Changes to how dumping is performed, now utilises a library. This is in preparation for a more generic dumping of different types of cards. Also added functionality to html-dump .eml-files 2013-10-19 20:18:50 +00:00
martin.holst@gmail.com 3c9ed0e180 Put manufacturer country within brackets 2013-10-18 07:36:20 +00:00
martin.holst@gmail.com 65e344df3e Some refactoring, also placed wait14443a here 2013-10-17 19:21:04 +00:00
martin.holst@gmail.com 5eab31c336 Manufacturer-info, to be used in upcoming script 2013-10-17 19:20:10 +00:00
martin.holst@gmail.com 57d384004d Changes to html-dump generateion, credits to en4rab http://www.proxmark.org/forum/viewtopic.php?pid=8576 2013-10-17 18:28:21 +00:00
martin.holst@gmail.com e481bc3299 Removed double print-out 2013-10-07 10:02:25 +00:00
martin.holst@gmail.com 61caacda2b Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone .. part 2 2013-10-03 12:34:28 +00:00