-static uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t **keys) {\r
+static uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t par_info, uint64_t ks_info, uint64_t **keys) {\r
uint8_t bt, ks3x[8], par[8][8];\r
uint64_t key_recovered;\r
uint8_t bt, ks3x[8], par[8][8];\r
uint64_t key_recovered;\r
- states = lfsr_common_prefix(nr, rr, ks3x, par, (par_info == 0));\r
+ states = lfsr_common_prefix(nr, ar, ks3x, par, (par_info == 0));\r
uint64_t par_list = 0, ks_list = 0;\r
uint64_t *keylist = NULL, *last_keylist = NULL;\r
uint32_t keycount = 0;\r
uint64_t par_list = 0, ks_list = 0;\r
uint64_t *keylist = NULL, *last_keylist = NULL;\r
uint32_t keycount = 0;\r
nt = (uint32_t)bytes_to_num(resp.d.asBytes + 4, 4);\r
par_list = bytes_to_num(resp.d.asBytes + 8, 8);\r
ks_list = bytes_to_num(resp.d.asBytes + 16, 8);\r
nt = (uint32_t)bytes_to_num(resp.d.asBytes + 4, 4);\r
par_list = bytes_to_num(resp.d.asBytes + 8, 8);\r
ks_list = bytes_to_num(resp.d.asBytes + 16, 8);\r
- nr = bytes_to_num(resp.d.asBytes + 24, 4);\r
+ nr = (uint32_t)bytes_to_num(resp.d.asBytes + 24, 4);\r
+ ar = (uint32_t)bytes_to_num(resp.d.asBytes + 28, 4);\r
break;\r
}\r
}\r
\r
if (par_list == 0 && c.arg[0] == true) {\r
PrintAndLog("Parity is all zero. Most likely this card sends NACK on every failed authentication.");\r
break;\r
}\r
}\r
\r
if (par_list == 0 && c.arg[0] == true) {\r
PrintAndLog("Parity is all zero. Most likely this card sends NACK on every failed authentication.");\r
- keycount = nonce2key(uid, nt, nr, par_list, ks_list, &keylist);\r
+ keycount = nonce2key(uid, nt, nr, ar, par_list, ks_list, &keylist);\r