Messy messy. I probably lost my commit texts now...
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
This commit is contained in:
commit
54ea65bf34
34 files changed
+103
-120
No files matched your search
+1
-1
@@ -45,7 +45,7 @@ static int usage_analyse_checksum(void) {
|
||||
PrintAndLogEx(NORMAL, "Usage: analyse chksum [h] [v] b <bytes> m <mask>");
|
||||
PrintAndLogEx(NORMAL, "Options:");
|
||||
PrintAndLogEx(NORMAL, " h This help");
|
||||
PrintAndLogEx(NORMAL, " v supress header");
|
||||
PrintAndLogEx(NORMAL, " v suppress header");
|
||||
PrintAndLogEx(NORMAL, " b <bytes> bytes to calc missing XOR in a LCR");
|
||||
PrintAndLogEx(NORMAL, " m <mask> bit mask to limit the outpuyt");
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
|
||||
+1
-1
@@ -164,7 +164,7 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
|
||||
PrintAndLogEx(NORMAL, "GA Perform Key Agreement: %u us", resp.data.asDwords[3]);
|
||||
PrintAndLogEx(NORMAL, "GA Mutual Authenticate: %u us", resp.data.asDwords[4]);
|
||||
} else {
|
||||
PrintAndLogEx(NORMAL, "PACE replay successfull!");
|
||||
PrintAndLogEx(NORMAL, "PACE replay successful!");
|
||||
PrintAndLogEx(NORMAL, "MSE Set AT: %u us", resp.data.asDwords[0]);
|
||||
PrintAndLogEx(NORMAL, "GA Get Nonce: %u us", resp.data.asDwords[1]);
|
||||
PrintAndLogEx(NORMAL, "GA Map Nonce: %u us", resp.data.asDwords[2]);
|
||||
|
||||
+4
-4
@@ -1006,7 +1006,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
|
||||
|
||||
PrintAndLogEx(SUCCESS, "time: %" PRIu64 " seconds\n", (msclock() - t1) / 1000);
|
||||
|
||||
PrintAndLogEx(SUCCESS, "\nSucceded in dumping all blocks");
|
||||
PrintAndLogEx(SUCCESS, "\nSucceeded in dumping all blocks");
|
||||
|
||||
if (strlen(dataFilename) < 1) {
|
||||
fptr = GenerateFilename("hf-mf-", "-data");
|
||||
@@ -1422,14 +1422,14 @@ jumptoend:
|
||||
}
|
||||
|
||||
PrintAndLogEx(SUCCESS, "saving keys to binary file " _YELLOW_("%s"), fptr);
|
||||
uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
|
||||
uint8_t standard[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
|
||||
uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
|
||||
for (int i = 0; i < SectorsCnt; i++) {
|
||||
if (e_sector[i].foundKey[0]) {
|
||||
num_to_bytes(e_sector[i].Key[0], 6, tempkey);
|
||||
fwrite(tempkey, 1, 6, fkeys);
|
||||
} else {
|
||||
fwrite(&standart, 1, 6, fkeys);
|
||||
fwrite(&standard, 1, 6, fkeys);
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < SectorsCnt; i++) {
|
||||
@@ -1437,7 +1437,7 @@ jumptoend:
|
||||
num_to_bytes(e_sector[i].Key[1], 6, tempkey);
|
||||
fwrite(tempkey, 1, 6, fkeys);
|
||||
} else {
|
||||
fwrite(&standart, 1, 6, fkeys);
|
||||
fwrite(&standard, 1, 6, fkeys);
|
||||
}
|
||||
}
|
||||
fflush(fkeys);
|
||||
|
||||
+1
-1
@@ -245,7 +245,7 @@ static int CmdLFHitagList(const char *Cmd) {
|
||||
|
||||
if (f) {
|
||||
fclose(f);
|
||||
PrintAndLogEx(NORMAL, "Recorded activity succesfully written to file: %s", filename);
|
||||
PrintAndLogEx(NORMAL, "Recorded activity successfully written to file: %s", filename);
|
||||
}
|
||||
|
||||
free(got);
|
||||
|
||||
+13
-30
@@ -340,14 +340,14 @@ static int CmdHelp(const char *Cmd);
|
||||
|
||||
static bool t55xxProtect(bool lock, bool usepwd, uint8_t override, uint32_t password, uint8_t downlink_mode, uint32_t new_password ) {
|
||||
|
||||
PrintAndLogEx(INFO, "Checking current block0");
|
||||
PrintAndLogEx(INFO, "Checking current configuration");
|
||||
|
||||
bool testmode = false;
|
||||
uint32_t block0 = 0;
|
||||
|
||||
int res = T55xxReadBlockEx(T55x7_CONFIGURATION_BLOCK, T55x7_PAGE0, usepwd, override, password, downlink_mode, false);
|
||||
if (res != PM3_SUCCESS) {
|
||||
PrintAndLogEx(WARNING, "fail to read current block0, use `p` password parameter ?");
|
||||
PrintAndLogEx(WARNING, "Failed to read block0, use `p` password parameter?");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -360,41 +360,27 @@ static bool t55xxProtect(bool lock, bool usepwd, uint8_t override, uint32_t pass
|
||||
PrintAndLogEx(INFO, "PWD bit is already set");
|
||||
usepwd = true;
|
||||
}
|
||||
|
||||
|
||||
// set / clear pwd bit
|
||||
if (lock) {
|
||||
// set pwd bit
|
||||
block0 |= 1 << 4;
|
||||
} else {
|
||||
block0 &= ~(1 << 4);
|
||||
}
|
||||
|
||||
PrintAndLogEx(INFO, " old %08X vs %08X", old, block0);
|
||||
|
||||
// write new password
|
||||
if ( t55xxWrite(T55x7_PWD_BLOCK, T55x7_PAGE0, usepwd, testmode, password, downlink_mode, new_password ) != PM3_SUCCESS ) {
|
||||
PrintAndLogEx(ERR, "Failed writing new pwd");
|
||||
PrintAndLogEx(ERR, "Failed to write new password");
|
||||
return false;
|
||||
} else {
|
||||
PrintAndLogEx(SUCCESS, "Wrote new password");
|
||||
}
|
||||
|
||||
// password bit already set
|
||||
// write b 7 new key old_pwd
|
||||
// validate b 7 new_key old_pwd
|
||||
// write b0 new_key
|
||||
// validate b0 new_key
|
||||
|
||||
// write b7 new key
|
||||
// validate b7 (no key)
|
||||
// write b0 (no key)
|
||||
// validate b0 w new key
|
||||
|
||||
|
||||
// validate new password
|
||||
uint32_t curr_password = (isPwdBitAlreadySet) ? new_password : password;
|
||||
|
||||
if (t55xxVerifyWrite(T55x7_PWD_BLOCK, T55x7_PAGE0, usepwd, override, curr_password, downlink_mode, new_password) == false) {
|
||||
PrintAndLogEx(WARNING, "Could not validate the new password write. aborting.");
|
||||
PrintAndLogEx(WARNING, "Failed to validate the password write. aborting.");
|
||||
return false;
|
||||
} else {
|
||||
PrintAndLogEx(SUCCESS, "Validated new password");
|
||||
@@ -402,7 +388,7 @@ static bool t55xxProtect(bool lock, bool usepwd, uint8_t override, uint32_t pass
|
||||
|
||||
// write config
|
||||
if ( t55xxWrite(T55x7_CONFIGURATION_BLOCK, T55x7_PAGE0, usepwd, testmode, curr_password, downlink_mode, block0 ) != PM3_SUCCESS ) {
|
||||
PrintAndLogEx(ERR, "Failed writing modified configuration block %08X", block0);
|
||||
PrintAndLogEx(ERR, "Failed to write modified configuration block %08X", block0);
|
||||
return false;
|
||||
} else {
|
||||
PrintAndLogEx(SUCCESS, "Wrote modified configuration block");
|
||||
@@ -411,7 +397,7 @@ static bool t55xxProtect(bool lock, bool usepwd, uint8_t override, uint32_t pass
|
||||
// validate new config. If all went well, card should now demand pwd, hence override = 0.
|
||||
override = 0;
|
||||
if (t55xxVerifyWrite(T55x7_CONFIGURATION_BLOCK, T55x7_PAGE0, true, override, new_password, downlink_mode, block0) == false) {
|
||||
PrintAndLogEx(WARNING, "Could not validate pwd bit set on configuration block. aborting.");
|
||||
PrintAndLogEx(WARNING, "Failed to validate pwd bit set on configuration block. aborting.");
|
||||
return false;
|
||||
} else {
|
||||
PrintAndLogEx(SUCCESS, "New configuration block " _YELLOW_("%08X")"password " _YELLOW_("%08X"), block0, new_password);
|
||||
@@ -681,15 +667,15 @@ int T55xxReadBlockEx(uint8_t block, bool page1, bool usepwd, uint8_t override, u
|
||||
return PM3_ERFTRANS;
|
||||
|
||||
if (tryDetectModulation(downlink_mode, false) == false) {
|
||||
PrintAndLogEx(WARNING, "Safety Check: Could not detect if PWD bit is set in config block. Exits.");
|
||||
PrintAndLogEx(WARNING, "Safety check: Could not detect if PWD bit is set in config block. Exits.");
|
||||
return PM3_EWRONGANSVER;
|
||||
} else {
|
||||
PrintAndLogEx(WARNING, "Safety Check: PWD bit is NOT set in config block. Reading without password...");
|
||||
PrintAndLogEx(WARNING, "Safety check: PWD bit is NOT set in config block. Reading without password...");
|
||||
usepwd = false;
|
||||
page1 = false; // ??
|
||||
}
|
||||
} else if (override == 1) {
|
||||
PrintAndLogEx(INFO, "Safety Check Overriden - proceeding despite risk");
|
||||
PrintAndLogEx(INFO, "Safety check overridden - proceeding despite risk");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1525,7 +1511,7 @@ static int CmdT55xxWriteBlock(const char *Cmd) {
|
||||
if (validate) {
|
||||
bool isOK = t55xxVerifyWrite(block, page1, usepwd, 1, password, downlink_mode, data);
|
||||
if (isOK)
|
||||
PrintAndLogEx(SUCCESS, "Write OK, validation succesful");
|
||||
PrintAndLogEx(SUCCESS, "Write OK, validation successful");
|
||||
else
|
||||
PrintAndLogEx(WARNING, "Write could not validate the written data");
|
||||
}
|
||||
@@ -3173,10 +3159,7 @@ static int CmdT55xxProtect(const char *Cmd) {
|
||||
return PM3_ESOFT;
|
||||
|
||||
// lock
|
||||
bool res = t55xxProtect(true, usepwd, override, password, downlink_mode, new_password );
|
||||
// unlock
|
||||
// res = t55xxProtect(false, usepwd, override, password, downlink_mode, new_password );
|
||||
if (res == false) {
|
||||
if ( t55xxProtect(true, usepwd, override, password, downlink_mode, new_password) == false ) {
|
||||
PrintAndLogEx(WARNING, "Command failed. Did you run `lf t55xx detect` before?");
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ const APDUCode APDUCodeTable[] = {
|
||||
{"6281", APDUCODE_TYPE_WARNING, "Part of returned data may be corrupted"},
|
||||
{"6282", APDUCODE_TYPE_WARNING, "End of file/record reached before reading Le bytes"},
|
||||
{"6283", APDUCODE_TYPE_WARNING, "Selected file invalidated"},
|
||||
{"6284", APDUCODE_TYPE_WARNING, "Selected file is not valid. FCI not formated according to ISO"},
|
||||
{"6284", APDUCODE_TYPE_WARNING, "Selected file is not valid. FCI not formatted according to ISO"},
|
||||
{"6285", APDUCODE_TYPE_WARNING, "No input data available from a sensor on the card. No Purse Engine enslaved for R3bc"},
|
||||
{"62A2", APDUCODE_TYPE_WARNING, "Wrong R-MAC"},
|
||||
{"62A4", APDUCODE_TYPE_WARNING, "Card locked (during reset( ))"},
|
||||
@@ -143,7 +143,7 @@ const APDUCode APDUCodeTable[] = {
|
||||
{"6FXX", APDUCODE_TYPE_ERROR, "No precise diagnosis (procedure byte), (ISO 7816-3)"},
|
||||
{"9---", APDUCODE_TYPE_NONE, ""},
|
||||
{"9000", APDUCODE_TYPE_INFO, "Command successfully executed (OK)."},
|
||||
{"9004", APDUCODE_TYPE_WARNING, "PIN not succesfully verified, 3 or more PIN tries left"},
|
||||
{"9004", APDUCODE_TYPE_WARNING, "PIN not successfully verified, 3 or more PIN tries left"},
|
||||
{"9008", APDUCODE_TYPE_NONE, "Key/file not found"},
|
||||
{"9080", APDUCODE_TYPE_WARNING, "Unblock Try Counter has reached zero"},
|
||||
{"9100", APDUCODE_TYPE_NONE, "OK"},
|
||||
@@ -191,7 +191,7 @@ const APDUCode APDUCodeTable[] = {
|
||||
{"9681", APDUCODE_TYPE_NONE, "Slave not found"},
|
||||
{"9700", APDUCODE_TYPE_NONE, "PIN blocked and Unblock Try Counter is 1 or 2"},
|
||||
{"9702", APDUCODE_TYPE_NONE, "Main keys are blocked"},
|
||||
{"9704", APDUCODE_TYPE_NONE, "PIN not succesfully verified, 3 or more PIN tries left"},
|
||||
{"9704", APDUCODE_TYPE_NONE, "PIN not successfully verified, 3 or more PIN tries left"},
|
||||
{"9784", APDUCODE_TYPE_NONE, "Base key"},
|
||||
{"9785", APDUCODE_TYPE_NONE, "Limit exceeded - C-MAC key"},
|
||||
{"9786", APDUCODE_TYPE_NONE, "SM error - Limit exceeded - R-MAC key"},
|
||||
@@ -205,13 +205,13 @@ const APDUCode APDUCodeTable[] = {
|
||||
{"9850", APDUCODE_TYPE_ERROR, "INCREASE or DECREASE could not be executed because a limit has been reached."},
|
||||
{"9862", APDUCODE_TYPE_ERROR, "Authentication Error, application specific (incorrect MAC)"},
|
||||
{"9900", APDUCODE_TYPE_NONE, "1 PIN try left"},
|
||||
{"9904", APDUCODE_TYPE_NONE, "PIN not succesfully verified, 1 PIN try left"},
|
||||
{"9904", APDUCODE_TYPE_NONE, "PIN not successfully verified, 1 PIN try left"},
|
||||
{"9985", APDUCODE_TYPE_NONE, "Wrong status - Cardholder lock"},
|
||||
{"9986", APDUCODE_TYPE_ERROR, "Missing privilege"},
|
||||
{"9987", APDUCODE_TYPE_NONE, "PIN is not installed"},
|
||||
{"9988", APDUCODE_TYPE_NONE, "Wrong status - R-MAC state"},
|
||||
{"9A00", APDUCODE_TYPE_NONE, "2 PIN try left"},
|
||||
{"9A04", APDUCODE_TYPE_NONE, "PIN not succesfully verified, 2 PIN try left"},
|
||||
{"9A04", APDUCODE_TYPE_NONE, "PIN not successfully verified, 2 PIN try left"},
|
||||
{"9A71", APDUCODE_TYPE_NONE, "Wrong parameter value - Double agent AID"},
|
||||
{"9A72", APDUCODE_TYPE_NONE, "Wrong parameter value - Double agent Type"},
|
||||
{"9D05", APDUCODE_TYPE_ERROR, "Incorrect certificate type"},
|
||||
@@ -258,9 +258,9 @@ const APDUCode APDUCodeTable[] = {
|
||||
{"9D63", APDUCODE_TYPE_ERROR, "Crypto functions not available"},
|
||||
{"9D64", APDUCODE_TYPE_ERROR, "No application loaded"},
|
||||
{"9E00", APDUCODE_TYPE_NONE, "PIN not installed"},
|
||||
{"9E04", APDUCODE_TYPE_NONE, "PIN not succesfully verified, PIN not installed"},
|
||||
{"9E04", APDUCODE_TYPE_NONE, "PIN not successfully verified, PIN not installed"},
|
||||
{"9F00", APDUCODE_TYPE_NONE, "PIN blocked and Unblock Try Counter is 3"},
|
||||
{"9F04", APDUCODE_TYPE_NONE, "PIN not succesfully verified, PIN blocked and Unblock Try Counter is 3"},
|
||||
{"9F04", APDUCODE_TYPE_NONE, "PIN not successfully verified, PIN blocked and Unblock Try Counter is 3"},
|
||||
{"9FXX", APDUCODE_TYPE_NONE, "Command successfully executed; 'xx' bytes of data are available and can be requested using GET RESPONSE."},
|
||||
{"9XXX", APDUCODE_TYPE_NONE, "Application related status, (ISO 7816-3)"}
|
||||
};
|
||||
|
||||
+2
-2
@@ -790,7 +790,7 @@ static int CmdEMVExec(const char *Cmd) {
|
||||
arg_rem("By default:", "Transaction type - MSD"),
|
||||
arg_lit0("vV", "qvsdc", "Transaction type - qVSDC or M/Chip."),
|
||||
arg_lit0("cC", "qvsdccda", "Transaction type - qVSDC or M/Chip plus CDA (SDAD generation)."),
|
||||
arg_lit0("xX", "vsdc", "Transaction type - VSDC. For test only. Not a standart behavior."),
|
||||
arg_lit0("xX", "vsdc", "Transaction type - VSDC. For test only. Not a standard behavior."),
|
||||
arg_lit0("gG", "acgpo", "VISA. generate AC from GPO."),
|
||||
arg_lit0("wW", "wired", "Send data via contact (iso7816) interface. Contactless interface set by default."),
|
||||
arg_param_end
|
||||
@@ -1380,7 +1380,7 @@ static int CmdEMVScan(const char *Cmd) {
|
||||
arg_rem("By default:", "Transaction type - MSD"),
|
||||
arg_lit0("vV", "qvsdc", "Transaction type - qVSDC or M/Chip."),
|
||||
arg_lit0("cC", "qvsdccda", "Transaction type - qVSDC or M/Chip plus CDA (SDAD generation)."),
|
||||
arg_lit0("xX", "vsdc", "Transaction type - VSDC. For test only. Not a standart behavior."),
|
||||
arg_lit0("xX", "vsdc", "Transaction type - VSDC. For test only. Not a standard behavior."),
|
||||
arg_lit0("gG", "acgpo", "VISA. generate AC from GPO."),
|
||||
arg_lit0("mM", "merge", "Merge output file with card's data. (warning: the file may be corrupted!)"),
|
||||
arg_lit0("wW", "wired", "Send data via contact (iso7816) interface. Contactless interface set by default."),
|
||||
|
||||
@@ -394,7 +394,7 @@ static int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, boo
|
||||
}
|
||||
|
||||
retrycnt = 0;
|
||||
PrintAndLogEx(NORMAL, "Retry failed [%s]. Skiped...", sprint_hex_inrow(AID, AIDLen));
|
||||
PrintAndLogEx(NORMAL, "Retry failed [%s]. Skipped...", sprint_hex_inrow(AID, AIDLen));
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ typedef enum {
|
||||
|
||||
enum TransactionType {
|
||||
TT_MSD,
|
||||
TT_VSDC, // contact only. not standart for contactless
|
||||
TT_VSDC, // contact only. not standard for contactless
|
||||
TT_QVSDCMCHIP,
|
||||
TT_CDA,
|
||||
};
|
||||
|
||||
@@ -357,7 +357,7 @@ CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxda
|
||||
return CborGetArrayBinStringValueEx(elm, data, maxdatalen, datalen, NULL, 0);
|
||||
}
|
||||
|
||||
CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter, size_t delimeterlen) {
|
||||
CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimiter, size_t delimiterlen) {
|
||||
CborValue array;
|
||||
if (datalen)
|
||||
*datalen = 0;
|
||||
@@ -373,9 +373,9 @@ CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t max
|
||||
cbor_check(res);
|
||||
|
||||
totallen += slen;
|
||||
if (delimeter) {
|
||||
memcpy(&data[totallen], delimeter, delimeterlen);
|
||||
totallen += delimeterlen;
|
||||
if (delimiter) {
|
||||
memcpy(&data[totallen], delimiter, delimiterlen);
|
||||
totallen += delimiterlen;
|
||||
}
|
||||
slen = maxdatalen - totallen;
|
||||
}
|
||||
@@ -404,7 +404,7 @@ CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen
|
||||
return CborNoError;
|
||||
};
|
||||
|
||||
CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimeter) {
|
||||
CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimiter) {
|
||||
CborValue array;
|
||||
if (datalen)
|
||||
*datalen = 0;
|
||||
@@ -420,9 +420,9 @@ CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen,
|
||||
cbor_check(res);
|
||||
|
||||
totallen += slen;
|
||||
if (delimeter) {
|
||||
strcat(data, delimeter);
|
||||
totallen += strlen(delimeter);
|
||||
if (delimiter) {
|
||||
strcat(data, delimiter);
|
||||
totallen += strlen(delimiter);
|
||||
}
|
||||
slen = maxdatalen - totallen;
|
||||
data[totallen] = 0x00;
|
||||
|
||||
@@ -25,9 +25,9 @@ int JsonToCbor(json_t *elm, CborEncoder *encoder);
|
||||
|
||||
int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t dataLen, int key);
|
||||
CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen);
|
||||
CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter, size_t delimeterlen);
|
||||
CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimiter, size_t delimiterlen);
|
||||
CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen);
|
||||
CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimeter);
|
||||
CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimiter);
|
||||
CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen);
|
||||
CborError CborGetStringValueBuf(CborValue *elm);
|
||||
|
||||
|
||||
@@ -122,8 +122,8 @@ end
|
||||
-- @param ignoreresponse - if set to true, we don't read the device answer packet
|
||||
-- which is usually recipe for fail. If not sent, the host will wait 2s for a
|
||||
-- response of type CMD_ACK
|
||||
-- @return packet,nil if successfull
|
||||
-- nil, errormessage if unsuccessfull
|
||||
-- @return packet,nil if successful
|
||||
-- nil, errormessage if unsuccessful
|
||||
function Command:sendMIX( ignore_response, timeout )
|
||||
local data = self.data
|
||||
local cmd = self.cmd
|
||||
|
||||
@@ -12,8 +12,8 @@ local reader15693 = require('read15')
|
||||
-- This method library can be set waits or a 13.56 MHz tag, and when one is found, returns info about
|
||||
-- what tag it is.
|
||||
--
|
||||
-- @return if successfull: an table containing card info
|
||||
-- @return if unsuccessfull : nil, error
|
||||
-- @return if successful: an table containing card info
|
||||
-- @return if unsuccessful : nil, error
|
||||
local function waitForTag()
|
||||
print("Waiting for card... press Enter to quit")
|
||||
local readers = {reader14443A, reader14443B, reader15693}
|
||||
|
||||
@@ -80,8 +80,8 @@ end
|
||||
|
||||
-- This function does a connect and retrieves som einfo
|
||||
-- @param dont_disconnect - if true, does not disable the field
|
||||
-- @return if successfull: an table containing card info
|
||||
-- @return if unsuccessfull : nil, error
|
||||
-- @return if successful: an table containing card info
|
||||
-- @return if unsuccessful : nil, error
|
||||
local function read14443a(dont_disconnect, no_rats)
|
||||
local command, result, info, err, data
|
||||
|
||||
@@ -118,8 +118,8 @@ end
|
||||
|
||||
---
|
||||
-- Waits for a mifare card to be placed within the vicinity of the reader.
|
||||
-- @return if successfull: an table containing card info
|
||||
-- @return if unsuccessfull : nil, error
|
||||
-- @return if successful: an table containing card info
|
||||
-- @return if unsuccessful : nil, error
|
||||
local function waitFor14443a()
|
||||
print('Waiting for card... press Enter to quit')
|
||||
while not core.kbd_enter_pressed() do
|
||||
|
||||
@@ -55,8 +55,8 @@ local function parse14443b(data)
|
||||
end
|
||||
|
||||
-- This function does a connect and retrieves some info
|
||||
-- @return if successfull: an table containing card info
|
||||
-- @return if unsuccessfull : nil, error
|
||||
-- @return if successful: an table containing card info
|
||||
-- @return if unsuccessful : nil, error
|
||||
local function read14443b(disconnect)
|
||||
|
||||
local command, result, info, err, data
|
||||
@@ -96,8 +96,8 @@ end
|
||||
|
||||
---
|
||||
-- Waits for a mifare card to be placed within the vicinity of the reader.
|
||||
-- @return if successfull: an table containing card info
|
||||
-- @return if unsuccessfull : nil, error
|
||||
-- @return if successful: an table containing card info
|
||||
-- @return if unsuccessful : nil, error
|
||||
local function waitFor14443b()
|
||||
print('Waiting for card... press Enter to quit')
|
||||
while not core.kbd_enter_pressed() do
|
||||
|
||||
@@ -64,8 +64,8 @@ end
|
||||
|
||||
-- This function does a connect and retrieves som info
|
||||
-- @param dont_disconnect - if true, does not disable the field
|
||||
-- @return if successfull: an table containing card info
|
||||
-- @return if unsuccessfull : nil, error
|
||||
-- @return if successful: an table containing card info
|
||||
-- @return if unsuccessful : nil, error
|
||||
local function read15693(slow, dont_readresponse)
|
||||
|
||||
--[[
|
||||
@@ -130,8 +130,8 @@ end
|
||||
|
||||
---
|
||||
-- Waits for a ISO15693 card to be placed within the vicinity of the reader.
|
||||
-- @return if successfull: an table containing card info
|
||||
-- @return if unsuccessfull : nil, error
|
||||
-- @return if successful: an table containing card info
|
||||
-- @return if unsuccessful : nil, error
|
||||
local function waitFor15693()
|
||||
print('Waiting for card... press Enter to quit')
|
||||
while not core.kbd_enter_pressed() do
|
||||
|
||||
@@ -59,7 +59,7 @@ local Utils =
|
||||
-- @param blockData. Assumed to be on the format {'\0\1\2\3,'\b\e\e\f' ...,
|
||||
-- that is, blockData[row] contains a string with the actual data, not ascii hex representation
|
||||
-- return filename if all went well,
|
||||
-- @reurn nil, error message if unsuccessfulls
|
||||
-- @reurn nil, error message if unsuccessful
|
||||
WriteDumpFile = function(uid, blockData)
|
||||
local destination = string.format("%s.eml", uid)
|
||||
local file = io.open(destination, "w")
|
||||
|
||||
@@ -67,8 +67,8 @@ local function help()
|
||||
end
|
||||
---
|
||||
-- Waits for a mifare card to be placed within the vicinity of the reader.
|
||||
-- @return if successfull: an table containing card info
|
||||
-- @return if unsuccessfull : nil, error
|
||||
-- @return if successful: an table containing card info
|
||||
-- @return if unsuccessful : nil, error
|
||||
local function wait_for_mifare()
|
||||
while not core.kbd_enter_pressed() do
|
||||
res, err = lib14a.read()
|
||||
|
||||
@@ -90,8 +90,8 @@ local function getblockdata(response)
|
||||
return nil, "Couldn't read block"
|
||||
end
|
||||
---_ Gets data from a block
|
||||
-- @return {block, block+1, block+2, block+3} if successfull
|
||||
-- @return nil, errormessage if unsuccessfull
|
||||
-- @return {block, block+1, block+2, block+3} if successful
|
||||
-- @return nil, errormessage if unsuccessful
|
||||
local function getBlock(blockno)
|
||||
local block, err
|
||||
local c = Command:newMIX{cmd = cmds.CMD_HF_MIFAREU_READBL, arg1 = blockno, data = 0}
|
||||
|
||||
+3
-3
@@ -939,12 +939,12 @@ static int l_T55xx_readblock(lua_State *L) {
|
||||
usepage1 = false;
|
||||
}
|
||||
} else {
|
||||
PrintAndLogEx(NORMAL, "Safety Check Overriden - proceeding despite risk");
|
||||
PrintAndLogEx(NORMAL, "Safety Check Overridden - proceeding despite risk");
|
||||
}
|
||||
}
|
||||
|
||||
if (!AquireData(usepage1, block, usepwd, password, 0)) {
|
||||
return returnToLuaWithError(L, "Failed to aquire data from card");
|
||||
return returnToLuaWithError(L, "Failed to acquire data from card");
|
||||
}
|
||||
|
||||
if (!DecodeT55xxBlock()) {
|
||||
@@ -1002,7 +1002,7 @@ static int l_T55xx_detect(lua_State *L) {
|
||||
|
||||
isok = AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password, 0);
|
||||
if (isok == false) {
|
||||
return returnToLuaWithError(L, "Failed to aquire LF signal data");
|
||||
return returnToLuaWithError(L, "Failed to acquire LF signal data");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user