From 889a02557bdabf3cbef3e9b0abbb2c2191c42d11 Mon Sep 17 00:00:00 2001 From: Sam <48739810+The-SamminAter@users.noreply.github.com> Date: Sat, 8 Jul 2023 23:16:30 -0700 Subject: [PATCH 1/3] Fix compiling on iOS iOS can, in fact, use the system() stdlib call Signed-off-by: Sam <48739810+The-SamminAter@users.noreply.github.com> --- client/deps/liblua/luaconf.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/client/deps/liblua/luaconf.h b/client/deps/liblua/luaconf.h index 77445383f..d0b657361 100644 --- a/client/deps/liblua/luaconf.h +++ b/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 From 013a26717c3442fa8e906e979d93a23e27e5cd5f Mon Sep 17 00:00:00 2001 From: Sam <48739810+The-SamminAter@users.noreply.github.com> Date: Sat, 8 Jul 2023 23:19:58 -0700 Subject: [PATCH 2/3] Update CHANGELOG.md Signed-off-by: Sam <48739810+The-SamminAter@users.noreply.github.com> --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index df3601ba1..e172769de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] + - Fix compiling liblua on iOS (@The-SamminAter) - Fixed the timeout of TCP connections (@wh201906) - Made the connection timeout configurable (@wh201906) From d3b6fc6b5aea6bbe570e876cd1d91a9bbde140c4 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sun, 9 Jul 2023 09:43:54 +0200 Subject: [PATCH 3/3] allowing for more keys --- client/luascripts/hf_mf_dump_luxeo.lua | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/client/luascripts/hf_mf_dump_luxeo.lua b/client/luascripts/hf_mf_dump_luxeo.lua index aaf7d572f..f645d3d7b 100644 --- a/client/luascripts/hf_mf_dump_luxeo.lua +++ b/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)