Merge branch 'master' into vas

Signed-off-by: Iceman <iceman@iuse.se>
This commit is contained in:
Iceman authored and GitHub committed 2023-07-09 12:38:53 +02:00
commit a4f77e224e
3 files changed
+15 -4

No files matched your search

-3
View File
@@ -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>
+14 -1
View File
@@ -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)