github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 12:59:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade crapto1 library to v3.3 (#232)

Browse source 
- fix standalone tools mfkey32, mfkey64 and nonce2key to use common crapto1 library
- fix compiler warnings in tools/mfkey/mfkey64.c and tools/nonce2key/nonce2key.c
- allow crapto1.c to compile on ARM hosts
- add @iceman1001's readme.txt to tools/mfkey
This commit is contained in:
pwpiwi 2017-03-12 15:05:54 +01:00 • committed by GitHub
commit 0ca9bc0e99
10 changed files with 150 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/Makefile
View file

@ -9,7 +9,7 @@ include ../common/Makefile.common
CC=gcc CC=gcc
CXX=g++ CXX=g++
#COMMON_FLAGS = -m32 #COMMON_FLAGS = -m32
VPATH = ../common ../zlib ../tools VPATH = ../common ../zlib
OBJDIR = obj OBJDIR = obj
LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm

18
client/nonce2key/nonce2key.c
View file

@ -73,7 +73,7 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
} }
if (par_info == 0) if (par_info == 0)
PrintAndLog("parity is all zero,try special attack!just wait for few more seconds..."); PrintAndLog("Parity is all zero, trying special attack! Just wait for few more seconds...");
state = lfsr_common_prefix(nr, rr, ks3x, par); state = lfsr_common_prefix(nr, rr, ks3x, par);
state_s = (int64_t*)state; state_s = (int64_t*)state;
@ -82,7 +82,7 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
//sprintf(filename, "nt_%08x_%d.txt", nt, nr); //sprintf(filename, "nt_%08x_%d.txt", nt, nr);
//printf("name %s\n", filename); //printf("name %s\n", filename);
//FILE* fp = fopen(filename,"w"); //FILE* fp = fopen(filename,"w");
for (i = 0; (state) && ((state + i)->odd != -1); i++) for (i = 0; (state) && *(state_s + i); i++)
{ {
lfsr_rollback_word(state+i, uid^nt, 0); lfsr_rollback_word(state+i, uid^nt, 0);
crypto1_get_lfsr(state + i, &key_recovered); crypto1_get_lfsr(state + i, &key_recovered);
@ -98,9 +98,8 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
*(state_s + i) = -1; *(state_s + i) = -1;
//Create the intersection: //Create the intersection:
if (par_info == 0 ) if (par_info == 0 ) {
if ( last_keylist != NULL) if (last_keylist != NULL) {
{
int64_t *p1, *p2, *p3; int64_t *p1, *p2, *p3;
p1 = p3 = last_keylist; p1 = p3 = last_keylist;
p2 = state_s; p2 = state_s;
@ -115,12 +114,11 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
while (compar_state(p1, p2) == 1) ++p2; while (compar_state(p1, p2) == 1) ++p2;
} }
} }
key_count = p3 - last_keylist;; key_count = p3 - last_keylist;
} } else {
else
key_count = 0; key_count = 0;
else }
{ } else {
last_keylist = state_s; last_keylist = state_s;
key_count = i; key_count = i;
} }

221
common/crapto1/crapto1.c
View file

@ -15,11 +15,10 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, US$ Boston, MA 02110-1301, US$
Copyright (C) 2008-2008 bla <blapost@gmail.com> Copyright (C) 2008-2014 bla <blapost@gmail.com>
*/ */
#include "crapto1.h" #include "crapto1.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h>
#if !defined LOWMEM && defined __GNUC__ #if !defined LOWMEM && defined __GNUC__
static uint8_t filterlut[1 << 20]; static uint8_t filterlut[1 << 20];
@ -95,12 +94,10 @@ static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
bucket_info->numbuckets = nonempty_bucket; bucket_info->numbuckets = nonempty_bucket;
} }
} }
/** binsearch /** binsearch
* Binary search for the first occurence of *stop's MSB in sorted [start,stop] * Binary search for the first occurence of *stop's MSB in sorted [start,stop]
*/ */
static inline uint32_t* static inline uint32_t* binsearch(uint32_t *start, uint32_t *stop)
binsearch(uint32_t *start, uint32_t *stop)
{ {
uint32_t mid, val = *stop & 0xff000000; uint32_t mid, val = *stop & 0xff000000;
while(start != stop) while(start != stop)
@ -132,41 +129,34 @@ static inline void
extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in) extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
{ {
in <<= 24; in <<= 24;
for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
for(uint32_t *p = tbl; p <= *end; p++) { if(filter(*tbl) ^ filter(*tbl | 1)) {
*p <<= 1; *tbl |= filter(*tbl) ^ bit;
if(filter(*p) != filter(*p | 1)) { // replace update_contribution(tbl, m1, m2);
*p |= filter(*p) ^ bit; *tbl ^= in;
update_contribution(p, m1, m2); } else if(filter(*tbl) == bit) {
*p ^= in; *++*end = tbl[1];
} else if(filter(*p) == bit) { // insert tbl[1] = tbl[0] | 1;
*++*end = p[1]; update_contribution(tbl, m1, m2);
p[1] = p[0] | 1; *tbl++ ^= in;
update_contribution(p, m1, m2); update_contribution(tbl, m1, m2);
*p++ ^= in; *tbl ^= in;
update_contribution(p, m1, m2); } else
*p ^= in; *tbl-- = *(*end)--;
} else { // drop
*p-- = *(*end)--;
} }
}
}
/** extend_table_simple /** extend_table_simple
* using a bit of the keystream extend the table of possible lfsr states * using a bit of the keystream extend the table of possible lfsr states
*/ */
static inline void static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
{ {
for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
if(filter(*tbl) ^ filter(*tbl | 1)) { // replace if(filter(*tbl) ^ filter(*tbl | 1))
*tbl |= filter(*tbl) ^ bit; *tbl |= filter(*tbl) ^ bit;
} else if(filter(*tbl) == bit) { // insert else if(filter(*tbl) == bit) {
*++*end = *++tbl; *++*end = *++tbl;
*tbl = tbl[-1] | 1; *tbl = tbl[-1] | 1;
} else // drop
} else
*tbl-- = *(*end)--; *tbl-- = *(*end)--;
} }
@ -179,7 +169,7 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem, uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
struct Crypto1State *sl, uint32_t in, bucket_array_t bucket) struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
{ {
uint32_t *o, *e; uint32_t *o, *e, i;
bucket_info_t bucket_info; bucket_info_t bucket_info;
if(rem == -1) { if(rem == -1) {
@ -188,24 +178,26 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
for(o = o_head; o <= o_tail; ++o, ++sl) { for(o = o_head; o <= o_tail; ++o, ++sl) {
sl->even = *o; sl->even = *o;
sl->odd = *e ^ parity(*o & LF_POLY_ODD); sl->odd = *e ^ parity(*o & LF_POLY_ODD);
sl[1].odd = sl[1].even = 0;
} }
} }
sl->odd = sl->even = 0;
return sl; return sl;
} }
for(uint32_t i = 0; i < 4 && rem--; i++) { for(i = 0; i < 4 && rem--; i++) {
extend_table(o_head, &o_tail, (oks >>= 1) & 1, oks >>= 1;
LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0); eks >>= 1;
in >>= 2;
extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1,
LF_POLY_ODD << 1, 0);
if(o_head > o_tail) if(o_head > o_tail)
return sl; return sl;
extend_table(e_head, &e_tail, (eks >>= 1) & 1, extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD,
LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, (in >>= 2) & 3); LF_POLY_EVEN << 1 | 1, in & 3);
if(e_head > e_tail) if(e_head > e_tail)
return sl; return sl;
} }
bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket); bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);
for (int i = bucket_info.numbuckets - 1; i >= 0; i--) { for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {
@ -228,7 +220,6 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
uint32_t *even_head = 0, *even_tail = 0, eks = 0; uint32_t *even_head = 0, *even_tail = 0, eks = 0;
int i; int i;
// split the keystream into an odd and even part
for(i = 31; i >= 0; i -= 2) for(i = 31; i >= 0; i -= 2)
oks = oks << 1 | BEBIT(ks2, i); oks = oks << 1 | BEBIT(ks2, i);
for(i = 30; i >= 0; i -= 2) for(i = 30; i >= 0; i -= 2)
@ -238,6 +229,8 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
even_head = even_tail = malloc(sizeof(uint32_t) << 21); even_head = even_tail = malloc(sizeof(uint32_t) << 21);
statelist = malloc(sizeof(struct Crypto1State) << 18); statelist = malloc(sizeof(struct Crypto1State) << 18);
if(!odd_tail-- || !even_tail-- || !statelist) { if(!odd_tail-- || !even_tail-- || !statelist) {
free(statelist);
statelist = 0;
goto out; goto out;
} }
statelist->odd = statelist->even = 0; statelist->odd = statelist->even = 0;
@ -253,7 +246,6 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
} }
// initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
for(i = 1 << 20; i >= 0; --i) { for(i = 1 << 20; i >= 0; --i) {
if(filter(i) == (oks & 1)) if(filter(i) == (oks & 1))
*++odd_tail = i; *++odd_tail = i;
@ -261,22 +253,15 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
*++even_tail = i; *++even_tail = i;
} }
// extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
for(i = 0; i < 4; i++) { for(i = 0; i < 4; i++) {
extend_table_simple(odd_head, &odd_tail, (oks >>= 1) & 1); extend_table_simple(odd_head, &odd_tail, (oks >>= 1) & 1);
extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1); extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
} }
// the statelists now contain all states which could have generated the last 10 Bits of the keystream. in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00);
// 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"
// parameter into account.
in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00); // Byte swapping
recover(odd_head, odd_tail, oks, recover(odd_head, odd_tail, oks,
even_head, even_tail, eks, 11, statelist, in << 1, bucket); even_head, even_tail, eks, 11, statelist, in << 1, bucket);
out: out:
free(odd_head); free(odd_head);
free(even_head); free(even_head);
@ -324,12 +309,12 @@ struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
sl->odd = sl->even = 0; sl->odd = sl->even = 0;
for(i = 30; i >= 0; i -= 2) { for(i = 30; i >= 0; i -= 2) {
oks[i >> 1] = BIT(ks2, i ^ 24); oks[i >> 1] = BEBIT(ks2, i);
oks[16 + (i >> 1)] = BIT(ks3, i ^ 24); oks[16 + (i >> 1)] = BEBIT(ks3, i);
} }
for(i = 31; i >= 0; i -= 2) { for(i = 31; i >= 0; i -= 2) {
eks[i >> 1] = BIT(ks2, i ^ 24); eks[i >> 1] = BEBIT(ks2, i);
eks[16 + (i >> 1)] = BIT(ks3, i ^ 24); eks[16 + (i >> 1)] = BEBIT(ks3, i);
} }
for(i = 0xfffff; i >= 0; --i) { for(i = 0xfffff; i >= 0; --i) {
@ -380,41 +365,44 @@ struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
/** lfsr_rollback_bit /** lfsr_rollback_bit
* Rollback the shift register in order to get previous states * Rollback the shift register in order to get previous states
*/ */
void lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb) uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
{ {
int out; int out;
uint32_t tmp; uint8_t ret;
uint32_t t;
s->odd &= 0xffffff; s->odd &= 0xffffff;
tmp = s->odd; t = s->odd, s->odd = s->even, s->even = t;
s->odd = s->even;
s->even = tmp;
out = s->even & 1; out = s->even & 1;
out ^= LF_POLY_EVEN & (s->even >>= 1); out ^= LF_POLY_EVEN & (s->even >>= 1);
out ^= LF_POLY_ODD & s->odd; out ^= LF_POLY_ODD & s->odd;
out ^= !!in; out ^= !!in;
out ^= filter(s->odd) & !!fb; out ^= (ret = filter(s->odd)) & !!fb;
s->even |= parity(out) << 23; s->even |= parity(out) << 23;
return ret;
} }
/** lfsr_rollback_byte /** lfsr_rollback_byte
* Rollback the shift register in order to get previous states * Rollback the shift register in order to get previous states
*/ */
void lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb) uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
{ {
int i; int i, ret=0;
for (i = 7; i >= 0; --i) for (i = 7; i >= 0; --i)
lfsr_rollback_bit(s, BEBIT(in, i), fb); ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
return ret;
} }
/** lfsr_rollback_word /** lfsr_rollback_word
* Rollback the shift register in order to get previous states * Rollback the shift register in order to get previous states
*/ */
void lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb) uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
{ {
int i; int i;
uint32_t ret = 0;
for (i = 31; i >= 0; --i) for (i = 31; i >= 0; --i)
lfsr_rollback_bit(s, BEBIT(in, i), fb); ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
return ret;
} }
/** nonce_distance /** nonce_distance
@ -440,112 +428,86 @@ int nonce_distance(uint32_t from, uint32_t to)
static uint32_t fastfwd[2][8] = { static uint32_t fastfwd[2][8] = {
{ 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB}, { 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
{ 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}}; { 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
/** lfsr_prefix_ks /** lfsr_prefix_ks
* *
* Is an exported helper function from the common prefix attack * Is an exported helper function from the common prefix attack
* Described in the "dark side" paper. It returns an -1 terminated array * Described in the "dark side" paper. It returns an -1 terminated array
* of possible partial(21 bit) secret state. * of possible partial(21 bit) secret state.
* The required keystream(ks) needs to contain the keystream that was used to * The required keystream(ks) needs to contain the keystream that was used to
* encrypt the NACK which is observed when varying only the 4 last bits of Nr * encrypt the NACK which is observed when varying only the 3 last bits of Nr
* only correct iff [NR_3] ^ NR_3 does not depend on Nr_3 * only correct iff [NR_3] ^ NR_3 does not depend on Nr_3
*/ */
uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd) uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
{ {
uint32_t *candidates = malloc(4 << 21); uint32_t c, entry, *candidates = malloc(4 << 10);
uint32_t c, entry; int i, size = 0, good;
int size, i;
if(!candidates) if(!candidates)
return 0; return 0;
size = (1 << 21) - 1; for(i = 0; i < 1 << 21; ++i) {
for(i = 0; i <= size; ++i) for(c = 0, good = 1; good && c < 8; ++c) {
candidates[i] = i; entry = i ^ fastfwd[isodd][c];
good &= (BIT(ks[c], isodd) == filter(entry >> 1));
for(c = 0; c < 8; ++c) good &= (BIT(ks[c], isodd + 2) == filter(entry));
for(i = 0;i <= size; ++i) { }
entry = candidates[i] ^ fastfwd[isodd][c]; if(good)
candidates[size++] = i;
if(filter(entry >> 1) == BIT(ks[c], isodd))
if(filter(entry) == BIT(ks[c], isodd + 2))
continue;
candidates[i--] = candidates[size--];
} }
candidates[size + 1] = -1; candidates[size] = -1;
return candidates; return candidates;
} }
/** brute_top /** check_pfx_parity
* helper function which eliminates possible secret states using parity bits * helper function which eliminates possible secret states using parity bits
*/ */
static struct Crypto1State* static struct Crypto1State*
brute_top(uint32_t prefix, uint32_t rresp, unsigned char parities[8][8], check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8],
uint32_t odd, uint32_t even, struct Crypto1State* sl) uint32_t odd, uint32_t even, struct Crypto1State* sl)
{ {
struct Crypto1State s; uint32_t ks1, nr, ks2, rr, ks3, c, good = 1, no_par = 1;
uint32_t ks1, nr, ks2, rr, ks3, good, c;
bool no_par = true;
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
for (int j = 0; j < 8; j++) { for (int j = 0; j < 8; j++) {
if (parities[i][j] != 0) { if (parities[i][j] != 0) {
no_par = false; no_par = 0;
break; break;
} }
} }
} }
for(c = 0; c < 8; ++c) { for(c = 0; good && c < 8; ++c) {
s.odd = odd ^ fastfwd[1][c]; sl->odd = odd ^ fastfwd[1][c];
s.even = even ^ fastfwd[0][c]; sl->even = even ^ fastfwd[0][c];
lfsr_rollback_bit(&s, 0, 0); lfsr_rollback_bit(sl, 0, 0);
lfsr_rollback_bit(&s, 0, 0); lfsr_rollback_bit(sl, 0, 0);
lfsr_rollback_bit(&s, 0, 0);
lfsr_rollback_word(&s, 0, 0); ks3 = lfsr_rollback_bit(sl, 0, 0);
lfsr_rollback_word(&s, prefix | c << 5, 1); ks2 = lfsr_rollback_word(sl, 0, 0);
ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
sl->odd = s.odd;
sl->even = s.even;
if (no_par) if (no_par)
break; break;
ks1 = crypto1_word(&s, prefix | c << 5, 1);
ks2 = crypto1_word(&s,0,0);
ks3 = crypto1_word(&s, 0,0);
nr = ks1 ^ (prefix | c << 5); nr = ks1 ^ (prefix | c << 5);
rr = ks2 ^ rresp; rr = ks2 ^ rresp;
good = 1;
good &= parity(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24); good &= parity(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
good &= parity(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16); good &= parity(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
good &= parity(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2, 8); good &= parity(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2, 8);
good &= parity(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2, 0); good &= parity(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2, 0);
good &= parity(rr & 0x000000ff) ^ parities[c][7] ^ BIT(ks3, 24); good &= parity(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
if(!good)
return sl;
} }
return ++sl; return sl + good;
} }
/** lfsr_common_prefix /** lfsr_common_prefix
* Implentation of the common prefix attack. * Implentation of the common prefix attack.
* Requires the 28 bit constant prefix used as reader nonce (pfx)
* The reader response used (rr)
* The keystream used to encrypt the observed NACK's (ks)
* The parity bits (par)
* It returns a zero terminated list of possible cipher states after the
* tag nonce was fed in
*/ */
struct Crypto1State* struct Crypto1State*
lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]) lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
@ -556,29 +518,24 @@ lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
odd = lfsr_prefix_ks(ks, 1); odd = lfsr_prefix_ks(ks, 1);
even = lfsr_prefix_ks(ks, 0); even = lfsr_prefix_ks(ks, 0);
statelist = malloc((sizeof *statelist) << 21); //how large should be? s = statelist = malloc((sizeof *statelist) << 20);
if(!statelist || !odd || !even) if(!s || !odd || !even) {
{
free(statelist); free(statelist);
free(odd); statelist = 0;
free(even); goto out;
return 0;
} }
s = statelist; for(o = odd; *o + 1; ++o)
for(o = odd; *o != -1; ++o) for(e = even; *e + 1; ++e)
for(e = even; *e != -1; ++e)
for(top = 0; top < 64; ++top) { for(top = 0; top < 64; ++top) {
*o = (*o & 0x1fffff) | (top << 21); *o += 1 << 21;
*e = (*e & 0x1fffff) | (top >> 3) << 21; *e += (!(top & 7) + 1) << 21;
s = brute_top(pfx, rr, par, *o, *e, s); s = check_pfx_parity(pfx, rr, par, *o, *e, s);
} }
s->odd = s->even = -1; s->odd = s->even = 0;
//printf("state count = %d\n",s-statelist); out:
free(odd); free(odd);
free(even); free(even);
return statelist; return statelist;
} }

8
common/crapto1/crapto1.h
View file

@ -15,7 +15,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, US$ MA 02110-1301, US$
Copyright (C) 2008-2008 bla <blapost@gmail.com> Copyright (C) 2008-2014 bla <blapost@gmail.com>
*/ */
#ifndef CRAPTO1_INCLUDED #ifndef CRAPTO1_INCLUDED
#define CRAPTO1_INCLUDED #define CRAPTO1_INCLUDED
@ -44,9 +44,9 @@ struct Crypto1State*
lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]); lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]);
void lfsr_rollback_bit(struct Crypto1State* s, uint32_t in, int fb); uint8_t lfsr_rollback_bit(struct Crypto1State* s, uint32_t in, int fb);
void lfsr_rollback_byte(struct Crypto1State* s, uint32_t in, int fb); uint8_t lfsr_rollback_byte(struct Crypto1State* s, uint32_t in, int fb);
void lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb); uint32_t lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb);
int nonce_distance(uint32_t from, uint32_t to); int nonce_distance(uint32_t from, uint32_t to);
#define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\ #define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\
uint32_t __n = 0,__M = 0, N = 0;\ uint32_t __n = 0,__M = 0, N = 0;\

34
common/crapto1/crypto1.c
View file

@ -23,33 +23,34 @@
#define SWAPENDIAN(x)\ #define SWAPENDIAN(x)\
(x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16) (x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
#if defined(__arm__) #if defined(__arm__) && !defined(__linux__) && !defined(_WIN32) // bare metal ARM lacks malloc()/free()
void crypto1_create(struct Crypto1State *s, uint64_t key) void crypto1_create(struct Crypto1State *s, uint64_t key)
{ {
#else
struct Crypto1State * crypto1_create(uint64_t key)
{
struct Crypto1State *s = malloc(sizeof(*s));
#endif
int i; int i;
for(i = 47;s && i > 0; i -= 2) { for(i = 47;s && i > 0; i -= 2) {
s->odd = s->odd << 1 | BIT(key, (i - 1) ^ 7); s->odd = s->odd << 1 | BIT(key, (i - 1) ^ 7);
s->even = s->even << 1 | BIT(key, i ^ 7); s->even = s->even << 1 | BIT(key, i ^ 7);
} }
#if defined(__arm__)
return; return;
#else
return s;
#endif
} }
#if defined(__arm__)
void crypto1_destroy(struct Crypto1State *state) void crypto1_destroy(struct Crypto1State *state)
{ {
state->odd = 0; state->odd = 0;
state->even = 0; state->even = 0;
} }
#else #else
struct Crypto1State * crypto1_create(uint64_t key)
{
struct Crypto1State *s = malloc(sizeof(*s));
int i;
for(i = 47;s && i > 0; i -= 2) {
s->odd = s->odd << 1 | BIT(key, (i - 1) ^ 7);
s->even = s->even << 1 | BIT(key, i ^ 7);
}
return s;
}
void crypto1_destroy(struct Crypto1State *state) void crypto1_destroy(struct Crypto1State *state)
{ {
free(state); free(state);
@ -65,8 +66,7 @@ void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr)
} }
uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted) uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
{ {
uint32_t feedin; uint32_t feedin, t;
uint32_t tmp;
uint8_t ret = filter(s->odd); uint8_t ret = filter(s->odd);
feedin = ret & !!is_encrypted; feedin = ret & !!is_encrypted;
@ -75,9 +75,7 @@ uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
feedin ^= LF_POLY_EVEN & s->even; feedin ^= LF_POLY_EVEN & s->even;
s->even = s->even << 1 | parity(feedin); s->even = s->even << 1 | parity(feedin);
tmp = s->odd; t = s->odd, s->odd = s->even, s->even = t;
s->odd = s->even;
s->even = tmp;
return ret; return ret;
} }
@ -94,8 +92,8 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
{ {
uint32_t i, ret = 0; uint32_t i, ret = 0;
for (i = 0; i < 4; ++i, in <<= 8) for (i = 0; i < 32; ++i)
ret = ret << 8 | crypto1_byte(s, in >> 24, is_encrypted); ret |= crypto1_bit(s, BEBIT(in, i), is_encrypted) << (i ^ 24);
return ret; return ret;
} }

21
tools/mfkey/Makefile
View file

@ -1,17 +1,20 @@
VPATH = ../../common/crapto1
CC = gcc CC = gcc
LD = gcc LD = gcc
CFLAGS = -Wall -Winline -O4 CFLAGS = -I../../common -Wall -O4
LDFLAGS = LDFLAGS =
OBJS = crapto1.o crypto1.o OBJS = crypto1.o crapto1.o
HEADERS = EXES = mfkey32 mfkey64
EXES = mfkey64 mfkey32 WINEXES = $(patsubst %, %.exe, $(EXES))
LIBS =
all: $(OBJS) $(EXES) $(LIBS) all: $(OBJS) $(EXES)
% : %.c $(OBJS) %.o : %.c
$(LD) $(CFLAGS) -o $@ $< $(OBJS) $(LDFLAGS) $(CC) $(CFLAGS) -c -o $@ $<
% : %.c
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $<
clean: clean:
rm -f $(OBJS) $(EXES) $(LIBS) rm -f $(OBJS) $(EXES) $(WINEXES)

2
tools/mfkey/mfkey32.c
View file

@ -1,5 +1,5 @@
#include <inttypes.h> #include <inttypes.h>
#include "crapto1.h" #include "crapto1/crapto1.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

4
tools/mfkey/mfkey64.c
View file

@ -1,5 +1,5 @@
#include <inttypes.h> #include <inttypes.h>
#include "crapto1.h" #include "crapto1/crapto1.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -34,7 +34,7 @@ int main (int argc, char *argv[]) {
for (int i = 0; i < encc; i++) { for (int i = 0; i < encc; i++) {
enclen[i] = strlen(argv[i + 6]) / 2; enclen[i] = strlen(argv[i + 6]) / 2;
for (int i2 = 0; i2 < enclen[i]; i2++) { for (int i2 = 0; i2 < enclen[i]; i2++) {
sscanf(argv[i+6] + i2*2,"%2x", (uint8_t*)&enc[i][i2]); sscanf(argv[i+6] + i2*2,"%2x", (unsigned int *)&enc[i][i2]);
} }
} }
printf("Recovering key for:\n"); printf("Recovering key for:\n");

13
tools/nonce2key/Makefile
View file

@ -1,22 +1,21 @@
VPATH = ../../common/crapto1
CC = gcc CC = gcc
LD = gcc LD = gcc
CFLAGS = -Wall -O4 -c CFLAGS = -I../../common -Wall -O4
LDFLAGS = LDFLAGS =
OBJS = crypto1.o crapto1.o OBJS = crypto1.o crapto1.o
HEADERS = crapto1.h HEADERS = crapto1.h
EXES = nonce2key EXES = nonce2key
WINEXES = $(patsubst %, %.exe, $(EXES))
all: $(OBJS) $(EXES) all: $(OBJS) $(EXES)
%.o : %.c %.o : %.c
$(CC) $(CFLAGS) -o $@ $< $(CC) $(CFLAGS) -c -o $@ $<
% : %.c % : %.c
$(LD) $(LDFLAGS) -o $@ $(OBJS) $< $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $<
crypto1test: libnfc $(OBJS)
$(LD) $(LDFLAGS) -o crypto1test crypto1test.c $(OBJS)
clean: clean:
rm -f $(OBJS) $(EXES) rm -f $(OBJS) $(EXES) $(WINEXES)

6
tools/nonce2key/nonce2key.c
View file

@ -1,13 +1,13 @@
#include "crapto1.h" #include "crapto1/crapto1.h"
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
typedef unsigned char byte_t; typedef unsigned char byte_t;
int main(const int argc, const char* argv[]) { int main(const int argc, const char* argv[]) {
struct Crypto1State *state; struct Crypto1State *state;
uint32_t pos, uid, nt, nr, rr, nr_diff, ks1, ks2; uint32_t pos, uid, nt, nr, rr, nr_diff;
byte_t bt, i, ks3x[8], par[8][8]; byte_t bt, i, ks3x[8], par[8][8];
uint64_t key, key_recovered; uint64_t key_recovered;
uint64_t par_info; uint64_t par_info;
uint64_t ks_info; uint64_t ks_info;
nr = rr = 0; nr = rr = 0;