Merge branch 'master' into vas

Signed-off-by: Iceman <iceman@iuse.se>

CHANGELOG.md

@@ -4,6 +4,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 
 ## [unreleased][unreleased]
  - Added support for Apple Wallet NFC Passes with the Value Added Services protocol implementation (@gm3197)
+ - Fix compiling liblua on iOS (@The-SamminAter)
  - Fixed the timeout of TCP connections (@wh201906)
  - Made the connection timeout configurable (@wh201906)
 

client/deps/liblua/luaconf.h

@@ -10,9 +10,6 @@
 
 #if defined(__APPLE__)
 #include "TargetConditionals.h"
-#if TARGET_OS_IOS || TARGET_OS_WATCH || TARGET_OS_TV
-#define system(s) ((s)==NULL ? 0 : -1)
-#endif // end iOS
 #endif
 
 #include <limits.h>

client/luascripts/hf_mf_dump_luxeo.lua

@@ -231,13 +231,26 @@ local function main(args)
     print(acblue.."UID: "..tag.uid..acoff)
     print(acblue..string.format("XTEA key: %08X %08X %08X %08X", xteakey[0], xteakey[1], xteakey[2], xteakey[3])..acoff)
 
-    edata, cdata = readtag("415A54454B4D", xteakey)
+    local keys = {
+        "415A54454B4D",
+        "4B6A43059B64",
+        "C8BE6250C9C5",
+    }
+
+    for i, key in ipairs(keys) do
+        edata, cdata = readtag(key, xteakey)
+        if edata and cdata then
+            goto continue
+        end
+    end
 
     if edata == nil or cdata == nil then
         print("ERROR Reading tag!")
         return nil
     end
 
+    ::continue::
+
     print("Ciphered data:")
     for key,value in ipairs(edata) do
         print(value)