:syntax sugger

[proxmark3-svn] / client / lualibs / utils.lua

diff --git a/client/lualibs/utils.lua b/client/lualibs/utils.lua
index 41fb0856361c44c312be919dba6e9c903769bf3f..698017d923d28de50a5baa044d7eb51510b1699a 100644 (file)
--- a/client/lualibs/utils.lua
+++ b/client/lualibs/utils.lua
@@ -37,9 +37,7 @@ local Utils =
        ------------ FILE READING\r
        ReadDumpFile = function (filename)\r
        \r
        ------------ FILE READING\r
        ReadDumpFile = function (filename)\r
        \r

-               if filename == nil then \r
-                       return nil, 'Filename is empty'\r
-               end\r
+               filename = filename or 'dumpdata.bin'\r

                if #filename == 0 then\r
                        return nil, 'Filename length is zero'\r
                end\r
                if #filename == 0 then\r
                        return nil, 'Filename length is zero'\r
                end\r


@@ -71,6 +69,18 @@ local Utils =
                return outResults\r
        end,\r
        \r
                return outResults\r
        end,\r
        \r

+       ----ISO14443-B CRC\r
+       Crc14b = function(s)\r
+               if s == nil then return nil end\r
+               if #s == 0 then return nil end\r
+               if  type(s) == 'string' then\r
+                       local utils = require('utils')\r
+                       local ascii = utils.ConvertHexToAscii(s)\r
+                       local hashed = core.iso14443b_crc(ascii)\r
+                       return utils.ConvertAsciiToHex(hashed)\r
+               end\r
+               return nil              \r
+       end,\r

        \r
        ------------ CRC-16 ccitt checksums\r
        -- Takes a hex string and calculates a crc16\r
        \r
        ------------ CRC-16 ccitt checksums\r
        -- Takes a hex string and calculates a crc16\r


@@ -101,7 +111,7 @@ local Utils =
        end,\r
 \r
        ------------ SHA1 hash\r
        end,\r
 \r
        ------------ SHA1 hash\r

-       -- Takes a hex string and calculates a SHA1 hash\r
+       -- Takes a string and calculates a SHA1 hash\r

        Sha1 = function(s)\r
                if s == nil then return nil end\r
                if #s == 0 then return nil end\r
        Sha1 = function(s)\r
                if s == nil then return nil end\r
                if #s == 0 then return nil end\r


@@ -113,6 +123,19 @@ local Utils =
                end\r
                return nil\r
        end,    \r
                end\r
                return nil\r
        end,    \r

+       -- Takes a hex string and calculates a SHA1 hash\r
+       Sha1Hex = function(s)\r
+               if s == nil then return nil end\r
+               if #s == 0 then return nil end\r
+               if  type(s) == 'string' then\r
+                       local utils = require('utils')\r
+                       local asc = utils.ConvertHexToAscii(s)\r
+                       local hash = core.sha1(asc)\r
+                       return hash\r
+               end\r
+               return nil\r
+       end,    \r
+\r

        \r
        -- input parameter is a string\r
        -- Swaps the endianess and returns a number,  \r
        \r
        -- input parameter is a string\r
        -- Swaps the endianess and returns a number,  \r


@@ -170,20 +193,18 @@ local Utils =
        ---\r
        -- Convert Byte array to string of hex\r
        ConvertBytesToHex = function(bytes)\r
        ---\r
        -- Convert Byte array to string of hex\r
        ConvertBytesToHex = function(bytes)\r

-               if #bytes == 0 then\r
-                       return ''\r
-               end\r
+               if bytes == nil then return '' end\r
+               if #bytes == 0 then return '' end\r

                local s={}\r
                local s={}\r

-               for i = 1, #(bytes) do\r
+               for i = 1, #bytes do\r

                        s[i] = string.format("%02X",bytes[i]) \r
                end\r
                return table.concat(s)\r
        end,    \r
        -- Convert byte array to string with ascii\r
     ConvertBytesToAscii = function(bytes)\r
                        s[i] = string.format("%02X",bytes[i]) \r
                end\r
                return table.concat(s)\r
        end,    \r
        -- Convert byte array to string with ascii\r
     ConvertBytesToAscii = function(bytes)\r

-               if #bytes == 0 then\r
-                       return ''\r
-               end\r
+               if bytes == nil then return '' end\r
+               if #bytes == 0 then return '' end\r

                local s={}\r
                for i = 1, #(bytes) do\r
                        s[i] = string.char(bytes[i]) \r
                local s={}\r
                for i = 1, #(bytes) do\r
                        s[i] = string.char(bytes[i]) \r


@@ -222,13 +243,23 @@ local Utils =
        end,\r
        \r
        ConvertHexToAscii = function(s)\r
        end,\r
        \r
        ConvertHexToAscii = function(s)\r

+               if s == nil then return '' end\r
+               if #s == 0 then return '' end\r

                local t={}\r
                local t={}\r

-               if s == nil then return t end\r
-               if #s == 0 then return t end\r

                for k in s:gmatch"(%x%x)" do\r
                        table.insert(t, string.char(tonumber(k,16)))\r
                end\r
                for k in s:gmatch"(%x%x)" do\r
                        table.insert(t, string.char(tonumber(k,16)))\r
                end\r

-               return  table.concat(t) \r
+               return table.concat(t)  \r
+       end,\r
+       \r
+       ConvertAsciiToHex = function(s)         \r
+               if s == nil then return '' end\r
+               if #s == 0 then return '' end\r
+               local t={}\r
+               for k in s:gmatch"(.)" do\r
+                       table.insert(t, string.format("%02X", string.byte(k)))\r
+               end\r
+               return table.concat(t)\r

        end,\r
        \r
        Chars2num = function(s)\r
        end,\r
        \r
        Chars2num = function(s)\r