forked/mfcuk
1
0
Fork 0
mirror of https://github.com/nfc-tools/mfcuk.git synced 2026-03-02 05:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: forked:mfcuk-0.3.8
Branches Tags
forked:master forked:wiki
forked:mfcuk-0.3.8 forked:mfcuk-0.3.7 forked:windows
..
compare: forked:mfcuk-0.3.7
Branches Tags
forked:master forked:wiki
forked:mfcuk-0.3.8 forked:mfcuk-0.3.7 forked:windows

1 Commits
mfcuk-0.3. ... mfcuk-0.3.

Author SHA1 Message Date
romuald@libnfc.org
3842612224 TAG: mfcuk 0.3.7 2013-01-30 15:03:30 +00:00
5 changed files with 16 additions and 22 deletions
Expand all files Collapse all files

2
configure.ac
View File

@@ -1,4 +1,4 @@
AC_INIT([mfcuk], [0.3.8], [zveriu@gmail.com])
AC_INIT([mfcuk], [0.3.7], [zveriu@gmail.com])
AC_CONFIG_MACRO_DIR([m4])

3
src/crapto1.c
View File

@@ -311,6 +311,7 @@ continue2:
uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb);
uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb);
uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb);
uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd);
/** lfsr_rollback_bit
@@ -449,6 +450,8 @@ check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8],
}
struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]);
/** lfsr_common_prefix
* Implentation of the common prefix attack.
* Requires the 29 bit constant prefix used as reader nonce (pfx)

1
src/crapto1.h
View File

@@ -33,7 +33,6 @@ extern "C" {
uint32_t crypto1_word(struct Crypto1State *, uint32_t, int);
uint32_t prng_successor(uint32_t x, uint32_t n);
struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]);
struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in);
struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3);

18
src/nfc-utils.c
View File

@@ -1,13 +1,9 @@
/*-
* Free/Libre Near Field Communication (NFC) library
* Public platform independent Near Field Communication (NFC) library examples
*
* Libnfc historical contributors:
* Copyright (C) 2009 Roel Verdult
* Copyright (C) 2009-2013 Romuald Conty
* Copyright (C) 2010-2012 Romain Tartière
* Copyright (C) 2010-2013 Philippe Teuwen
* Copyright (C) 2012-2013 Ludovic Rousseau
* Additional contributors of this file:
* Copyright (C) 2009 Roel Verdult
* Copyright (C) 2010, 2011 Romain Tartière
* Copyright (C) 2009, 2010, 2011, 2012 Romuald Conty
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -119,10 +115,10 @@ print_hex_par(const uint8_t *pbtData, const size_t szBits, const uint8_t *pbtDat
}
void
print_nfc_target(const nfc_target *pnt, bool verbose)
print_nfc_target(const nfc_target nt, bool verbose)
{
char *s;
str_nfc_target(&s, pnt, verbose);
str_nfc_target(&s, nt, verbose);
printf("%s", s);
nfc_free(s);
free(s);
}

14
src/nfc-utils.h
View File

@@ -1,13 +1,9 @@
/*-
* Free/Libre Near Field Communication (NFC) library
* Public platform independent Near Field Communication (NFC) library examples
*
* Libnfc historical contributors:
* Copyright (C) 2009 Roel Verdult
* Copyright (C) 2009-2013 Romuald Conty
* Copyright (C) 2010-2012 Romain Tartière
* Copyright (C) 2010-2013 Philippe Teuwen
* Copyright (C) 2012-2013 Ludovic Rousseau
* Additional contributors of this file:
* Copyright (C) 2009 Roel Verdult
* Copyright (C) 2010 Romain Tartière
* Copyright (C) 2010, 2011, 2012 Romuald Conty
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -98,6 +94,6 @@ void print_hex(const uint8_t *pbtData, const size_t szLen);
void print_hex_bits(const uint8_t *pbtData, const size_t szBits);
void print_hex_par(const uint8_t *pbtData, const size_t szBits, const uint8_t *pbtDataPar);
void print_nfc_target(const nfc_target *pnt, bool verbose);
void print_nfc_target(const nfc_target nt, bool verbose);
#endif