Added library to read card info, made use of it from within mfkeys.lua script

diff --git a/client/read14a.lua b/client/read14a.lua
new file mode 100644 (file)
index 0000000..e9f9851
--- /dev/null
+++ b/client/read14a.lua
@@ -0,0 +1,100 @@
+--[[
+       This is a library to read 14443a tags. It can be used something like this
+
+       local reader = require('read14a')
+       result, err = reader.read1443a()
+       if not result then
+               print(err)
+               return
+       end
+       print(result.name)
+
+--]]
+-- Loads the commands-library
+local cmds = require('commands')
+local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
+local ISO14A_COMMAND = {
+       ISO14A_CONNECT = 1,
+       ISO14A_NO_DISCONNECT = 2,
+       ISO14A_APDU = 4,
+       ISO14A_RAW = 8,
+       ISO14A_REQUEST_TRIGGER = 0x10,
+       ISO14A_APPEND_CRC = 0x20,
+       ISO14A_SET_TIMEOUT = 0x40
+}
+
+local ISO14443a_TYPES = {}             
+ISO14443a_TYPES[0x00] = "NXP MIFARE Ultralight | Ultralight C"
+ISO14443a_TYPES[0x04] = "NXP MIFARE (various !DESFire !DESFire EV1)"
+ISO14443a_TYPES[0x08] = "NXP MIFARE CLASSIC 1k | Plus 2k"
+ISO14443a_TYPES[0x09] = "NXP MIFARE Mini 0.3k"
+ISO14443a_TYPES[0x10] = "NXP MIFARE Plus 2k"
+ISO14443a_TYPES[0x11] = "NXP MIFARE Plus 4k"
+ISO14443a_TYPES[0x18] = "NXP MIFARE Classic 4k | Plus 4k"
+ISO14443a_TYPES[0x20] = "NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k | JCOP 31/41"
+ISO14443a_TYPES[0x24] = "NXP MIFARE DESFire | DESFire EV1"
+ISO14443a_TYPES[0x28] = "JCOP31 or JCOP41 v2.3.1"
+ISO14443a_TYPES[0x38] = "Nokia 6212 or 6131 MIFARE CLASSIC 4K"
+ISO14443a_TYPES[0x88] = "Infineon MIFARE CLASSIC 1K"
+ISO14443a_TYPES[0x98] = "Gemplus MPCOS"
+
+
+local function tostring_1443a(sak)
+       return ISO14443a_TYPES[sak] or ("Unknown (SAK=%x)"):format(sak)
+end
+
+local function parse1443a(data)
+       --[[
+
+       Based on this struct : 
+
+       typedef struct {
+               byte_t uid[10];
+               byte_t uidlen;
+               byte_t atqa[2];
+               byte_t sak;
+               byte_t ats_len;
+               byte_t ats[256];
+       } __attribute__((__packed__)) iso14a_card_select_t;
+
+       --]]
+
+       local count,uid,uidlen, atqa, sak, ats_len, ats= bin.unpack('H10CH2CC',data)
+       uid = uid:sub(1,2*uidlen)
+       --print("uid, atqa, sak: ",uid, atqa, sak)
+       --print("TYPE: ", tostring_1443a(sak))
+       return { uid = uid, atqa  = atqa, sak = sak, name = tostring_1443a(sak)}
+end
+
+local library = {
+       read1443a = function(blockNo, keys, keyType)
+               local command, result, info, err, data
+
+               core.clearCommandBuffer()
+               command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, 
+                                                                       arg1 = ISO14A_COMMAND.ISO14A_CONNECT}
+
+               core.SendCommand(command:getBytes())
+               local result = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+               if result then
+                       local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
+                       if arg0 == 0 then 
+                               print("iso14443a card select failed");
+                               return nil, "iso14443a card select failed"
+                       end
+                       data = string.sub(result,count)
+                       info, err = parse1443a(data)
+               else
+                       err ="No response from card"
+               end
+
+               if err then 
+                       print(err) 
+                       return nil, err
+               end
+               return info
+       end
+
+}
+
+return library
\ No newline at end of file

diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index 135108f39366b8fb6738fc70aab1e585ca3e0bb3..f40b2be22cccb18bbd9d030d30edd3dc22d970ca 100644 (file)
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -12,6 +12,9 @@
 local cmds = require('commands')
 -- Load the default keys
 local keys = require('mf_default_keys')
 local cmds = require('commands')
 -- Load the default keys
 local keys = require('mf_default_keys')

+-- Ability to read what card is there
+local reader = require('read14a')
+

 local desc = 
 ("This script implements check keys. It utilises a large list of default keys (currently %d keys).\
 If you want to add more, just put them inside mf_default_keys.lua. "):format(#keys)
 local desc = 
 ("This script implements check keys. It utilises a large list of default keys (currently %d keys).\
 If you want to add more, just put them inside mf_default_keys.lua. "):format(#keys)


@@ -103,6 +106,14 @@ local function main()
 
        print(desc);
 
 
        print(desc);
 

+       result, err = reader.read1443a()
+       if not result then
+               print(err)
+               return
+       end
+       print(("Found a %s tag"):format(result.name))
+
+

        core.clearCommandBuffer()
        local blockNo
        local keyType = 0 -- A=0, B=1
        core.clearCommandBuffer()
        local blockNo
        local keyType = 0 -- A=0, B=1