Commit graph

141 commits

Author SHA1 Message Date
iceman1001
a8569849d6 part of monstermerge.. 2017-07-27 20:58:59 +02:00
iceman1001
8f262aa1bf ADD: num_CPUs(void) method from pm3 master
CHG: clean up in util.c
ADD: seems like mingw doesn't have scandir. Had to add one. *untested*
2017-07-27 09:36:16 +02:00
iceman1001
b149fdc67b FIX: 'script run mifare_autopwn' some print statements
FIX: 'script run mfkeys'  correct author,  added copyright
2017-07-24 13:00:40 +02:00
iceman1001
c4c3bedb8a FIX: 'script run mfkeys' Script was mistakingly only checked first testkeys block with 85 keys. Since the selection in testkeys list was not taking lua way of ranges, it only sent zeros. 2017-07-22 14:02:51 +02:00
iceman1001
72f6ed45eb FIX: 'script run formatMifare' https://github.com/Proxmark/proxmark3/pull/362 bad comparision value 2017-07-22 14:00:54 +02:00
iceman1001
ed54dc8e17 FIX: 'dumptoemul.lua' doesn't add the last newline in generated eml file.
FIX:  'dumptoemul-mfu.lua' doesn't add the last newline in generated eml file.
FIX:  'dumptoemul-mfu.lua' correctly gets the UID from bin file,  previously took wrong data.
2017-07-11 19:37:59 +02:00
iceman1001
a211877853 CHG: 'script run didump' - got some remake. unfinished.
CHG: some default keys
2017-07-04 20:23:47 +02:00
iceman1001
de048b0436 Merge branch 'master' of https://github.com/iceman1001/proxmark3 2017-06-09 14:49:35 +02:00
BOURDY Romain
bf413f1b87 Start fixing legic.lua ! Now loads dumps fine 2017-05-17 18:52:30 +02:00
iceman1001
e093a375ef CHG: added key gen algo. removed inparameter. 2017-04-29 01:08:19 +02:00
iceman1001
2d0341403e ADD: script to change uid on a UL magic tag which uses backdoor commands 2017-04-20 15:29:45 +02:00
iceman1001
b9534ca070 FIX: introduced a bug in luascripts when adding the "safe ascii chars" to ConvertHexToAscii. Now its optional. 2017-03-09 10:26:01 +01:00
iceman1001
57778a4630 CHG: renamed struct sector -> sector_t
CHG: defines on armside
CHG: #define WIN32 ->  _WIN32
CHG: started to enhance "hf mf chkkeys"
REM: removed some duplicates etc in default keys.
2017-03-06 19:11:08 +01:00
iceman1001
dd015c5915 ADD: 'script runt remagic' - the Mifare Classic s50 (1k) magic tag restores now also all sector trailers. Default A/B keys is 0xFFFFFFFFFFFF. 2017-02-14 15:54:10 +01:00
iceman1001
1cec48cc0e ADD: added the writedumpfile function from "14araw.lua" into utils.lua
ADD: `ufodump.lua` - added the Aztek dump script. Since its an unknown tag hence the name.
2017-01-30 16:51:07 +01:00
iceman1001
e069d740e3 still wrong... 2017-01-25 08:40:55 +01:00
iceman1001
4431b482d7 CHG:forget the "base".. 2017-01-25 08:36:51 +01:00
iceman1001
f364f71294 chg: known key is treated as a string. 2017-01-25 01:11:34 +01:00
iceman1001
b946d5f7f9 ADD: 'script run hard_autopwn' - a lua script which should run hardnested attack against all sectore and keytypes (A|B). 2017-01-25 00:23:13 +01:00
iceman1001
b7f40ee2ad CHG: added a check if err variable is NIL. 2016-11-22 11:55:23 +01:00
iceman1001
d1e197e9ec FIX: the changes to uart.c timings seems to have fixed my problem with the pm3 device getting unresponsive.
CHG: "script run hard"  now iterates all sectors on the tag and output the table style like "hf mf chkkey" do.
2016-11-22 01:58:11 +01:00
iceman1001
e108a48ac4 ADD: added the 'hf mf hardnested' to be called within LUA scripts.
ADD: 'script run hard' - a first try for a lua script to run the hardnested attack on a complete tag.
2016-11-21 16:08:12 +01:00
iceman1001
100fe0a5ee textual suger 2016-10-19 21:26:56 +02:00
iceman1001
62254ea5a7 FIX: Since some changes in "hf mf chk" usbcommand package, this script has not been working. It now calls and gets the results back from the device.
CHG: changed the output listing to look like the other key-tables.
2016-10-17 17:20:33 +02:00
iceman1001
b62cbadb61 CHG: fixes to match the new arguments to the darkside attack (keytype A|B and blocknumber) in mifare_autopwn.lua script. 2016-08-07 21:19:11 +02:00
iceman1001
fa5118e730 CHG: some calyspo stuff 2016-08-04 21:57:40 +02:00
iceman1001
e0530dbcec Applied @icsom 's fixes from: b577582490 2016-06-22 09:33:21 +02:00
iceman1001
3c61ee4338 chg: added to print the author. 2016-06-20 13:31:51 +02:00
iceman1001
6648776f2a CHG: added the possibility to "remagic" the new found Mifare Ultralight tags, which answers to chinese backdoor commands for uid change.
The script now deals with to different kind of tags.  Mifare Classic 1k gen1  and  Mifare Ultralight gen1 (7bytes uid)

-Classic will get    UID: 01 02 03 04
-Ultralight will get UID: 53 80 71 02 00 D9 80
2016-05-15 19:27:04 +02:00
iceman1001
8085377413 CHG: output when finding key it the same as from the client. 2016-05-10 07:51:05 +02:00
iceman1001
fed1227777 CHG: just made the autopwn script main loop a bit more verbal 2016-05-10 07:40:27 +02:00
iceman1001
e75bc417f1 ADD: added a lua script which calculates mifare keys based on a uid diversification 2016-05-06 10:19:15 +02:00
iceman1001
ffeb77fdc6 CHG: the 14b is getting better, since I added the fpga waiting signaling I found in "14a emgetcmd" etc. 2016-04-29 22:23:32 +02:00
iceman1001
12b998cbd8 ADD; Some 7816 error codes 2016-04-05 04:46:25 +02:00
iceman1001
ab6d8a4c47 CHG: fixed the commands, its now valid calypso 7816 commands. 2016-03-21 22:06:51 +01:00
iceman1001
4bf0f73d76 increased a number of calypso commands for selecting files and trying to read them 2016-03-20 21:30:40 +01:00
iceman1001
452aab1e59 ADD; first try at reading calypso tags 2016-03-20 20:22:35 +01:00
iceman1001
790e8eae09 ADD: @icsom changes and additions to lua scripts for LEGIC 2016-03-20 19:25:48 +01:00
iceman1001
4e8fa8b448 ADD: get a updated script from @icsom 2016-03-06 13:26:13 +01:00
iceman1001
7f0cb92e0d CHG: Added @icsom 's changes to his legic.lua script. 2016-03-01 07:07:56 +01:00
iceman1001
733eb42022 ADD: Added three legic luascript from @iscom (Mosic) Great work! 2016-02-28 14:50:49 +01:00
iceman1001
8977988fb6 FIX: forgot a lua object for the call to ConvertAsciiToHex. Thanks @romaric for finding it. 2016-01-15 21:47:32 +01:00
iceman1001
2b1f4228c2 ADD: @marshmellow42 's changes to "hf mfu *" ,
ADD: @marshmellow42 's changes to "hf mf sim",
ADD: @pwpiwi 's parity files was missing.
2015-12-15 09:34:55 +01:00
iceman1001
84f9cf0626 ADD: a minor xor script 2015-10-30 09:07:04 +01:00
iceman1001
a826cb0df1 FIX: tnp3sim, now can insert keys if the dumpfile is blank. Like the ,,,lander dumps... 2015-10-19 22:39:08 +02:00
iceman1001
f14c9bf915 FIX: "abort trap 6" error when runing the tnp3sim.lua script was because the CMD_MIFARE_EML_MEMSET needs to sent the bytewitdh now with recent changes in code to deal with different sizes in emulatormemory. the third argument should be 16 instead of 0. 2015-10-17 14:35:04 +02:00
iceman1001
d8a3b6c117 FIX: @tony pointed out that there was a method name lost... its been reinstated :) 2015-10-17 14:16:42 +02:00
iceman1001
a739812e89 FIX: thanks @tony, for pointing out a "end" statement inside tnp3sim.lua
ADD: @marshmello42 fixs for t55x7
2015-10-16 23:16:46 +02:00
iceman1001
3bc7b13d23 ADD: @marshmellow42's decrypt crypto-1 method,
ADD:  @piwi's latest commit to PM3 Master, aiming at the WDR in "hf mf mifare".
2015-10-11 09:07:29 +02:00
iceman1001
f3cfe428f8 ADD: fixed some spelling misstakes in luascript.
ADD: fixed some spelling misstakes in "hf mfu eload" help
2015-10-05 21:25:00 +02:00