change data available check in hf mf sim on device side.
This commit is contained in:
1 parent
20a0bc3a81
commit
34e00146c6
8 files changed
+127
-59
No files matched your search
+10
-6
@@ -120,12 +120,16 @@ static int derive_app_key(uint8_t *uid, uint8_t *app_key) {
|
||||
}
|
||||
|
||||
// Might miss payload..
|
||||
static int diversify_mifare_key(const uint8_t *uid, uint8_t *app_key) {
|
||||
static int diversify_mifare_key(const uint8_t *uid, uint8_t *app_key, uint8_t app_keylen) {
|
||||
if (uid == NULL || app_key == NULL) {
|
||||
return PM3_EINVARG;
|
||||
}
|
||||
|
||||
uint8_t input[8];
|
||||
if (app_keylen > AES_KEY_LEN) {
|
||||
return PM3_EINVARG;
|
||||
}
|
||||
|
||||
uint8_t input[AES_KEY_LEN];
|
||||
memcpy(input, uid, 4);
|
||||
|
||||
uint32_t big = bytes_to_num(uid, 4);
|
||||
@@ -143,12 +147,12 @@ static int diversify_mifare_key(const uint8_t *uid, uint8_t *app_key) {
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
|
||||
uint8_t output[8];
|
||||
uint8_t output[AES_KEY_LEN];
|
||||
if (mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_DECRYPT, sizeof(input), iv, input, output)) {
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
mbedtls_aes_free(&aes);
|
||||
memcpy(app_key, output, MIFARE_KEY_SIZE);
|
||||
memcpy(app_key, output, app_keylen);
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -161,7 +165,7 @@ static int decrypt_card_sector(uint8_t *uid, const uint8_t *sector_data, uint8_t
|
||||
memcpy(input, sector_data, len);
|
||||
|
||||
uint8_t key[AES_KEY_LEN];
|
||||
diversify_mifare_key(uid, key);
|
||||
diversify_mifare_key(uid, key, sizeof(key));
|
||||
|
||||
uint8_t iv[16] = {0};
|
||||
mbedtls_aes_context aes;
|
||||
@@ -186,7 +190,7 @@ static int derive_mifare_key(uint8_t *uid, const uint8_t *base_key, uint8_t *app
|
||||
}
|
||||
|
||||
uint8_t diverse[MIFARE_KEY_SIZE];
|
||||
diversify_mifare_key(uid, diverse);
|
||||
diversify_mifare_key(uid, diverse, sizeof(diverse));
|
||||
|
||||
for (uint8_t i = 0; i < MIFARE_KEY_SIZE; i++) {
|
||||
app_key[i] = base_key[i] ^ diverse[i];
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
|
||||
int CmdHFMF(const char *Cmd);
|
||||
int CmdHF14AMfELoad(const char *Cmd); // used by "hf mfu eload"
|
||||
int CmdHF14AMfDbg(const char *Cmd); // used by "hf mfu dbg"
|
||||
int CmdHFMFNDEFRead(const char *Cmd); // used by "nfc mf cread"
|
||||
int CmdHFMFNDEFFormat(const char *Cmd); // used by "nfc mf cformat"
|
||||
int CmdHFMFNDEFWrite(const char *Cmd); // used by "nfc mf cwrite"
|
||||
|
||||
@@ -4129,7 +4129,7 @@ static int CmdHF14AMfUCSetUid(const char *Cmd) {
|
||||
hf14a_config config;
|
||||
SendCommandNG(CMD_HF_ISO14443A_GET_CONFIG, NULL, 0);
|
||||
if (!WaitForResponseTimeout(CMD_HF_ISO14443A_GET_CONFIG, &resp, 2000)) {
|
||||
PrintAndLogEx(WARNING, "command execution time out);
|
||||
PrintAndLogEx(WARNING, "command execution time out");
|
||||
return PM3_ETIMEOUT;
|
||||
}
|
||||
memcpy(&config, resp.data.asBytes, sizeof(hf14a_config));
|
||||
|
||||
Reference in new issue
Block a user