hf mf isen: add nt indexes

This commit is contained in:
Philippe Teuwen committed 2024-07-31 00:41:50 +02:00
1 parent 153064ddfa
commit fb0b448c4f
4 files changed
+22 -12

No files matched your search

+1 -1
View File
@@ -2068,7 +2068,7 @@ void annotateMifare(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize,
AuthData.nt = bytes_to_num(cmd, 4);
AuthData.nt_enc_par = 0;
if (validate_prng_nonce(AuthData.nt)) {
snprintf(exp, size, "AUTH: nt (lfsr16 index %i)", nonce_distance(0x0100, AuthData.nt));
snprintf(exp, size, "AUTH: nt (lfsr16 index %i)", nonce_distance(0, AuthData.nt));
} else {
snprintf(exp, size, "AUTH: nt");
}
+1 -1
View File
@@ -1450,7 +1450,7 @@ int detect_classic_static_encrypted_nonce_ex(uint8_t block_no, uint8_t key_type,
(ntencpar >> 3) & 1, (ntencpar >> 2) & 1, (ntencpar >> 1) & 1,
ks, nt,
oddparity8((nt>>24) & 0xFF), oddparity8((nt>>16) & 0xFF), oddparity8((nt>>8) & 0xFF), oddparity8(nt & 0xFF),
nonce_distance(0x0100, nt));
nonce_distance(0, nt));
} else {
PrintAndLogEx(INFO, "nTenc " _GREEN_("%08x") " par {" _YELLOW_("%i%i%i%i") "}=" _YELLOW_("%i%i%ix") " | ks " _YELLOW_("%08x") " | nT " _YELLOW_("%08x") " par " _YELLOW_("%i%i%i%i") " | " _RED_("not lfsr16") " (wrong key)",
ntenc,