depau/mfoc-always-skip-probes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor fixes/enhancements and version bumping

Browse source
This commit is contained in:
Romuald Conty 2011-04-04 12:28:11 +00:00
parent 4d1ce73772
commit e076683dea
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -1,4 +1,4 @@
AC_INIT([mfoc], [0.10], [mifare@nethemba.com]) AC_INIT([mfoc], [0.10.1], [mifare@nethemba.com])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@ -13,7 +13,7 @@ AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
# Checks for pkg-config modules. # Checks for pkg-config modules.
LIBNFC_REQUIRED_VERSION=1.4.0 LIBNFC_REQUIRED_VERSION=1.4.2
PKG_CHECK_MODULES([LIBNFC], [libnfc >= $LIBNFC_REQUIRED_VERSION], [], [AC_MSG_ERROR([libnfc >= $LIBNFC_REQUIRED_VERSION is mandatory.])]) PKG_CHECK_MODULES([LIBNFC], [libnfc >= $LIBNFC_REQUIRED_VERSION], [], [AC_MSG_ERROR([libnfc >= $LIBNFC_REQUIRED_VERSION is mandatory.])])
PKG_CONFIG_REQUIRES="libnfc" PKG_CONFIG_REQUIRES="libnfc"

9
src/mfoc.c
View file

@ -1,6 +1,6 @@
/* /*
Mifare Classic Offline Cracker version 0.08 Mifare Classic Offline Cracker
Requirements: crapto1 library http://code.google.com/p/crapto1 Requirements: crapto1 library http://code.google.com/p/crapto1
libnfc http://www.libnfc.org libnfc http://www.libnfc.org
@ -22,6 +22,7 @@
Porting to libnfc 1.3.3: Michal Boska <boska.michal@gmail.com> Porting to libnfc 1.3.3: Michal Boska <boska.michal@gmail.com>
Porting to libnfc 1.3.9: Romuald Conty <romuald@libnfc.org> Porting to libnfc 1.3.9: Romuald Conty <romuald@libnfc.org>
Porting to libnfc 1.4.x: Romuald Conty <romuald@libnfc.org>
URL http://eprint.iacr.org/2009/137.pdf URL http://eprint.iacr.org/2009/137.pdf
URL http://www.sos.cs.ru.nl/applications/rfid/2008-esorics.pdf URL http://www.sos.cs.ru.nl/applications/rfid/2008-esorics.pdf
@ -488,7 +489,7 @@ void mf_init(mftag *t, mfreader *r) {
// Connect to the first NFC device // Connect to the first NFC device
r->pdi = nfc_connect(NULL); r->pdi = nfc_connect(NULL);
if (!r->pdi) { if (!r->pdi) {
ERR ("Unable to connection to NFC device\n"); ERR ("Unable to connect to NFC device\n");
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
} }
@ -513,7 +514,7 @@ void mf_select_tag(nfc_device_t* pdi, nfc_target_t* pnt) {
.nbr = NBR_106, .nbr = NBR_106,
}; };
if (!nfc_initiator_select_passive_target(pdi, nm, NULL, 0, pnt)) { if (!nfc_initiator_select_passive_target(pdi, nm, NULL, 0, pnt)) {
ERR ("!Error connecting to the MIFARE Classic tag"); ERR ("Unable to connect to the MIFARE Classic tag");
nfc_disconnect(pdi); nfc_disconnect(pdi);
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
@ -741,7 +742,7 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
AuthEncPar[i] = filter(pcs->odd) ^ oddparity(Auth[i]); AuthEncPar[i] = filter(pcs->odd) ^ oddparity(Auth[i]);
} }
if (!nfc_initiator_transceive_bits(r.pdi, AuthEnc, 32, AuthEncPar,Rx, &RxLen, RxPar)) { if (!nfc_initiator_transceive_bits(r.pdi, AuthEnc, 32, AuthEncPar,Rx, &RxLen, RxPar)) {
fprintf(stdout, "Error requesting encrypted tag-nonce\n"); ERR ("while requesting encrypted tag-nonce");
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }