mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-08-14 02:26:59 -07:00
MF Ultralight - Iceman's updates + mine
Beginning of Ultralight additions. detection of Ultralight Types added dump command now auto detects type can authenticate Ultralight C
This commit is contained in:
marshmellow42
parent
bdfb62b405
commit
f168b2633b
11 changed files with 1040 additions and 518 deletions
|
|
@ -7,25 +7,67 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
// High frequency MIFARE ULTRALIGHT (C) commands
|
||||
//-----------------------------------------------------------------------------
|
||||
//#include <openssl/des.h>
|
||||
#include "loclass/des.h"
|
||||
#include "cmdhfmfu.h"
|
||||
#include "cmdhfmf.h"
|
||||
#include "cmdhf14a.h"
|
||||
#include "mifare.h"
|
||||
|
||||
#define MAX_UL_BLOCKS 0x0f
|
||||
#define MAX_ULC_BLOCKS 0x2f
|
||||
#define MAX_ULEV1a_BLOCKS 0x0b;
|
||||
#define MAX_ULEV1b_BLOCKS 0x20;
|
||||
|
||||
#define MAX_ULTRA_BLOCKS 0x0f
|
||||
#define MAX_ULTRAC_BLOCKS 0x2f
|
||||
//#define MAX_ULTRAC_BLOCKS 0x2c
|
||||
|
||||
|
||||
uint8_t default_3des_keys[7][16] = {
|
||||
{ 0x42,0x52,0x45,0x41,0x4b,0x4d,0x45,0x49,0x46,0x59,0x4f,0x55,0x43,0x41,0x4e,0x21 },// 3des std key
|
||||
{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },// all zeroes
|
||||
{ 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f },// 0x00-0x0F
|
||||
{ 0x49,0x45,0x4D,0x4B,0x41,0x45,0x52,0x42,0x21,0x4E,0x41,0x43,0x55,0x4F,0x59,0x46 },// NFC-key
|
||||
{ 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 },// all ones
|
||||
{ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF },// all FF
|
||||
{ 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF } // 11 22 33
|
||||
};
|
||||
|
||||
static int CmdHelp(const char *Cmd);
|
||||
|
||||
int CmdHF14AMfUInfo(const char *Cmd){
|
||||
// return 1 if tag responded to 0x1A.
|
||||
uint8_t requestAuthentication( uint8_t* nonce){
|
||||
|
||||
uint8_t datatemp[7] = {0x00};
|
||||
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC ,2 ,0}};
|
||||
c.d.asBytes[0] = 0x1A;
|
||||
c.d.asBytes[1] = 0x00;
|
||||
SendCommand(&c);
|
||||
UsbCommand resp;
|
||||
WaitForResponse(CMD_ACK, &resp); // skip select answer.
|
||||
|
||||
if ( !(resp.arg[0] & 0xff) )
|
||||
return 0;
|
||||
|
||||
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
|
||||
|
||||
if ( resp.arg[0] & 0xff ) {
|
||||
memcpy(nonce, resp.d.asBytes+1, 8);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
typedef enum TAGTYPE_UL {
|
||||
UNKNOWN = 0x00,
|
||||
UL = 0x01,
|
||||
UL_C = 0x02,
|
||||
UL_EV1_48 = 0x04,
|
||||
UL_EV1_128 = 0x08,
|
||||
UL_MAGIC = 0x11,
|
||||
UL_C_MAGIC = 0x12,
|
||||
MAGIC = 0x10,
|
||||
UL_ERROR = 0xFF,
|
||||
} TagTypeUL_t;
|
||||
|
||||
uint8_t GetHF14AMfU_Type(uint8_t *data, uint8_t dataSize){
|
||||
TagTypeUL_t tagtype = UNKNOWN;
|
||||
uint8_t isOK = 0;
|
||||
uint8_t *data = NULL;
|
||||
|
||||
UsbCommand c = {CMD_MIFAREU_READCARD, {0, 4}};
|
||||
SendCommand(&c);
|
||||
|
|
@ -33,52 +75,127 @@ int CmdHF14AMfUInfo(const char *Cmd){
|
|||
|
||||
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
|
||||
isOK = resp.arg[0] & 0xff;
|
||||
data = resp.d.asBytes;
|
||||
memcpy(data, resp.d.asBytes, dataSize);
|
||||
|
||||
if (!isOK) {
|
||||
PrintAndLog("Error reading from tag");
|
||||
return -1;
|
||||
return UL_ERROR;
|
||||
}
|
||||
} else {
|
||||
PrintAndLog("Command execute timed out");
|
||||
return -1;
|
||||
return UL_ERROR;
|
||||
}
|
||||
|
||||
PrintAndLog("");
|
||||
PrintAndLog("-- Mifare Ultralight / Ultralight-C Tag Information ---------");
|
||||
PrintAndLog("-------------------------------------------------------------");
|
||||
c.cmd = CMD_READER_ISO_14443a;
|
||||
c.arg[0] = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC;
|
||||
c.arg[1] = 1;
|
||||
c.arg[2] = 0;
|
||||
c.d.asBytes[0] = 0x60;
|
||||
SendCommand(&c);
|
||||
WaitForResponse(CMD_ACK, &resp);
|
||||
|
||||
if ( resp.arg[0] ) {
|
||||
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
|
||||
|
||||
uint8_t version[8] = {0,0,0,0,0,0,0,0};
|
||||
memcpy(&version, resp.d.asBytes, sizeof(version));
|
||||
uint8_t len = resp.arg[0] & 0xff;
|
||||
|
||||
if ( len == 0x0A && version[6] == 0x0B )
|
||||
tagtype = UL_EV1_48;
|
||||
else if ( len == 0x0A && version[6] != 0x0B )
|
||||
tagtype = UL_EV1_128;
|
||||
else if ( len == 0x01 )
|
||||
tagtype = UL_C;
|
||||
else if ( len == 0x00 )
|
||||
tagtype = UL; //| UL_MAGIC | UL_C_MAGIC
|
||||
}
|
||||
}
|
||||
|
||||
// Magic UL-C, mine have a static nonce response to 0x1A command.
|
||||
uint8_t nonce1[8] = {0,0,0,0,0,0,0,0};
|
||||
uint8_t nonce2[8] = {0,0,0,0,0,0,0,0};
|
||||
uint8_t status = requestAuthentication(nonce1);
|
||||
if ( status ) {
|
||||
requestAuthentication(nonce2);
|
||||
if ( !memcmp(nonce1, nonce2, 8) )
|
||||
tagtype ^= MAGIC;
|
||||
} else {
|
||||
// Magic Ultralight test here - TODO
|
||||
}
|
||||
return tagtype;
|
||||
}
|
||||
|
||||
int CmdHF14AMfUInfo(const char *Cmd){
|
||||
|
||||
TagTypeUL_t tagtype = UNKNOWN;
|
||||
|
||||
uint8_t datatemp[7] = {0x00};
|
||||
uint8_t data[16] = {0x00};
|
||||
|
||||
tagtype = GetHF14AMfU_Type(data, sizeof(data));
|
||||
if (tagtype == UL_ERROR) return -1;
|
||||
|
||||
PrintAndLog("\n-- Tag Information ---------");
|
||||
PrintAndLog("-------------------------------------------------------------");
|
||||
switch(tagtype){
|
||||
case UNKNOWN : PrintAndLog(" TYPE : Unknown"); return 0;
|
||||
case UL : PrintAndLog(" TYPE : MIFARE Ultralight");break;
|
||||
case UL_C : PrintAndLog(" TYPE : MIFARE Ultralight C");break;
|
||||
case UL_EV1_48 : PrintAndLog(" TYPE : MIFARE Ultralight EV1 48 bytes"); break;
|
||||
case UL_EV1_128 : PrintAndLog(" TYPE : MIFARE Ultralight EV1 128 bytes"); break;
|
||||
case UL_MAGIC : PrintAndLog(" TYPE : MIFARE Ultralight (MAGIC)");break;
|
||||
case UL_C_MAGIC : PrintAndLog(" TYPE : MIFARE Ultralight-C (MAGIC)");break;
|
||||
default : PrintAndLog(" TYPE : Unknown %x",tagtype);break;
|
||||
}
|
||||
|
||||
// UID
|
||||
memcpy( datatemp, data, 3);
|
||||
memcpy( datatemp+3, data+4, 4);
|
||||
|
||||
PrintAndLog("MANUFACTURER : %s", getTagInfo(datatemp[0]));
|
||||
PrintAndLog(" UID : %s ", sprint_hex(datatemp, 7));
|
||||
PrintAndLog(" UID : %s ", sprint_hex(datatemp, 7));
|
||||
PrintAndLog(" UID[0] : (Manufacturer Byte) = %02x, Manufacturer: %s", datatemp[0], getTagInfo(datatemp[0]) );
|
||||
|
||||
// BBC
|
||||
// CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2
|
||||
int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];
|
||||
if ( data[3] == crc0 )
|
||||
PrintAndLog(" BCC0 : %02x - Ok", data[3]);
|
||||
PrintAndLog(" BCC0 : %02x - Ok", data[3]);
|
||||
else
|
||||
PrintAndLog(" BCC0 : %02x - crc should be %02x", data[3], crc0);
|
||||
PrintAndLog(" BCC0 : %02x - crc should be %02x", data[3], crc0);
|
||||
|
||||
int crc1 = data[4] ^ data[5] ^ data[6] ^data[7];
|
||||
if ( data[8] == crc1 )
|
||||
PrintAndLog(" BCC1 : %02x - Ok", data[8]);
|
||||
PrintAndLog(" BCC1 : %02x - Ok", data[8]);
|
||||
else
|
||||
PrintAndLog(" BCC1 : %02x - crc should be %02x", data[8], crc1 );
|
||||
PrintAndLog(" BCC1 : %02x - crc should be %02x", data[8], crc1 );
|
||||
|
||||
PrintAndLog(" Internal : %s ", sprint_hex(data + 9, 1));
|
||||
PrintAndLog(" Internal : %s ", sprint_hex(data + 9, 1));
|
||||
|
||||
memcpy(datatemp, data+10, 2);
|
||||
PrintAndLog(" Lock : %s - %s", sprint_hex(datatemp, 2),printBits( 2, &datatemp) );
|
||||
PrintAndLog(" OneTimePad : %s ", sprint_hex(data + 3*4, 4));
|
||||
PrintAndLog(" Lock : %s - %s", sprint_hex(datatemp, 2),printBits( 2, &datatemp) );
|
||||
PrintAndLog("OneTimePad : %s ", sprint_hex(data + 3*4, 4));
|
||||
PrintAndLog("");
|
||||
|
||||
int len = CmdHF14AMfucAuth("K 0");
|
||||
// PrintAndLog("CODE: %d",len);
|
||||
|
||||
PrintAndLog("Seems to be a Ultralight %s", (len==0) ? "-C" :"");
|
||||
|
||||
PrintAndLog("--- ");
|
||||
if ((tagtype & UL_C)){
|
||||
|
||||
PrintAndLog("Trying some default 3des keys");
|
||||
uint8_t *key;
|
||||
|
||||
for (uint8_t i = 0; i < 5; ++i ){
|
||||
key = default_3des_keys[i];
|
||||
if (try3DesAuthentication(key)){
|
||||
PrintAndLog("Found default 3des key: %s", sprint_hex(key,16));
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {
|
||||
//********** TODO ********************************
|
||||
//PrintAndLog("Trying some known EV1 passwords.");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -105,7 +222,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
|
|||
|
||||
blockNo = param_get8(Cmd, 0);
|
||||
|
||||
if (blockNo > MAX_ULTRA_BLOCKS){
|
||||
if (blockNo > MAX_UL_BLOCKS){
|
||||
PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight Cards!");
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -155,40 +272,41 @@ int CmdHF14AMfUWrBl(const char *Cmd){
|
|||
// Mifare Ultralight Read Single Block
|
||||
//
|
||||
int CmdHF14AMfURdBl(const char *Cmd){
|
||||
|
||||
uint8_t blockNo = -1;
|
||||
|
||||
UsbCommand resp;
|
||||
uint8_t blockNo = -1;
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
|
||||
if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') {
|
||||
PrintAndLog("Usage: hf mfu rdbl <block number>");
|
||||
PrintAndLog(" sample: hfu mfu rdbl 0");
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
blockNo = param_get8(Cmd, 0);
|
||||
|
||||
if (blockNo > MAX_ULTRA_BLOCKS){
|
||||
PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight Cards!");
|
||||
return 1;
|
||||
if (blockNo > MAX_UL_BLOCKS){
|
||||
PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight");
|
||||
return 1;
|
||||
}
|
||||
|
||||
PrintAndLog("--block no:0x%02X (%d)", (int)blockNo, blockNo);
|
||||
|
||||
UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
|
||||
SendCommand(&c);
|
||||
|
||||
UsbCommand resp;
|
||||
|
||||
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
|
||||
uint8_t isOK = resp.arg[0] & 0xff;
|
||||
uint8_t * data = resp.d.asBytes;
|
||||
|
||||
PrintAndLog("isOk: %02x", isOK);
|
||||
|
||||
if (isOK)
|
||||
PrintAndLog("Data: %s", sprint_hex(data, 4));
|
||||
uint8_t isOK = resp.arg[0] & 0xff;
|
||||
if (isOK) {
|
||||
uint8_t *data = resp.d.asBytes;
|
||||
PrintAndLog("Block: %0d (0x%02X) [ %s]", (int)blockNo, blockNo, sprint_hex(data, 4));
|
||||
}
|
||||
else {
|
||||
PrintAndLog("Failed reading block: (%02x)", isOK);
|
||||
}
|
||||
} else {
|
||||
PrintAndLog("Command execute timeout");
|
||||
PrintAndLog("Command execute time-out");
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -224,7 +342,7 @@ int CmdHF14AMfUDump(const char *Cmd){
|
|||
PrintAndLog("Reads all pages from Mifare Ultralight or Ultralight-C tag.");
|
||||
PrintAndLog("It saves binary dump into the file `filename.bin` or `cardUID.bin`");
|
||||
PrintAndLog("Usage: hf mfu dump <c> <filename w/o .bin>");
|
||||
PrintAndLog(" <c> optional cardtype c == Ultralight-C, if not defaults to Ultralight");
|
||||
PrintAndLog(" <c> optional cardtype c == Ultralight-C, Defaults to Ultralight");
|
||||
PrintAndLog(" sample: hf mfu dump");
|
||||
PrintAndLog(" : hf mfu dump myfile");
|
||||
PrintAndLog(" : hf mfu dump c myfile");
|
||||
|
|
@ -234,7 +352,36 @@ int CmdHF14AMfUDump(const char *Cmd){
|
|||
// UL or UL-C?
|
||||
Pages = (cmdp == 'c' || cmdp == 'C') ? 44 : 16;
|
||||
|
||||
PrintAndLog("Dumping Ultralight%s Card Data...", (Pages ==16)?"":"-C");
|
||||
uint8_t data2[16] = {0x00};
|
||||
TagTypeUL_t tagtype = GetHF14AMfU_Type(data2, sizeof(data2));
|
||||
switch(tagtype){
|
||||
case UL_C:
|
||||
Pages = 44;
|
||||
PrintAndLog("Dumping Ultralight_C Card Data...");
|
||||
break;
|
||||
case UL_EV1_48:
|
||||
Pages = 18;
|
||||
PrintAndLog("Dumping Ultralight EV1_48 Card Data...");
|
||||
break;
|
||||
case UL_EV1_128:
|
||||
Pages = 32;
|
||||
PrintAndLog("Dumping Ultralight EV1_128 Card Data...");
|
||||
break;
|
||||
case UL_MAGIC:
|
||||
Pages = 16;
|
||||
PrintAndLog("Dumping Ultralight (Magic) Card Data...");
|
||||
break;
|
||||
case UL_C_MAGIC:
|
||||
Pages = 44;
|
||||
PrintAndLog("Dumping Ultralight_C (Magic) Card Data...");
|
||||
break;
|
||||
case UL:
|
||||
default:
|
||||
Pages = 16;
|
||||
PrintAndLog("Dumping Ultralight Card Data...");
|
||||
break;
|
||||
}
|
||||
//PrintAndLog("Dumping Ultralight%s Card Data...", (Pages ==16)?"":"-C");
|
||||
|
||||
UsbCommand c = {CMD_MIFAREU_READCARD, {BlockNo,Pages}};
|
||||
SendCommand(&c);
|
||||
|
|
@ -248,7 +395,7 @@ int CmdHF14AMfUDump(const char *Cmd){
|
|||
}
|
||||
data = resp.d.asBytes;
|
||||
} else {
|
||||
PrintAndLog("Command execute timeout");
|
||||
PrintAndLog("Command execute time-out");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -376,130 +523,107 @@ void rol (uint8_t *data, const size_t len){
|
|||
//
|
||||
int CmdHF14AMfucAuth(const char *Cmd){
|
||||
|
||||
uint8_t default_keys[5][16] = {
|
||||
{ 0x42,0x52,0x45,0x41,0x4b,0x4d,0x45,0x49,0x46,0x59,0x4f,0x55,0x43,0x41,0x4e,0x21 },// 3des std key
|
||||
{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },// all zeroes
|
||||
{ 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f },// 0x00-0x0F
|
||||
{ 0x49,0x45,0x4D,0x4B,0x41,0x45,0x52,0x42,0x21,0x4E,0x41,0x43,0x55,0x4F,0x59,0x46 },// NFC-key
|
||||
{ 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 } // all ones
|
||||
};
|
||||
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
|
||||
uint8_t keyNo = 0;
|
||||
bool errors = false;
|
||||
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
|
||||
//Change key to user defined one
|
||||
if (cmdp == 'k' || cmdp == 'K'){
|
||||
keyNo = param_get8(Cmd, 1);
|
||||
if(keyNo >= 4) errors = true;
|
||||
if(keyNo > 6)
|
||||
errors = true;
|
||||
}
|
||||
|
||||
if (cmdp == 'h' || cmdp == 'H') {
|
||||
if (cmdp == 'h' || cmdp == 'H')
|
||||
errors = true;
|
||||
}
|
||||
|
||||
|
||||
if (errors) {
|
||||
PrintAndLog("Usage: hf mfu cauth k <key number>");
|
||||
PrintAndLog(" 0 (default): 3DES standard key");
|
||||
PrintAndLog(" 1 : all zeros key");
|
||||
PrintAndLog(" 1 : all 0x00 key");
|
||||
PrintAndLog(" 2 : 0x00-0x0F key");
|
||||
PrintAndLog(" 3 : nfc key");
|
||||
PrintAndLog(" 4 : all ones key");
|
||||
PrintAndLog(" sample : hf mfu cauth k");
|
||||
PrintAndLog(" 4 : all 0x01 key");
|
||||
PrintAndLog(" 5 : all 0xff key");
|
||||
PrintAndLog(" 6 : 0x00-0xFF key");
|
||||
PrintAndLog("\n sample : hf mfu cauth k");
|
||||
PrintAndLog(" : hf mfu cauth k 3");
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint8_t random_a[8] = { 1,1,1,1,1,1,1,1 };
|
||||
//uint8_t enc_random_a[8] = { 0 };
|
||||
uint8_t random_b[8] = { 0 };
|
||||
uint8_t enc_random_b[8] = { 0 };
|
||||
uint8_t random_a_and_b[16] = { 0 };
|
||||
des3_context ctx = { 0 };
|
||||
uint8_t *key = default_keys[keyNo];
|
||||
uint8_t *key = default_3des_keys[keyNo];
|
||||
if (try3DesAuthentication(key))
|
||||
PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 8));
|
||||
else
|
||||
PrintAndLog("Authentication failed");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int try3DesAuthentication( uint8_t *key){
|
||||
|
||||
uint8_t blockNo = 0;
|
||||
uint32_t cuid = 0;
|
||||
|
||||
//Auth1
|
||||
des3_context ctx = { 0 };
|
||||
|
||||
uint8_t random_a[8] = { 1,1,1,1,1,1,1,1 };
|
||||
uint8_t random_b[8] = { 0 };
|
||||
uint8_t enc_random_b[8] = { 0 };
|
||||
uint8_t rnd_ab[16] = { 0 };
|
||||
uint8_t iv[8] = { 0 };
|
||||
|
||||
UsbCommand c = {CMD_MIFAREUC_AUTH1, {blockNo}};
|
||||
SendCommand(&c);
|
||||
UsbCommand resp;
|
||||
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
|
||||
uint8_t isOK = resp.arg[0] & 0xff;
|
||||
cuid = resp.arg[1];
|
||||
uint8_t * data= resp.d.asBytes;
|
||||
|
||||
if (isOK){
|
||||
PrintAndLog("enc(RndB):%s", sprint_hex(data+1, 8));
|
||||
memcpy(enc_random_b,data+1,8);
|
||||
} else {
|
||||
PrintAndLog("Auth failed");
|
||||
return 2; // auth failed.
|
||||
}
|
||||
} else {
|
||||
PrintAndLog("Command execute timeout");
|
||||
return 1;
|
||||
}
|
||||
|
||||
uint8_t iv[8] = { 0 };
|
||||
// Do we need random ? Right now we use all ones, is that random enough ?
|
||||
// DES_random_key(&RndA);
|
||||
|
||||
PrintAndLog(" RndA :%s",sprint_hex(random_a, 8));
|
||||
PrintAndLog(" e_RndB:%s",sprint_hex(enc_random_b, 8));
|
||||
if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) return -1;
|
||||
if ( !(resp.arg[0] & 0xff) ) return -2;
|
||||
|
||||
cuid = resp.arg[1];
|
||||
memcpy(enc_random_b,resp.d.asBytes+1,8);
|
||||
|
||||
des3_set2key_dec(&ctx, key);
|
||||
|
||||
des3_crypt_cbc(&ctx // des3_context *ctx
|
||||
, DES_DECRYPT // int mode
|
||||
, sizeof(random_b) // size_t length
|
||||
, iv // unsigned char iv[8]
|
||||
, enc_random_b // const unsigned char *input
|
||||
, random_b // unsigned char *output
|
||||
);
|
||||
|
||||
PrintAndLog(" RndB:%s",sprint_hex(random_b, 8));
|
||||
// context, mode, length, IV, input, output
|
||||
des3_crypt_cbc( &ctx, DES_DECRYPT, sizeof(random_b), iv , enc_random_b , random_b);
|
||||
|
||||
rol(random_b,8);
|
||||
memcpy(random_a_and_b ,random_a,8);
|
||||
memcpy(random_a_and_b+8,random_b,8);
|
||||
|
||||
PrintAndLog(" RA+B:%s",sprint_hex(random_a_and_b, 16));
|
||||
memcpy(rnd_ab ,random_a,8);
|
||||
memcpy(rnd_ab+8,random_b,8);
|
||||
|
||||
des3_set2key_enc(&ctx, key);
|
||||
|
||||
des3_crypt_cbc(&ctx // des3_context *ctx
|
||||
, DES_ENCRYPT // int mode
|
||||
, sizeof(random_a_and_b) // size_t length
|
||||
, enc_random_b // unsigned char iv[8]
|
||||
, random_a_and_b // const unsigned char *input
|
||||
, random_a_and_b // unsigned char *output
|
||||
);
|
||||
|
||||
PrintAndLog("enc(RA+B):%s",sprint_hex(random_a_and_b, 16));
|
||||
// context, mode, length, IV, input, output
|
||||
des3_crypt_cbc(&ctx, DES_ENCRYPT, sizeof(rnd_ab), enc_random_b, rnd_ab, rnd_ab);
|
||||
|
||||
//Auth2
|
||||
UsbCommand d = {CMD_MIFAREUC_AUTH2, {cuid}};
|
||||
memcpy(d.d.asBytes,random_a_and_b, 16);
|
||||
SendCommand(&d);
|
||||
c.cmd = CMD_MIFAREUC_AUTH2;
|
||||
c.arg[0] = cuid;
|
||||
memcpy(c.d.asBytes, rnd_ab, 16);
|
||||
SendCommand(&c);
|
||||
|
||||
UsbCommand respb;
|
||||
if (WaitForResponseTimeout(CMD_ACK,&respb,1500)) {
|
||||
uint8_t isOK = respb.arg[0] & 0xff;
|
||||
uint8_t * data2= respb.d.asBytes;
|
||||
if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
|
||||
if ( !(resp.arg[0] & 0xff)) return -2;
|
||||
|
||||
uint8_t enc_resp[8] = { 0 };
|
||||
uint8_t resp_random_a[8] = { 0 };
|
||||
memcpy(enc_resp, resp.d.asBytes+1, 8);
|
||||
|
||||
if (isOK){
|
||||
PrintAndLog("enc(RndA'):%s", sprint_hex(data2+1, 8));
|
||||
} else {
|
||||
return 2;
|
||||
}
|
||||
|
||||
} else {
|
||||
PrintAndLog("Command execute timeout");
|
||||
return 1;
|
||||
}
|
||||
des3_set2key_dec(&ctx, key);
|
||||
// context, mode, length, IV, input, output
|
||||
des3_crypt_cbc( &ctx, DES_DECRYPT, 8, enc_random_b, enc_resp, resp_random_a);
|
||||
|
||||
if ( !memcmp(resp_random_a, random_a, 8))
|
||||
return 1;
|
||||
return 0;
|
||||
|
||||
//PrintAndLog(" RndA :%s", sprint_hex(random_a, 8));
|
||||
//PrintAndLog(" enc(RndB) :%s", sprint_hex(enc_random_b, 8));
|
||||
//PrintAndLog(" RndB :%s", sprint_hex(random_b, 8));
|
||||
//PrintAndLog(" A+B :%s", sprint_hex(random_a_and_b, 16));
|
||||
//PrintAndLog(" enc(A+B) :%s", sprint_hex(random_a_and_b, 16));
|
||||
//PrintAndLog(" enc(RndA') :%s", sprint_hex(data2+1, 8));
|
||||
}
|
||||
|
||||
/**
|
||||
A test function to validate that the polarssl-function works the same
|
||||
was as the openssl-implementation.
|
||||
|
|
@ -601,12 +725,17 @@ int CmdTestDES(const char * cmd)
|
|||
//
|
||||
int CmdHF14AMfUCRdBl(const char *Cmd)
|
||||
{
|
||||
UsbCommand resp;
|
||||
bool hasPwd = FALSE;
|
||||
uint8_t blockNo = -1;
|
||||
unsigned char key[16];
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
|
||||
if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') {
|
||||
PrintAndLog("Usage: hf mfu crdbl <block number>");
|
||||
PrintAndLog(" sample: hf mfu crdbl 0");
|
||||
PrintAndLog("Usage: hf mfu crdbl <block number> <password>");
|
||||
PrintAndLog("");
|
||||
PrintAndLog("sample: hf mfu crdbl 0");
|
||||
PrintAndLog(" hf mfu crdbl 0 112233445566778899AABBCCDDEEFF");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -616,27 +745,40 @@ int CmdHF14AMfUCRdBl(const char *Cmd)
|
|||
return 1;
|
||||
}
|
||||
|
||||
if (blockNo > MAX_ULTRAC_BLOCKS ){
|
||||
PrintAndLog("Error: Maximum number of readable blocks is 47 for Ultralight-C Cards!");
|
||||
if (blockNo > MAX_ULC_BLOCKS ){
|
||||
PrintAndLog("Error: Maximum number of blocks is 47 for Ultralight-C");
|
||||
return 1;
|
||||
}
|
||||
|
||||
PrintAndLog("--block no: 0x%02X (%d)", (int)blockNo, blockNo);
|
||||
// key
|
||||
if ( strlen(Cmd) > 3){
|
||||
if (param_gethex(Cmd, 1, key, 32)) {
|
||||
PrintAndLog("Key must include %d HEX symbols", 32);
|
||||
return 1;
|
||||
} else {
|
||||
hasPwd = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
//Read Block
|
||||
UsbCommand e = {CMD_MIFAREU_READBL, {blockNo}};
|
||||
SendCommand(&e);
|
||||
UsbCommand resp_c;
|
||||
if (WaitForResponseTimeout(CMD_ACK,&resp_c,1500)) {
|
||||
uint8_t isOK = resp_c.arg[0] & 0xff;
|
||||
uint8_t *data = resp_c.d.asBytes;
|
||||
|
||||
PrintAndLog("isOk: %02x", isOK);
|
||||
if (isOK)
|
||||
PrintAndLog("Data: %s", sprint_hex(data, 4));
|
||||
|
||||
UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
|
||||
if ( hasPwd ) {
|
||||
c.arg[1] = 1;
|
||||
memcpy(c.d.asBytes,key,16);
|
||||
}
|
||||
SendCommand(&c);
|
||||
|
||||
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
|
||||
uint8_t isOK = resp.arg[0] & 0xff;
|
||||
if (isOK) {
|
||||
uint8_t *data = resp.d.asBytes;
|
||||
PrintAndLog("Block: %0d (0x%02X) [ %s]", (int)blockNo, blockNo, sprint_hex(data, 4));
|
||||
}
|
||||
else {
|
||||
PrintAndLog("Failed reading block: (%02x)", isOK);
|
||||
}
|
||||
} else {
|
||||
PrintAndLog("Command execute timeout");
|
||||
PrintAndLog("Command execute time-out");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -665,7 +807,7 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
|
|||
}
|
||||
|
||||
blockNo = param_get8(Cmd, 0);
|
||||
if (blockNo > MAX_ULTRAC_BLOCKS ){
|
||||
if (blockNo > MAX_ULC_BLOCKS ){
|
||||
PrintAndLog("Error: Maximum number of blocks is 47 for Ultralight-C Cards!");
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -711,6 +853,228 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
|
|||
return 0;
|
||||
}
|
||||
|
||||
//
|
||||
// Mifare Ultralight C - Set password
|
||||
//
|
||||
int CmdHF14AMfucSetPwd(const char *Cmd){
|
||||
|
||||
uint8_t pwd[16] = {0x00};
|
||||
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
|
||||
if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') {
|
||||
PrintAndLog("Usage: hf mfu setpwd <password (32 hex symbols)>");
|
||||
PrintAndLog(" [password] - (32 hex symbols)");
|
||||
PrintAndLog("");
|
||||
PrintAndLog("sample: hf mfu setpwd 000102030405060708090a0b0c0d0e0f");
|
||||
PrintAndLog("");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (param_gethex(Cmd, 0, pwd, 32)) {
|
||||
PrintAndLog("Password must include 32 HEX symbols");
|
||||
return 1;
|
||||
}
|
||||
|
||||
UsbCommand c = {CMD_MIFAREUC_SETPWD};
|
||||
memcpy( c.d.asBytes, pwd, 16);
|
||||
SendCommand(&c);
|
||||
|
||||
UsbCommand resp;
|
||||
|
||||
if (WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
|
||||
if ( (resp.arg[0] & 0xff) == 1)
|
||||
PrintAndLog("Ultralight-C new password: %s", sprint_hex(pwd,16));
|
||||
else{
|
||||
PrintAndLog("Failed writing at block %d", resp.arg[1] & 0xff);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
else {
|
||||
PrintAndLog("command execution time out");
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
//
|
||||
// Mifare Ultraligh - Set UID
|
||||
//
|
||||
int CmdHF14AMfucSetUid(const char *Cmd){
|
||||
|
||||
UsbCommand c;
|
||||
UsbCommand resp;
|
||||
uint8_t uid[7] = {0x00};
|
||||
char cmdp = param_getchar(Cmd, 0);
|
||||
|
||||
if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') {
|
||||
PrintAndLog("Usage: hf mfu setuid <uid (14 hex symbols)>");
|
||||
PrintAndLog(" [uid] - (14 hex symbols)");
|
||||
PrintAndLog("\nThis only works for Magic Ultralight tags.");
|
||||
PrintAndLog("");
|
||||
PrintAndLog("sample: hf mfu setuid 11223344556677");
|
||||
PrintAndLog("");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (param_gethex(Cmd, 0, uid, 14)) {
|
||||
PrintAndLog("UID must include 14 HEX symbols");
|
||||
return 1;
|
||||
}
|
||||
|
||||
// read block2.
|
||||
c.cmd = CMD_MIFAREU_READBL;
|
||||
c.arg[0] = 2;
|
||||
SendCommand(&c);
|
||||
if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
|
||||
PrintAndLog("Command execute timeout");
|
||||
return 2;
|
||||
}
|
||||
|
||||
// save old block2.
|
||||
uint8_t oldblock2[4] = {0x00};
|
||||
memcpy(resp.d.asBytes, oldblock2, 4);
|
||||
|
||||
// block 0.
|
||||
c.cmd = CMD_MIFAREU_WRITEBL;
|
||||
c.arg[0] = 0;
|
||||
c.d.asBytes[0] = uid[0];
|
||||
c.d.asBytes[1] = uid[1];
|
||||
c.d.asBytes[2] = uid[2];
|
||||
c.d.asBytes[3] = 0x88 ^ uid[0] ^ uid[1] ^ uid[2];
|
||||
SendCommand(&c);
|
||||
if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
|
||||
PrintAndLog("Command execute timeout");
|
||||
return 3;
|
||||
}
|
||||
|
||||
// block 1.
|
||||
c.arg[0] = 1;
|
||||
c.d.asBytes[0] = uid[3];
|
||||
c.d.asBytes[1] = uid[4];
|
||||
c.d.asBytes[2] = uid[5];
|
||||
c.d.asBytes[3] = uid[6];
|
||||
SendCommand(&c);
|
||||
if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
|
||||
PrintAndLog("Command execute timeout");
|
||||
return 4;
|
||||
}
|
||||
|
||||
// block 2.
|
||||
c.arg[0] = 2;
|
||||
c.d.asBytes[0] = uid[3] ^ uid[4] ^ uid[5] ^ uid[6];
|
||||
c.d.asBytes[1] = oldblock2[1];
|
||||
c.d.asBytes[2] = oldblock2[2];
|
||||
c.d.asBytes[3] = oldblock2[3];
|
||||
SendCommand(&c);
|
||||
if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
|
||||
PrintAndLog("Command execute timeout");
|
||||
return 5;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
|
||||
|
||||
uint8_t iv[8] = { 0x00 };
|
||||
uint8_t block = 0x07;
|
||||
|
||||
// UL-EV1
|
||||
//04 57 b6 e2 05 3f 80 UID
|
||||
//4a f8 4b 19 PWD
|
||||
uint8_t uid[] = { 0xF4,0xEA, 0x54, 0x8E };
|
||||
uint8_t mifarekeyA[] = { 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5 };
|
||||
uint8_t mifarekeyB[] = { 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5 };
|
||||
uint8_t dkeyA[8] = { 0x00 };
|
||||
uint8_t dkeyB[8] = { 0x00 };
|
||||
|
||||
uint8_t masterkey[] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xaa,0xbb,0xcc,0xdd,0xee,0xff };
|
||||
|
||||
uint8_t mix[8] = { 0x00 };
|
||||
uint8_t divkey[8] = { 0x00 };
|
||||
|
||||
memcpy(mix, mifarekeyA, 4);
|
||||
|
||||
mix[4] = mifarekeyA[4] ^ uid[0];
|
||||
mix[5] = mifarekeyA[5] ^ uid[1];
|
||||
mix[6] = block ^ uid[2];
|
||||
mix[7] = uid[3];
|
||||
|
||||
des3_context ctx = { 0x00 };
|
||||
des3_set2key_enc(&ctx, masterkey);
|
||||
|
||||
des3_crypt_cbc(&ctx // des3_context
|
||||
, DES_ENCRYPT // int mode
|
||||
, sizeof(mix) // length
|
||||
, iv // iv[8]
|
||||
, mix // input
|
||||
, divkey // output
|
||||
);
|
||||
|
||||
PrintAndLog("3DES version");
|
||||
PrintAndLog("Masterkey :\t %s", sprint_hex(masterkey,sizeof(masterkey)));
|
||||
PrintAndLog("UID :\t %s", sprint_hex(uid, sizeof(uid)));
|
||||
PrintAndLog("Sector :\t %0d", block);
|
||||
PrintAndLog("Mifare key :\t %s", sprint_hex(mifarekeyA, sizeof(mifarekeyA)));
|
||||
PrintAndLog("Message :\t %s", sprint_hex(mix, sizeof(mix)));
|
||||
PrintAndLog("Diversified key: %s", sprint_hex(divkey+1, 6));
|
||||
|
||||
PrintAndLog("\n DES version");
|
||||
|
||||
for (int i=0; i < sizeof(mifarekeyA); ++i){
|
||||
dkeyA[i] = (mifarekeyA[i] << 1) & 0xff;
|
||||
dkeyA[6] |= ((mifarekeyA[i] >> 7) & 1) << (i+1);
|
||||
}
|
||||
|
||||
for (int i=0; i < sizeof(mifarekeyB); ++i){
|
||||
dkeyB[1] |= ((mifarekeyB[i] >> 7) & 1) << (i+1);
|
||||
dkeyB[2+i] = (mifarekeyB[i] << 1) & 0xff;
|
||||
}
|
||||
|
||||
uint8_t zeros[8] = {0x00};
|
||||
uint8_t newpwd[8] = {0x00};
|
||||
uint8_t dmkey[24] = {0x00};
|
||||
memcpy(dmkey, dkeyA, 8);
|
||||
memcpy(dmkey+8, dkeyB, 8);
|
||||
memcpy(dmkey+16, dkeyA, 8);
|
||||
memset(iv, 0x00, 8);
|
||||
|
||||
des3_set3key_enc(&ctx, dmkey);
|
||||
|
||||
des3_crypt_cbc(&ctx // des3_context
|
||||
, DES_ENCRYPT // int mode
|
||||
, sizeof(newpwd) // length
|
||||
, iv // iv[8]
|
||||
, zeros // input
|
||||
, newpwd // output
|
||||
);
|
||||
|
||||
PrintAndLog("Mifare dkeyA :\t %s", sprint_hex(dkeyA, sizeof(dkeyA)));
|
||||
PrintAndLog("Mifare dkeyB :\t %s", sprint_hex(dkeyB, sizeof(dkeyB)));
|
||||
PrintAndLog("Mifare ABA :\t %s", sprint_hex(dmkey, sizeof(dmkey)));
|
||||
PrintAndLog("Mifare Pwd :\t %s", sprint_hex(newpwd, sizeof(newpwd)));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// static uint8_t * diversify_key(uint8_t * key){
|
||||
|
||||
// for(int i=0; i<16; i++){
|
||||
// if(i<=6) key[i]^=cuid[i];
|
||||
// if(i>6) key[i]^=cuid[i%7];
|
||||
// }
|
||||
// return key;
|
||||
// }
|
||||
|
||||
// static void GenerateUIDe( uint8_t *uid, uint8_t len){
|
||||
// for (int i=0; i<len; ++i){
|
||||
|
||||
// }
|
||||
// return;
|
||||
// }
|
||||
|
||||
//------------------------------------
|
||||
// Menu Stuff
|
||||
//------------------------------------
|
||||
|
|
@ -720,12 +1084,14 @@ static command_t CommandTable[] =
|
|||
{"dbg", CmdHF14AMfDbg, 0,"Set default debug mode"},
|
||||
{"info", CmdHF14AMfUInfo, 0,"Taginfo"},
|
||||
{"dump", CmdHF14AMfUDump, 0,"Dump MIFARE Ultralight / Ultralight-C tag to binary file"},
|
||||
{"rdbl", CmdHF14AMfURdBl, 0,"Read block - MIFARE Ultralight"},
|
||||
{"rdbl", CmdHF14AMfURdBl, 0,"Read block - MIFARE Ultralight"},
|
||||
{"wrbl", CmdHF14AMfUWrBl, 0,"Write block - MIFARE Ultralight"},
|
||||
{"crdbl", CmdHF14AMfUCRdBl, 0,"Read block - MIFARE Ultralight C"},
|
||||
{"cwrbl", CmdHF14AMfUCWrBl, 0,"Write MIFARE Ultralight C block"},
|
||||
{"cauth", CmdHF14AMfucAuth, 0,"try a Ultralight C Authentication"},
|
||||
//{"testdes", CmdTestDES , 1, "Test DES"},
|
||||
{"crdbl", CmdHF14AMfUCRdBl, 0,"Read block - MIFARE Ultralight C"},
|
||||
{"cwrbl", CmdHF14AMfUCWrBl, 0,"Write block - MIFARE Ultralight C"},
|
||||
{"cauth", CmdHF14AMfucAuth, 0,"Ultralight C Authentication"},
|
||||
{"setpwd", CmdHF14AMfucSetPwd , 1, "Set 3des password [Ultralight-C only]"},
|
||||
{"setuid", CmdHF14AMfucSetUid , 1, "Set UID"},
|
||||
{"gen", CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},
|
||||
{NULL, NULL, 0, NULL}
|
||||
};
|
||||
|
||||
|
|
@ -738,4 +1104,4 @@ int CmdHFMFUltra(const char *Cmd){
|
|||
int CmdHelp(const char *Cmd){
|
||||
CmdsHelp(CommandTable);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
#include "cmdhfmf.h"
|
||||
#include "cmdhf14a.h"
|
||||
|
||||
#ifndef CMDHFMFU_H__
|
||||
#define CMDHFMFU_H__
|
||||
|
||||
//standard ultralight
|
||||
int CmdHF14AMfUWrBl(const char *Cmd);
|
||||
int CmdHF14AMfURdBl(const char *Cmd);
|
||||
|
|
@ -14,6 +17,9 @@ int CmdHF14AMfucAuth(const char *Cmd);
|
|||
int CmdHF14AMfUDump(const char *Cmd);
|
||||
void rol (uint8_t *data, const size_t len);
|
||||
|
||||
uint8_t requestAuthentication( uint8_t *nonce);
|
||||
int try3DesAuthentication( uint8_t *key);
|
||||
|
||||
int CmdHFMFUltra(const char *Cmd);
|
||||
int CmdHF14AMfUInfo(const char *Cmd);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -135,11 +135,10 @@ local _commands = {
|
|||
CMD_MIFARE_SNIFFER = 0x0630,
|
||||
|
||||
--//ultralightC
|
||||
CMD_MIFAREUC_AUTH1 = 0x0724,
|
||||
CMD_MIFAREUC_AUTH2 = 0x0725,
|
||||
CMD_MIFAREUC_READCARD = 0x0726,
|
||||
CMD_MIFAREUC_SETPWD = 0x0727,
|
||||
CMD_MIFAREU_SETUID = 0x0728,
|
||||
CMD_MIFAREUC_AUTH1 = 0x0724,
|
||||
CMD_MIFAREUC_AUTH2 = 0x0725,
|
||||
CMD_MIFAREUC_READCARD = 0x0726,
|
||||
CMD_MIFAREUC_SETPWD = 0x0727,
|
||||
|
||||
--// mifare desfire
|
||||
CMD_MIFARE_DESFIRE_READBL = 0x0728,
|
||||
|
|
@ -155,10 +154,10 @@ local _commands = {
|
|||
|
||||
|
||||
local _reverse_lookup,k,v = {}
|
||||
for k, v in pairs(_commands) do
|
||||
_reverse_lookup[v] = k
|
||||
end
|
||||
_commands.tostring = function(command)
|
||||
for k, v in pairs(_commands) do
|
||||
_reverse_lookup[v] = k
|
||||
end
|
||||
_commands.tostring = function(command)
|
||||
if(type(command) == 'number') then
|
||||
return ("%s (%d)"):format(_reverse_lookup[command]or "ERROR UNDEFINED!", command)
|
||||
end
|
||||
|
|
@ -219,6 +218,7 @@ function Command:getBytes()
|
|||
local data = self.data
|
||||
local cmd = self.cmd
|
||||
local arg1, arg2, arg3 = self.arg1, self.arg2, self.arg3
|
||||
return bin.pack("LLLLH",cmd, arg1, arg2, arg3, data);
|
||||
|
||||
return bin.pack("LLLLH",cmd, arg1, arg2, arg3,data);
|
||||
end
|
||||
return _commands
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue