This commit is contained in:
iceman1001 committed 2025-07-13 15:55:44 +02:00
1 parent 64111a43ea
commit ed84b1fcf4
7 files changed
+64 -29

No files matched your search

+4 -4
View File
@@ -3626,7 +3626,7 @@ static int CmdCryptography(const char *Cmd) {
aes256_decode(iv, key, dati, dato, datilen);
PrintAndLogEx(INFO, "AES-256 decrypt... " _YELLOW_("%s"), sprint_hex_inrow(dato, datilen));
} else {
aes_decode(iv, key, dati, dato, datilen);
aes_decode(iv, key, dati, dato, datilen);
PrintAndLogEx(INFO, "AES-128 decrypt... " _YELLOW_("%s"), sprint_hex_inrow(dato, datilen));
}
}
@@ -3659,7 +3659,7 @@ static int CmdCryptography(const char *Cmd) {
if (keylen > 8) {
des3_encrypt(dato, dati, key, keylen / 8);
PrintAndLogEx(INFO, "3DES encrypt keysize ( %d )... " _YELLOW_("%s"), (keylen / 8), sprint_hex_inrow(dato, datilen));
PrintAndLogEx(INFO, "3DES encrypt keysize ( %d )... " _YELLOW_("%s"), (keylen / 8), sprint_hex_inrow(dato, datilen));
} else {
if (ivlen == 0) {
@@ -3687,13 +3687,13 @@ static int CmdCryptography(const char *Cmd) {
aes256_encode(iv, key, dati, dato, datilen);
PrintAndLogEx(INFO, "AES-256 encrypt... " _YELLOW_("%s"), sprint_hex_inrow(dato, datilen));
} else {
aes_encode(iv, key, dati, dato, datilen);
aes_encode(iv, key, dati, dato, datilen);
PrintAndLogEx(INFO, "AES-128 encrypt... " _YELLOW_("%s"), sprint_hex_inrow(dato, datilen));
}
}
}
}
return PM3_SUCCESS;
}
+3 -3
View File
@@ -10398,9 +10398,9 @@ static int CmdHF14AMfInfo(const char *Cmd) {
} else if (detect_classic_auth(MF_KEY_BD)) {
PrintAndLogEx(SUCCESS, "Backdoor key..... " _RED_("detected but unknown!"));
PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf mf nested --blk 0 -%s -k %s --tblk 0 --tc 4") "`"
, (fKeyType == MF_KEY_A) ? "a" : "b"
, sprint_hex_inrow(fkey, MIFARE_KEY_SIZE)
);
, (fKeyType == MF_KEY_A) ? "a" : "b"
, sprint_hex_inrow(fkey, MIFARE_KEY_SIZE)
);
fKeyType = MF_KEY_BD;
}
}
+10 -10
View File
@@ -303,23 +303,23 @@ static int CmdMqttSend(const char *Cmd) {
if (strlen(g_session.mqtt_server)) {
strcpy(addr, g_session.mqtt_server);
} else {
strcpy(addr, "proxdump.com");
}
strcpy(addr, "proxdump.com");
}
}
if (plen == 0) {
if (strlen(g_session.mqtt_port)) {
strcpy(port, g_session.mqtt_port);
} else {
strcpy(port, "1883");
}
strcpy(port, "1883");
}
}
if (tlen == 0) {
if (strlen(g_session.mqtt_topic)) {
strcpy(topic, g_session.mqtt_topic);
} else {
strcpy(topic, "proxdump");
strcpy(topic, "proxdump");
}
}
@@ -380,23 +380,23 @@ static int CmdMqttReceive(const char *Cmd) {
if (strlen(g_session.mqtt_server)) {
strcpy(addr, g_session.mqtt_server);
} else {
strcpy(addr, "proxdump.com");
}
strcpy(addr, "proxdump.com");
}
}
if (plen == 0) {
if (strlen(g_session.mqtt_port)) {
strcpy(port, g_session.mqtt_port);
} else {
strcpy(port, "1883");
}
strcpy(port, "1883");
}
}
if (tlen == 0) {
if (strlen(g_session.mqtt_topic)) {
strcpy(topic, g_session.mqtt_topic);
} else {
strcpy(topic, "proxdump");
strcpy(topic, "proxdump");
}
}
+11 -7
View File
@@ -121,20 +121,24 @@ static const uint64_t g_mifare_default_keys[] = {
0x96a301bce267,
};
static const uint8_t g_mifare_default_key[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
static const uint8_t g_mifare_mad_key[] = {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5};
static const uint8_t g_mifare_mad_key_b[] = {0x89, 0xEC, 0xA9, 0x7F, 0x8C, 0x2A};
static const uint8_t g_mifare_default_key[MIFARE_KEY_SIZE] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
static const uint8_t g_mifare_mad_key[MIFARE_KEY_SIZE] = {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5};
static const uint8_t g_mifare_mad_key_b[MIFARE_KEY_SIZE] = {0x89, 0xEC, 0xA9, 0x7F, 0x8C, 0x2A};
// 16 key B D01AFEEB890A
static const uint8_t g_mifare_signature_key_a[] = {0x5C, 0x8F, 0xF9, 0x99, 0x0D, 0xA2};
static const uint8_t g_mifare_signature_key_b[] = {0x4b, 0x79, 0x1b, 0xea, 0x7b, 0xcc};
static const uint8_t g_mifare_signature_key_a[MIFARE_KEY_SIZE] = {0x5C, 0x8F, 0xF9, 0x99, 0x0D, 0xA2};
static const uint8_t g_mifare_signature_key_b[MIFARE_KEY_SIZE] = {0x4b, 0x79, 0x1b, 0xea, 0x7b, 0xcc};
// Manufacture MFC / QL88 (S17 / B)
static const uint8_t g_mifare_ql88_signature_key_b[] = {0x70, 0x7B, 0x11, 0xFC, 0x14, 0x81};
static const uint8_t g_mifare_ql88_signature_key_b[MIFARE_KEY_SIZE] = {0x70, 0x7B, 0x11, 0xFC, 0x14, 0x81};
static const uint8_t g_mifare_ndef_key[] = {0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7};
static const uint8_t g_mifare_ndef_key[MIFARE_KEY_SIZE] = {0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7};
static const uint8_t g_mifarep_mad_key[] = {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7};
static const uint8_t g_mifarep_ndef_key[] = {0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7};
static const uint8_t g_mifare_k08s[MIFARE_KEY_SIZE] = {0xA3, 0x96, 0xEF, 0xA4, 0xE2, 0x4F};
static const uint8_t g_mifare_k08[MIFARE_KEY_SIZE] = {0xA3, 0x16, 0x67, 0xA8, 0xCE, 0xC1};
static const uint8_t g_mifare_k32n[MIFARE_KEY_SIZE] = {0x51, 0x8B, 0x33, 0x54, 0xE7, 0x60};
static const uint8_t g_mifare_k32n2[MIFARE_KEY_SIZE] = {0x73, 0xB9, 0x83, 0x6C, 0xF1, 0x68};
extern const char *g_mifare_plus_default_keys[];
extern size_t g_mifare_plus_default_keys_len;
+2
View File
@@ -51,6 +51,7 @@ const static vocabulary_t vocabulary[] = {
{ 1, "prefs get hints" },
{ 1, "prefs get output" },
{ 1, "prefs get plotsliders" },
{ 1, "prefs get mqtt" },
{ 1, "prefs set help" },
{ 1, "prefs set barmode" },
{ 1, "prefs set client.debug" },
@@ -62,6 +63,7 @@ const static vocabulary_t vocabulary[] = {
{ 1, "prefs set savepaths" },
{ 1, "prefs set output" },
{ 1, "prefs set plotsliders" },
{ 1, "prefs set mqtt" },
{ 1, "analyse help" },
{ 1, "analyse lrc" },
{ 1, "analyse crc" },