From: iceman1001 Date: Mon, 10 Oct 2016 08:59:16 +0000 (+0200) Subject: CHG: "script run emlu2dump" now can read old legic hex-ascii dumps. (with spaces... X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/4697964f6a9dd166246de0072720e409b69cc61a CHG: "script run emlu2dump" now can read old legic hex-ascii dumps. (with spaces) and convert to a binary file CHG: "script run emlu2html" now can read old legic hex-ascii dumps. (with spaces) and convert to a generic html file These changes makes it easier to for old legic dumps to be used with the new "legic dump/restore/eload/esave" commands --- diff --git a/client/lualibs/html_dumplib.lua b/client/lualibs/html_dumplib.lua index 17096063..59cebf59 100644 --- a/client/lualibs/html_dumplib.lua +++ b/client/lualibs/html_dumplib.lua @@ -80,11 +80,12 @@ end local function convert_ascii_dump_to_JS(infile) local t = infile:read("*all") - + local cleaned local output = "["; for line in string.gmatch(t, "[^\n]+") do if string.byte(line,1) ~= string.byte("+",1) then - output = output .. "'"..line.."',\n" + cleaned = (line or ''):gsub('%s+','') + output = output .. "'"..cleaned.."',\n" end end output = output .. "]" @@ -117,11 +118,12 @@ end local function convert_ascii_dump_to_BIN(infile) local t = infile:read("*all") - + local cleaned local output = {}; for line in string.gmatch(t, "[^\n]+") do if string.byte(line) ~= string.byte("+") then - for c in (line or ''):gmatch('..') do + cleaned = (line or ''):gsub('%s+','') + for c in cleaned:gmatch('..') do output[#output+1] = string.char( tonumber(c,16) ) end end