This commit is contained in:
micki.held@gmx.de 2013-07-08 17:56:05 +00:00
commit 1c611bbd26
9 changed files with 376 additions and 409 deletions

View file

@ -17,12 +17,12 @@
#include "nonce2key.h"
#include "ui.h"
int nonce2key(uint32_t uid, uint32_t nt, uint64_t par_info, uint64_t ks_info, uint64_t * key) {
int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key) {
struct Crypto1State *state, *state_s;
uint32_t pos, nr, rr, nr_diff;//, ks1, ks2;
uint32_t pos, rr, nr_diff;//, ks1, ks2;
byte_t bt, i, ks3x[8], par[8][8];
uint64_t key_recovered;
nr = rr = 0;
rr = 0;
// Reset the last three significant bits of the reader nonce
nr &= 0xffffff1f;

View file

@ -18,6 +18,6 @@
#include "crapto1.h"
#include "common.h"
int nonce2key(uint32_t uid, uint32_t nt, uint64_t par_info, uint64_t ks_info, uint64_t * key);
int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key);
#endif