github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-30 03:28:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

move ks to authdata

Browse source
This commit is contained in:
Oleg Moiseenko 2018-02-11 00:40:24 +02:00
parent 7bea15816e
commit e01bc7942c
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/cmdhflist.c
View file

@ -43,6 +43,8 @@ void ClearAuthData() {
AuthData.uid = 0; AuthData.uid = 0;
AuthData.nt = 0; AuthData.nt = 0;
AuthData.first_auth = true; AuthData.first_auth = true;
AuthData.ks2 = 0;
AuthData.ks3 = 0;
} }
/** /**
@ -266,9 +268,9 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, bool isResponse, uint8_t *m
if (MifareAuthState == masFirstData) { if (MifareAuthState == masFirstData) {
if (AuthData.first_auth) { if (AuthData.first_auth) {
uint32_t ks2 = AuthData.ar_enc ^ prng_successor(AuthData.nt, 64); AuthData.ks2 = AuthData.ar_enc ^ prng_successor(AuthData.nt, 64);
uint32_t ks3 = AuthData.at_enc ^ prng_successor(AuthData.nt, 96); AuthData.ks3 = AuthData.at_enc ^ prng_successor(AuthData.nt, 96);
struct Crypto1State *revstate = lfsr_recovery64(ks2, ks3); struct Crypto1State *revstate = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
lfsr_rollback_word(revstate, 0, 0); lfsr_rollback_word(revstate, 0, 0);
lfsr_rollback_word(revstate, 0, 0); lfsr_rollback_word(revstate, 0, 0);
lfsr_rollback_word(revstate, AuthData.nr_enc, 1); lfsr_rollback_word(revstate, AuthData.nr_enc, 1);
@ -281,12 +283,12 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, bool isResponse, uint8_t *m
PrintAndLog(" | * | key | probable key:%x%x Prng:%s ks2:%08x ks3:%08x | |", PrintAndLog(" | * | key | probable key:%x%x Prng:%s ks2:%08x ks3:%08x | |",
(unsigned int)((lfsr & 0xFFFFFFFF00000000) >> 32), (unsigned int)(lfsr & 0xFFFFFFFF), (unsigned int)((lfsr & 0xFFFFFFFF00000000) >> 32), (unsigned int)(lfsr & 0xFFFFFFFF),
validate_prng_nonce(AuthData.nt) ? "WEAK": "HARD", validate_prng_nonce(AuthData.nt) ? "WEAK": "HARD",
ks2, AuthData.ks2,
ks3); AuthData.ks3);
AuthData.first_auth = false; AuthData.first_auth = false;
traceCrypto1 = lfsr_recovery64(ks2, ks3); traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
} else { } else {
printf("uid:%x nt:%x ar_enc:%x at_enc:%x\n", AuthData.uid, AuthData.nt, AuthData.ar_enc, AuthData.at_enc); printf("uid:%x nt:%x ar_enc:%x at_enc:%x\n", AuthData.uid, AuthData.nt, AuthData.ar_enc, AuthData.at_enc);
@ -321,7 +323,9 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, bool isResponse, uint8_t *m
crypto1_destroy(pcs); crypto1_destroy(pcs);
if (CheckCrc14443(CRC_14443_A, mfData, cmdsize)) { if (CheckCrc14443(CRC_14443_A, mfData, cmdsize)) {
traceCrypto1 = lfsr_recovery64(ks2, ks3); AuthData.ks2 = ks2;
AuthData.ks3 = ks3;
traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
break; break;
} }
} }

2
client/cmdhflist.h
View file

@ -25,6 +25,8 @@ typedef struct {
uint32_t at_enc; // encrypted tag response uint32_t at_enc; // encrypted tag response
uint8_t at_enc_par; // encrypted tag response parity uint8_t at_enc_par; // encrypted tag response parity
bool first_auth; // is first authentication bool first_auth; // is first authentication
uint32_t ks2; // ar ^ ar_enc
uint32_t ks3; // at ^ at_enc
} TAuthData; } TAuthData;
extern void ClearAuthData(); extern void ClearAuthData();