fix: FM11RF08S key recovery generates incorrect results when nt == 0
This commit is contained in:
1 parent
6507b8f36b
commit
0b9d97be2b
3 files changed
+50
-79
No files matched your search
+8
-28
@@ -943,44 +943,26 @@ static int fm11_generate_1nt_candidates(uint32_t uid, uint32_t nt, uint32_t nt_e
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
static uint16_t fm11_i_lfsr16[1 << 16] = {0};
|
||||
static uint16_t fm11_s_lfsr16[1 << 16] = {0};
|
||||
static uint16_t fm11_prev8_lfsr16[1 << 16] = {0};
|
||||
static uint16_t fm11_prev14_lfsr16[1 << 16] = {0};
|
||||
static uint16_t fm11_prev8_lfsr16[1 << 16];
|
||||
static uint16_t fm11_prev14_lfsr16[1 << 16];
|
||||
static bool fm11_lfsr16_ready = false;
|
||||
|
||||
static uint16_t fm11_prev_lfsr16(uint16_t nonce);
|
||||
|
||||
static void fm11_init_lfsr16_table(void) {
|
||||
if (fm11_lfsr16_ready) {
|
||||
return;
|
||||
}
|
||||
uint16_t buffer[16] = { 0 };
|
||||
uint16_t x = 1;
|
||||
for (uint16_t i = 1; i; ++i) {
|
||||
fm11_i_lfsr16[(x & 0xff) << 8 | x >> 8] = i;
|
||||
fm11_s_lfsr16[i] = (x & 0xff) << 8 | x >> 8;
|
||||
for (uint32_t i = 0; i < 65536 + 16; ++i) {
|
||||
fm11_prev8_lfsr16[buffer[(i + 8) % 16]] = buffer[i % 16];
|
||||
fm11_prev14_lfsr16[buffer[(i + 14) % 16]] = buffer[i % 16];
|
||||
|
||||
x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
|
||||
}
|
||||
for (uint32_t nonce = 0; nonce <= UINT16_MAX; nonce++) {
|
||||
uint16_t p = nonce;
|
||||
for (uint8_t i = 0; i < 8; i++) {
|
||||
p = fm11_prev_lfsr16(p);
|
||||
}
|
||||
fm11_prev8_lfsr16[nonce] = p;
|
||||
for (uint8_t i = 8; i < 14; i++) {
|
||||
p = fm11_prev_lfsr16(p);
|
||||
}
|
||||
fm11_prev14_lfsr16[nonce] = p;
|
||||
buffer[i % 16] = (x & 0xFF) << 8 | x >> 8;
|
||||
}
|
||||
fm11_lfsr16_ready = true;
|
||||
}
|
||||
|
||||
static uint16_t fm11_prev_lfsr16(uint16_t nonce) {
|
||||
uint16_t i = fm11_i_lfsr16[nonce];
|
||||
i = (i == 1) ? 0xffff : i - 1;
|
||||
return fm11_s_lfsr16[i];
|
||||
}
|
||||
|
||||
static uint16_t fm11_compute_seednt16_nt32(uint32_t nt32, uint64_t key) {
|
||||
static const uint8_t a[] = {0, 8, 9, 4, 6, 11, 1, 15, 12, 5, 2, 13, 10, 14, 3, 7};
|
||||
static const uint8_t b[] = {0, 13, 1, 14, 4, 10, 15, 7, 5, 3, 8, 6, 9, 2, 12, 11};
|
||||
@@ -3071,8 +3053,6 @@ int HFMFSENRecover(bool keep_nonces, bool no_oob, bool reader_mode, bool offline
|
||||
}
|
||||
}
|
||||
}
|
||||
{
|
||||
}
|
||||
|
||||
uint32_t total_candidates = 0;
|
||||
for (uint8_t sec = 0; sec < FM11RF08S_SECTORS; sec++) {
|
||||
|
||||
Reference in new issue
Block a user