RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-10-31 16:42:34 +08:00
Code Issues Projects Releases Packages Wiki Activity
4613 commits 3 branches 18 tags 91 MiB
Commit graph

72 commits

Author SHA1 Message Date
iceman1001
9e07a5c65a CHG: updated to RevEng v1.6.0 2018-12-31 15:46:32 +01:00
iceman1001
ccb0cd23f5 FIX: 'lua calc of iso15692 crc' - works better now 2018-11-30 01:19:57 +01:00
merlokk
f0741798e6 fix scripting 2018-11-07 18:20:24 +02:00
Chris
b3ebf73ecc chg: lua - Swapping param order to make it more clear. From (length,offset) to (offset,length) 2018-11-05 18:45:46 +01:00
Chris
e26e9aa710 ADD: added support for lua-script to download from Flashmemory. 2018-11-05 18:32:53 +01:00
iceman1001
513d0aca44 upd: RevEng v1.5.3 2018-07-29 07:37:23 +02:00
iceman1001
939b727c42 chg: converting malloc calls -> calloc which zeros out the allocated memory 2018-05-03 19:42:16 +02:00
iceman1001
1d8d611737 chg: unified download 2018-05-02 19:54:06 +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
511cae77f1 chg: 'lua scripting' - getfrombigbuf has now timeout 2018-04-27 16:46:38 +02:00
iceman1001
ec54fa5b30 fix: crc16 ccitt in utils.lua has been adapted for the new crc16. 2018-04-18 16:08:46 +02:00
iceman1001
65a4253e7e print.. 2018-02-21 17:56:09 +01:00
iceman1001
4e915d2eb4 chg: prng detection now takes in consideration if detection fails. 2018-02-20 21:20:17 +01:00
Brian Pow
35e62e7d1f CHG: 'hf mf hardnested' now use hf-mf-<UID>-nonces.bin by default, with parameter 'u' or 'f' to override. 2018-02-09 22:56:15 +08:00
iceman1001
7de458486f adjustments, still breaks on ubuntu, 2018-02-03 22:47:17 +01:00
iceman1001
0234ca5654 scripting, remove free 2018-02-03 22:33:51 +01:00
iceman1001
8a49cb84a2 fix: script run e - if called with param but no value, use default value for width. 
fix: if no models found, return lua error.
textual changes.
 2018-02-03 22:17:07 +01:00
iceman1001
52d69ed4ee CHG: refactor CRC16 algos. This is a big change, most likely some parts broke, hard to test it all. 2018-02-01 15:19:47 +01:00
iceman1001
c2725bfa99 chg: enhanced rtrim for command prompt. 2017-12-21 10:08:07 +01:00
iceman1001
80722fe067 chg: detect_classic_prng should only report back true/false 
chg:  scripting.c  got some code cleaning.
 2017-12-18 15:43:45 +01:00
iceman1001
e6f0672015 chg: strange behavior when running checks with hardnested 2017-12-18 11:29:34 +01:00
iceman1001
e5f2198653 FIX: scripting, faulty command vaule for darkside attack. 2017-12-10 09:18:16 +01:00
iceman1001
21d4c5a530 FIX: scripting, darkside attack used faulty value instead of MIFARE_AUTH_KEYA... 2017-12-10 09:15:22 +01:00
iceman1001
b89b3399dc FIX: if receiving array isnt large enough, previously this will smash the stack.. 2017-12-02 20:45:53 +01:00
iceman1001
b5010ddfe8 fix: signed / unsigned errors. 2017-11-26 07:29:05 +01:00
iceman1001
9b573e06a4 ADD: hooking up 'pwdgen algo D' for lua-scripting 2017-11-26 07:08:27 +01:00
iceman1001
d5153b2446 warnings on ubuntu 2017-07-31 15:46:22 +02:00
iceman1001
ef136096a3 fix: darkside also take blockno / keytype arguments. Think that block 0 might be lock in the access rights. 2017-07-31 15:45:01 +02:00
iceman1001
0e31ed346a minor adjustments.. 2017-07-30 11:15:48 +02:00
iceman1001
f28da2da6e monster merge... 
all those changes marshmellow did..  and more...
 2017-07-30 09:17:48 +02:00
iceman1001
a8569849d6 part of monstermerge.. 2017-07-27 20:58:59 +02:00
iceman1001
310d0da9a4 fixes.. to bool 2017-07-11 18:31:10 +02:00
iceman1001
4406f4ee2a CHG: removed some #DEFINE TRUE/FALSE 2017-07-07 12:52:51 +02:00
iceman1001
b804b9cdb8 ADD: @pivipw 's changes "making lua paths". 
ref:: 4197a3f6ff

This contains a ugly hardcoded hack to solve the issue: https://github.com/Proxmark/proxmark3/issues/217
where GetModuleHandleEx doesn't exist in mingw (old proxspace 2013 environment).

Use the docker container or linux...
 2017-02-24 14:59:38 +01:00
iceman1001
9c624f67b3 chg: @piwi's code cleanup and some more. 
ref: 43534cbad2
 2017-02-23 00:03:10 +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
6c84c90017 FIX: this fixes the "hf mf sniff l d f" command, which has been broken for a while. The cuid is correct used for decrypting. 
FIX: The flushing of logentries.
ADD: "hf mf sniff" - added the sniffing of UID's with a uidlen of 10.

Whats left? The key is not always found even if we use the "mfkey64" approach.

ADD: added the parity_zero attack in "hf mf mifare".  Still not working since piwi's changes to the iso14443a.c,  maybe needs a param to tell it to collect nonces for this special attack.
CHG: extracted some help-texts into usage_* methods. Changed some text as well

FIX:  "hf mf sim" command now uses both  mfkey32 and mfkey32_moebius version to find the key in attack mode.
CHG:  "hf mf sim" also now defaults to emul_memory to read a 4 byte UID.
 2016-04-18 13:18:02 +02:00
iceman1001
ef085a5948 CHG: adjusted two arrays in scripting.c to mirror the added models in reveng 1.4.0 2016-04-05 04:43:54 +02:00
iceman1001
f6af1cf0ad FIX: the 14b crc was called wrong in LUA. You enter a hexstring already, and get a hexstring back. 2016-02-25 17:51:02 +01:00
iceman1001
a75d63f19b ADD: added the crc8legic to Lua. call it with core.crc8legic 
also a helper function to take a hexstring and calc the crc on it, was added inside utils.lua

   Call it inside a lua-script like this:

        local utils = require('utils')
        local data = '01020304'
	local crc = utils.Crc8Legic(data)
	print (uid,  ('%02x'):format(crc))
 2016-02-22 17:50:32 +01:00
iceman1001
1d0ccbe04b ADD: added the "hf snoop" patch original from @Enio, rearranged by @Etmatrix. 
ADD:  added the "t55x7" refactoring by @marshmellow42
 2015-10-27 21:47:21 +01:00
iceman1001
5de79e20f1 MOD:: reverse back changes to 14443b.c 
ADD: the hid-flasher/usb_cmd.h  wasn't up to date with how it's other file /common/usb_cmd.h looks like.
ADD: utils.lua  14443v crc inside LUA.
ADD: utils.lua  ConvertAsciiToHex method and minor adjustments checks.
 2015-07-28 21:33:09 +02:00
iceman1001
99789601dc ADD: @marshmellow42 's new "-g" search for crc in a hexstring *great* 
ADD: fixes in the reveng calling methods
 2015-06-10 08:46:16 +02:00
iceman1001
dd1df4901d @marshmellows memory fixes for reveng1.30 in client.. 2015-06-09 21:32:22 +02:00
iceman1001
60e8657796 CHG: all @marshmellow42 's changes to make the reveng work. 
ADD: lua script test for using the reveng inside lua.  *prove of concept*
      it implements -h help
                    -d  data in a hexstring
                    -w  width of the crc family. (ie 16 gives all CRC-16 calculations.
     it iterates thru all found crc presets in a crc family based on the width of crc.  It calcs crc and the reverse crc.
 2015-06-09 13:31:53 +02:00
iceman1001
2d2f7d1948 ADD: @marshmellow42 's changes / fixes. 2015-05-31 21:47:33 +02:00
iceman1001
b18948fd92 ADD: aes128_encrypt ECB in scripting.c 
ADD: aes128_decrypt ECB in scripting.c
ADD: Sha1Hex method in utils.lua
 2015-05-26 21:51:18 +02:00
iceman1001
ea75b30c81 ADD: SHA1 hashes calculations in sha1.c and LUA 2015-05-26 16:12:33 +02:00
iceman1001
bcf61bd34a Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	README.txt
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/des.c
	armsrc/iclass.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	client/cmddata.c
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhficlass.c
	client/cmdhfmfu.c
	client/cmdhfmfu.h
	client/cmdscript.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/scripting.c
	client/util.c
	common/protocols.h
	include/usb_cmd.h
 2015-05-23 08:16:40 +02:00
marshmellow42
d730878d8c scripting updates from @iceman1001 
it compiles but i'm not sure how to fully test it...
:)
 2015-05-13 21:14:35 -04:00