ADD: @pwpiwi 's fixes for 14b. Including a rename from iso14443.c -> iso14443b.c

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

diff --git a/client/lualibs/utils.lua b/client/lualibs/utils.lua
index 41fb0856361c44c312be919dba6e9c903769bf3f..7db57f333717584cc4b67c8da8419bd05107f9dd 100644 (file)
--- a/client/lualibs/utils.lua
+++ b/client/lualibs/utils.lua
@@ -101,7 +101,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 +113,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