X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f595de25e95a66b9cf0e31c1925500db0abdae08..b22f7a6bc68319533f9c83c24045d4bd79994f1f:/client/scripts/tnp3.lua

diff --git a/client/scripts/tnp3.lua b/client/scripts/tnp3.lua
index 44e3753b..77de766f 100644
--- a/client/scripts/tnp3.lua
+++ b/client/scripts/tnp3.lua
@@ -28,10 +28,10 @@ Arguments:
 	-o             : filename for the saved dumps
 ]]
 
-local hashconstant = '20436F707972696768742028432920323031302041637469766973696F6E2E20416C6C205269676874732052657365727665642E20'
+local HASHCONSTANT = '20436F707972696768742028432920323031302041637469766973696F6E2E20416C6C205269676874732052657365727665642E20'
 
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
-local DEBUG = true -- the debug flag
+local DEBUG = false -- the debug flag
 local numBlocks = 64
 local numSectors = 16
 --- 
@@ -93,6 +93,16 @@ local function waitCmd()
 	return nil, "No response from device"
 end
 
+local function computeCrc16(s)
+	local hash = core.crc16(utils.ConvertHexToAscii(s))	
+	return hash
+end
+
+local function reverseCrcBytes(crc)
+	crc2 = crc:sub(3,4)..crc:sub(1,2)
+	return tonumber(crc2,16)
+end
+
 local function main(args)
 
 	print( string.rep('--',20) )
@@ -104,7 +114,7 @@ local function main(args)
 	local useNested = false
 	local cmdReadBlockString = 'hf mf rdbl %d A %s'
 	local input = "dumpkeys.bin"
-	local outputTemplate = os.date("toydump-%Y-%m-%d_%H%M%S");
+	local outputTemplate = os.date("toydump_%Y-%m-%d_%H%M%S");
 
 	-- Arguments for the script
 	for o, a in getopt.getopt(args, 'hk:no:') do
@@ -144,14 +154,17 @@ local function main(args)
 	  core.console( ('hf mf nested 1 0 A %s d'):format(keyA) )
 	end
 	
+	core.clearCommandBuffer()
+	
 	-- Loading keyfile
 	print('Loading dumpkeys.bin')
-	local infile = io.open(input, "rb")
-	if infile == nil then 
-		return oops('Could not read file ', input)
+	local hex, err = utils.ReadDumpFile(input)
+	if not hex then
+		return oops(err)
 	end
-	local akeys = readdumpkeys(infile):sub(0,12*16)
-	
+
+	local akeys = hex:sub(0,12*16)
+
 	-- Read block 0
 	cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = 0,arg2 = 0,arg3 = 0, data = keyA}
 	err = core.SendCommand(cmd:getBytes())
@@ -175,6 +188,7 @@ local function main(args)
 	core.clearCommandBuffer()
 		
 	-- main loop
+	io.write('Decrypting blocks > ')
 	for blockNo = 0, numBlocks-1, 1 do
 
 		if core.ukbhit() then
@@ -195,20 +209,21 @@ local function main(args)
 				-- Block 0-7 not encrypted
 				blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,blockdata) 
 			else
-				local base = ('%s%s%02d%s'):format(block0, block1, blockNo, hashconstant)	
-				local baseArr = utils.ConvertHexStringToBytes(base)
-				local baseStr = utils.ConvertBytesToAsciiString(baseArr)
+				local base = ('%s%s%02x%s'):format(block0, block1, blockNo, HASHCONSTANT)	
+				local baseStr = utils.ConvertHexToAscii(base)
 				local md5hash = md5.sumhexa(baseStr)
 				local aestest = core.aes(md5hash, blockdata)
 
-				local hex = utils.ConvertAsciiStringToBytes(aestest)
-				hex = utils.ConvertBytes2HexString(hex)
+				local hex = utils.ConvertAsciiToBytes(aestest)
+				hex = utils.ConvertBytesToHex(hex)
 				--local _,hex = bin.unpack(("H%d"):format(16),aestest)
 
+				-- blocks with zero not encrypted.
 				if string.find(blockdata, '^0+$') then
 					blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,blockdata) 
 				else
-					blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,hex) 
+					blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,hex)
+					io.write( blockNo..',')
 				end		
 			end
 		else
@@ -216,6 +231,7 @@ local function main(args)
 			blocks[blockNo+1] = ('%02d  :: %s%s'):format(blockNo,key,blockdata:sub(13,32)) 
 		end
 	end
+	io.write('\n')
 	
 	core.clearCommandBuffer()
 		
@@ -224,9 +240,9 @@ local function main(args)
 	local emldata = ''
 
 	for _,s in pairs(blocks) do
-		local slice = s:sub(7,#s)
-		local str = utils.ConvertBytesToAsciiString(
-				 utils.ConvertHexStringToBytes(slice)
+		local slice = s:sub(8,#s)
+		local str = utils.ConvertBytesToAscii(
+				 utils.ConvertHexToBytes(slice)
 				)
 		emldata = emldata..slice..'\n'
 		for c in (str):gmatch('.') do
@@ -235,10 +251,12 @@ local function main(args)
 	end 
 	
 	-- Write dump to files
-	local foo = dumplib.SaveAsBinary(bindata, outputTemplate..'.bin')
-	print(("Wrote a BIN dump to the file %s"):format(foo))
-	local bar = dumplib.SaveAsText(emldata, outputTemplate..'.eml')
-    print(("Wrote a EML dump to the file %s"):format(bar))
+	if not DEBUG then
+		local foo = dumplib.SaveAsBinary(bindata, outputTemplate..'.bin')
+		print(("Wrote a BIN dump to the file %s"):format(foo))
+		local bar = dumplib.SaveAsText(emldata, outputTemplate..'.eml')
+		print(("Wrote a EML dump to the file %s"):format(bar))
+	end
 
 	local uid = block0:sub(1,8)
 	local itemtype = block1:sub(1,4)
@@ -252,5 +270,4 @@ local function main(args)
 	print( string.rep('--',20) )
 
 end
-
 main(args)
\ No newline at end of file