Merge branch 'master' of github.com:merlokk/proxmark3i into desf_update
This commit is contained in:
commit
b53c8bc0c9
8 files changed
+583
-14
No files matched your search
+25
-8
@@ -14,10 +14,18 @@ vpath %.dic dictionaries
|
||||
OBJDIR = obj
|
||||
|
||||
ifeq ($(USE_BREW),1)
|
||||
INCLUDES += -I$(BREW_PREFIX)/include
|
||||
LDLIBS += -L$(BREW_PREFIX)/lib
|
||||
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt/lib/pkgconfig
|
||||
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt5/lib/pkgconfig
|
||||
ifdef MACPORTS_PREFIX
|
||||
INCLUDES += -I$(MACPORTS_PREFIX)/include
|
||||
LDLIBS += -L$(MACPORTS_PREFIX)/lib
|
||||
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(MACPORTS_PREFIX)/lib/pkgconfig
|
||||
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(MACPORTS_PREFIX)/libexec/qt/lib/pkgconfig
|
||||
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(MACPORTS_PREFIX)/libexec/qt5/lib/pkgconfig
|
||||
else
|
||||
INCLUDES += -I$(BREW_PREFIX)/include
|
||||
LDLIBS += -L$(BREW_PREFIX)/lib
|
||||
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt/lib/pkgconfig
|
||||
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt5/lib/pkgconfig
|
||||
endif
|
||||
endif
|
||||
|
||||
###################
|
||||
@@ -117,8 +125,13 @@ INCLUDES += $(HARDNESTEDLIBINC)
|
||||
|
||||
## Lua
|
||||
ifneq ($(SKIPLUASYSTEM),1)
|
||||
LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua5.2 2>/dev/null)
|
||||
LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua5.2 2>/dev/null)
|
||||
ifdef MACPORTS_PREFIX
|
||||
LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua-5.2 2>/dev/null)
|
||||
LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua-5.2 2>/dev/null)
|
||||
else
|
||||
LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua5.2 2>/dev/null)
|
||||
LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua5.2 2>/dev/null)
|
||||
endif
|
||||
ifneq ($(LUALDLIBS),)
|
||||
LUALIB =
|
||||
LUALIBLD = $(LUALDLIBS)
|
||||
@@ -279,8 +292,12 @@ CXXINCLUDES += $(QTINCLUDES)
|
||||
## Readline
|
||||
ifneq ($(SKIPREADLINE),1)
|
||||
ifeq ($(USE_BREW),1)
|
||||
LDLIBS += -L$(BREW_PREFIX)/opt/readline/lib
|
||||
INCLUDES += -I$(BREW_PREFIX)/opt/readline/include
|
||||
ifdef MACPORTS_PREFIX
|
||||
INCLUDES += -I$(MACPORTS_PREFIX)/include/readline
|
||||
else
|
||||
LDLIBS += -L$(BREW_PREFIX)/opt/readline/lib
|
||||
INCLUDES += -I$(BREW_PREFIX)/opt/readline/include
|
||||
endif
|
||||
endif
|
||||
LDLIBS += -lreadline
|
||||
READLINE_FOUND = 1
|
||||
|
||||
@@ -191,11 +191,27 @@ local function read_config()
|
||||
elseif cardtype == '02' then typestr = 'NTAG 216'
|
||||
end
|
||||
|
||||
local versionstr = 'unknown'
|
||||
if version == '0004030101000B03' then versionstr = 'UL EV1 48b'
|
||||
elseif version == '0004030101000E03' then versionstr = 'UL EV1 128b'
|
||||
elseif version == '0004040101000B03' then versionstr = 'NTAG 210'
|
||||
elseif version == '0004040101000E03' then versionstr = 'NTAG 212'
|
||||
elseif version == '0004040201000F03' then versionstr = 'NTAG 213'
|
||||
elseif version == '0004040201001103' then versionstr = 'NTAG 215'
|
||||
elseif version == '0004040201001303' then versionstr = 'NTAG 216'
|
||||
elseif version == '0004040502011303' then versionstr = 'NTAG I2C 1K'
|
||||
elseif version == '0004040502011503' then versionstr = 'NTAG I2C 2K'
|
||||
elseif version == '0004040502021303' then versionstr = 'NTAG I2C 1K PLUS'
|
||||
elseif version == '0004040502021503' then versionstr = 'NTAG I2C 2K PLUS'
|
||||
elseif version == '0004040401000F03' then versionstr = 'NTAG 213F'
|
||||
elseif version == '0004040401001303' then versionstr = 'NTAG 216F'
|
||||
end
|
||||
|
||||
print('Magic NTAG 21* Configuration')
|
||||
print(' - Type ', typestr, '(genuine cardtype)')
|
||||
print(' - Password', pwd)
|
||||
print(' - Pack ', pack)
|
||||
print(' - Version ', version)
|
||||
print(' - Version ', version, '(' .. versionstr .. ')')
|
||||
print(' - Signature', signature1..signature2)
|
||||
|
||||
lib14a.disconnect()
|
||||
|
||||
@@ -1653,6 +1653,9 @@ static int CmdHFiClassDump(const char *Cmd) {
|
||||
|
||||
app_limit1 = card_app2_limit[type];
|
||||
app_limit2 = 0;
|
||||
} else if (hdr->conf.app_limit >= hdr->conf.mem_config) {
|
||||
PrintAndLogEx(WARNING, "AA1 config is >= card size, using card size as AA1 limit");
|
||||
app_limit1 = card_app2_limit[type];
|
||||
} else {
|
||||
app_limit1 = hdr->conf.app_limit;
|
||||
app_limit2 = card_app2_limit[type];
|
||||
@@ -1674,7 +1677,12 @@ static int CmdHFiClassDump(const char *Cmd) {
|
||||
PrintAndLogEx(FAILED, "Run command with keys");
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
PrintAndLogEx(INFO, "Card has atleast 2 application areas. AA1 limit %u (0x%02X) AA2 limit %u (0x%02X)", app_limit1, app_limit1, app_limit2, app_limit2);
|
||||
|
||||
if (app_limit2 != 0) {
|
||||
PrintAndLogEx(INFO, "Card has at least 2 application areas. AA1 limit %u (0x%02X) AA2 limit %u (0x%02X)", app_limit1, app_limit1, app_limit2, app_limit2);
|
||||
} else {
|
||||
PrintAndLogEx(INFO, "Card has 1 application area. AA1 limit %u (0x%02X)", app_limit1, app_limit1);
|
||||
}
|
||||
}
|
||||
|
||||
iclass_dump_req_t payload = {
|
||||
@@ -1750,7 +1758,7 @@ static int CmdHFiClassDump(const char *Cmd) {
|
||||
// AIA data
|
||||
memcpy(tag_data + (8 * 5), tempbuf + (8 * 5), 8);
|
||||
// AA1 data
|
||||
memcpy(tag_data + (8 * 6), tempbuf + (8 * 6), (blocks_read * 8));
|
||||
memcpy(tag_data + (8 * 6), tempbuf + (8 * 6), ((blocks_read - 6) * 8));
|
||||
}
|
||||
|
||||
uint16_t bytes_got = (app_limit1 + 1) * 8;
|
||||
@@ -1758,7 +1766,7 @@ static int CmdHFiClassDump(const char *Cmd) {
|
||||
// try AA2 Kc, Credit
|
||||
bool aa2_success = false;
|
||||
|
||||
if (have_credit_key && pagemap != 0x01) {
|
||||
if (have_credit_key && pagemap != PICOPASS_NON_SECURE_PAGEMODE && app_limit2 != 0) {
|
||||
|
||||
// AA2 authenticate credit key
|
||||
memcpy(payload.req.key, credit_key, 8);
|
||||
|
||||
Reference in new issue
Block a user