X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/d9ed4e191445d342d11e35fbe4886980e40771a8..62577a62ae4726ed57a8d6d1e65ce8c1a2c77211:/client/mifarehost.c diff --git a/client/mifarehost.c b/client/mifarehost.c index 97e53f1e..b41c3687 100644 --- a/client/mifarehost.c +++ b/client/mifarehost.c @@ -125,8 +125,8 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo p4->even = 0; p4->odd = 0; statelists[0].len = p3 - statelists[0].head.slhead; statelists[1].len = p4 - statelists[1].head.slhead; - statelists[0].tail.sltail=--p3; - statelists[1].tail.sltail=--p4; + statelists[0].tail.sltail = --p3; + statelists[1].tail.sltail = --p4; // the statelists now contain possible keys. The key we are searching for must be in the // intersection of both lists. Create the intersection: @@ -654,12 +654,12 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){ PrintAndLog("\nEncrypted data: [%s]", sprint_hex(data, len) ); - struct Crypto1State *pcs = NULL; + struct Crypto1State *s; ks2 = ar_enc ^ prng_successor(nt, 64); ks3 = at_enc ^ prng_successor(nt, 96); - pcs = lfsr_recovery64(ks2, ks3); - mf_crypto1_decrypt(pcs, data, len, FALSE); + s = lfsr_recovery64(ks2, ks3); + mf_crypto1_decrypt(s, data, len, FALSE); PrintAndLog("Decrypted data: [%s]", sprint_hex(data, len) ); - crypto1_destroy(pcs); + crypto1_destroy(s); return 0; }