Bump version to 0.10.7

This fixes a potential segfault when libnfc is not correctly initialized

.gitignore

@@ -0,0 +1,21 @@
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+config.h
+config.h.in
+config.log
+config.status
+configure
+depcomp
+install-sh
+missing
+src/*.lo
+src/*.o
+src/.deps/
+src/Makefile
+src/Makefile.in
+src/mfoc
+stamp-h1
+

AUTHORS

@@ -6,4 +6,4 @@ Pavol Luptak - project leader, minor coding, testing and bugreporting
 = Contributors
 
 Michal Boska <boska.michal@gmail.com> - porting to libnfc 1.3.3
-Romuald Conty <romuald@libnfc.org> - porting to libnfc 1.3.9
+Romuald Conty <romuald@libnfc.org> - porting to libnfc 1.3.9 and upper

ChangeLog

@@ -0,0 +1,243 @@
+2013-01-20  Romuald Conty <romuald@libnfc.org>
+
+	* ChangeLog: Update outdated email addresses
+
+2013-01-20  Romuald Conty <romuald@libnfc.org>
+
+	* src/crapto1.c, src/crapto1.h, src/crypto1.c, src/mfoc.c,
+	src/mfoc.h: Format source code with "make style"
+
+2013-01-20  Romuald Conty <romuald@libnfc.org>
+
+	* Makefile.am: Add "make style" directive to format source code
+
+2013-01-20  Romuald Conty <romuald@libnfc.org>
+
+	* configure.ac, src/mfoc.c: Updates source to use libnfc 1.7.0
+
+2013-01-20  Romuald Conty <romuald@libnfc.org>
+
+	* src/mifare.c, src/mifare.h, src/nfc-utils.c, src/nfc-utils.h: 
+	Update mifare.* and nfc-utils.* from libnfc utils directory
+
+2013-01-20  Romuald Conty <romuald@libnfc.org>
+
+	* .gitignore: Ignore generated files in source repository
+
+2012-10-14  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c: Fix tolerance (-T) option (Fixes issue 102) Thanks to
+	fnargwibble
+
+2012-06-03  Romuald Conty <romuald@libnfc.org>
+
+	* src/mifare.c: do not display an error when authentication failed
+
+2012-06-03  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c, src/mfoc.h: use authuid instead uid name when handling
+	the authentication uid bytes (different from UID with 7bytes MIFARE
+	Classic
+
+2012-06-03  Romuald Conty <romuald@libnfc.org>
+
+	* src/crapto1.h, src/mfoc.c, src/mfoc.h, src/mifare.c,
+	src/mifare.h, src/nfc-utils.c, src/nfc-utils.h: some code clean up:
+	find . -name '*.[ch]' | xargs perl -pi -e 's/\t+$//; s/ +$//'
+
+2012-06-02  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c, src/mifare.h: Allow to find default keys using 7bytes
+	UID MIFARE Classic tags
+
+2012-06-02  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c: Remove not requiered anticol and configuration, its
+	speed up default keys search
+
+2012-06-02  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c: Enhance default keys search result: '/', '\' and 'x'
+	means respectively A, B and both key(s) found.
+
+2012-06-01  Romuald Conty <romuald@libnfc.org>
+
+	* INSTALL, configure.ac, debian/control, src/Makefile.am,
+	src/crapto1.c, src/mfoc.c, src/mfoc.h, src/mifare.c: foc> source
+	 code maintenance: - upgrade to last libnfc devel API  - removes various warnings  - update debian package
+
+2012-05-28  Ludovic Rousseau <ludovic.rousseau@gmail.com>
+
+	* debian/watch: Update upstream URL Closes Issue #92
+
+2012-05-22  Ludovic Rousseau <ludovic.rousseau@gmail.com>
+
+	* debian/control: Upgrade libnfc-dev version in Build-Depends: Closes Issue #91
+
+2012-05-14  Romain Tartiere <romain.tartiere@gmail.com>
+
+	* src/crapto1.h: Export lfsr_rollback_word().
+
+2012-05-14  Romain Tartiere <romain.tartiere@gmail.com>
+
+	* src/mfoc.c, src/mfoc.h: Drop unused argument.
+
+2012-05-14  Romain Tartiere <romain.tartiere@gmail.com>
+
+	* src/mfoc.c, src/mfoc.h: Fix a bunch of signed/unsigned
+	comparisons.
+
+2012-05-14  Romain Tartiere <romain.tartiere@gmail.com>
+
+	* configure.ac: Complete configure.ac.
+
+2012-05-14  Romain Tartiere <romain.tartiere@gmail.com>
+
+	* src/Makefile.am: Rely on variables set by the autotools.
+
+2012-01-26  Audrey Diacre <adiacre@il4p.fr>
+
+	* src/mfoc.c, src/mfoc.h, src/mifare.c, src/mifare.h,
+	src/nfc-utils.c, src/nfc-utils.h: update to use libnfc's trunk
+
+2011-10-17  Romuald Conty <romuald@libnfc.org>
+
+	* configure.ac, src/Makefile.am: compilation improvements (Thanks to
+	Thomas Hood)
+
+2011-09-28  Romuald Conty <romuald@libnfc.org>
+
+	* configure.ac, src/mfoc.c, src/mifare.c: Sync w/ libnfc-1.5.1
+	(Fixes Issue 79)
+
+2011-07-11  Romuald Conty <romuald@libnfc.org>
+
+	* src/nfc-utils.c: sync nfc-utils.c with libnfc trunk.
+
+2011-05-20  Romuald Conty <romuald@libnfc.org>
+
+	* debian/control, debian/watch: debian: update pam_nfc, mfoc and
+	libfreefare packages to use dh7.
+
+2011-05-20  Romuald Conty <romuald@libnfc.org>
+
+	* INSTALL, debian/control: debian: silent lintian warning
+
+2011-05-20  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c: usage output is now more standard (Thanks to Thomas
+	Hood)
+
+2011-05-20  Romuald Conty <romuald@libnfc.org>
+
+	* debian/changelog, debian/control, debian/rules: debian package now
+	use dh_autoreconf to build against svn.
+
+2011-05-19  Romuald Conty <romuald@libnfc.org>
+
+	* debian/rules: in some cases ./configure file needs to be chmoded
+	(dpkg-source -b mfoc).
+
+2011-05-19  Romuald Conty <romuald@libnfc.org>
+
+	* AUTHORS, debian/changelog, debian/compat, debian/control,
+	debian/copyright, debian/docs, debian/manpages, debian/rules,
+	debian/source/format, debian/watch: import debian files (Thanks to
+	Thomas Hood)
+
+2011-05-18  Romuald Conty <romuald@libnfc.org>
+
+	* src/Makefile.am, src/mfoc.1: add manpage (Thanks to Thomas Hood)
+
+2011-05-18  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c: read multiple keys from command line (Thanks to Frank
+	Morgner) (Fixes Issue 63)
+
+2011-05-18  Romuald Conty <romuald@libnfc.org>
+
+	* ChangeLog, configure.ac: prepare 0.10.2 release
+
+2011-05-18  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c: improve tests made before running and show tag info
+	using print_nfc_iso14443a_info()
+
+2011-04-08  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c: try to disconnect() the device on error.
+
+2011-04-08  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c: show errors then exit on mf_configure()
+
+2011-04-08  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c: apply a patch suggested by Valentijn Sessink. See
+	Issue 56.
+
+2011-04-08  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c: minors fixes and indent.
+
+2011-04-08  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c: show error (using nfc_perror) then exit if some nfc_*
+	functions failed on init.
+
+2011-04-08  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c: minor debug improvements.
+
+2011-04-04  Romuald Conty <romuald@libnfc.org>
+
+	* configure.ac, src/mfoc.c: minor fixes/enhancements and version
+	bumping
+
+2011-04-04  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c, src/mifare.c: hide authentication errors
+
+2011-04-04  Romuald Conty <romuald@libnfc.org>
+
+	* src/mifare.c, src/mifare.h, src/nfc-utils.c, src/nfc-utils.h: sync
+	nfc-utils.h/c and mifare.c/h with libnfc's ones.
+
+2011-02-21  Romain Tartiere <romain.tartiere@gmail.com>
+
+	* src/Makefile.am: mfox: Unbreak autotools on FreeBSD.
+
+2011-02-02  Romuald Conty <romuald@libnfc.org>
+
+	* src/mfoc.c: use strtoll() function in order to retrieve 64bits
+	wide value. (Fixes Issue 55)
+
+2010-11-18  Romuald Conty <romuald@libnfc.org>
+
+	* configure.ac: bump package version
+
+2010-11-18  Romuald Conty <romuald@libnfc.org>
+
+	* src/nfc-utils.c, src/nfc-utils.h: sync nfc-utils.* from libnfc
+
+2010-11-02  Romuald Conty <romuald@libnfc.org>
+
+	* configure.ac, src/mfoc.c, src/mfoc.h, src/nfc-utils.c,
+	src/nfc-utils.h: upgrade code to work with develoment version of
+	libnfc (upcomming 1.4.0) Update code to match with the new API; Sync
+	nfc-utils.[ch] from libnfc's repo; Update ./configure to detect
+	libnfc 1.4.0;
+
+2010-09-14  Romuald Conty <romuald@libnfc.org>
+
+	* AUTHORS, Makefile.in, aclocal.m4, autogen.sh, config.h,
+	config.h.in, configure, configure.ac, depcomp, install-sh, missing,
+	src/Makefile.am, src/mfoc.c, src/mifare.c, src/mifare.h,
+	src/nfc-utils.c, src/nfc-utils.h: update code in order to use libnfc
+	1.3.9, minor clean up, and minor enhancements.
+
+2010-09-14  Romuald Conty <romuald@libnfc.org>
+
+	* Import MFOC 0.08 from http://www.nethemba.com/mfoc.tar.bz2 on 13th
+	Sept 2010
+

Makefile.am

@@ -1,4 +1,10 @@
 SUBDIRS = src
 
-#pkgconfigdir = $(libdir)/pkgconfig
+style:
-#pkgconfig_DATA = libnfc.pc
+	find . -name "*.[ch]" -exec perl -pi -e 's/[ \t]+$$//' {} \;
+	find . -name "*.[ch]" -exec astyle --formatted --mode=c --suffix=none \
+		--indent=spaces=2 --indent-switches --indent-preprocessor \
+		--keep-one-line-blocks --max-instatement-indent=60 \
+		--brackets=linux --pad-oper --unpad-paren --pad-header \
+		--align-pointer=name {} \;
+

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([mfoc], [0.09], [mifare@nethemba.com])
+AC_INIT([mfoc],[0.10.7],[mifare@nethemba.com])
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -8,25 +8,34 @@ AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_SRCDIR([src/mfoc.c])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(dist-bzip2 no-dist-gzip)
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 # Checks for pkg-config modules.
-  LIBNFC_REQUIRED_VERSION=1.3.9
+LIBNFC_REQUIRED_VERSION=1.7.0
-  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"
 AC_SUBST([PKG_CONFIG_REQUIRES])
 
+AC_C_INLINE
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
+AC_TYPE_SIZE_T
+AC_TYPE_UINT8_T
+AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
 
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
+AC_CHECK_FUNCS([memset])
+
+# C99
+CFLAGS="$CFLAGS -std=c99"
 
 AC_CONFIG_FILES([Makefile
                  src/Makefile])

debian/.gitignore

@@ -0,0 +1,6 @@
+autoreconf.after
+autoreconf.before
+files
+mfoc.debhelper.log
+mfoc.substvars
+mfoc/

debian/changelog

@@ -0,0 +1,17 @@
+mfoc (0.10.5-0) unstable; urgency=low
+
+  * New upstream release
+
+ -- Romuald Conty <romuald@libnfc.org>  Thu, 14 Feb 2013 21:16:42 +0100
+
+mfoc (0.10.4-0) unstable; urgency=low
+
+  * New upstream release
+
+ -- Romuald Conty <romuald@libnfc.org>  Sun, 20 Jan 2013 15:58:42 +0100
+
+mfoc (0.10.2pre3.1-0) unstable; urgency=low
+
+  * Initial package
+
+ -- Thomas Hood <jdthood@gmail.com>  Wed, 18 May 2011 12:00:00 +0200

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,17 @@
+Source: mfoc
+Section: utils
+Priority: extra
+Maintainer: Thomas Hood <jdthood@gmail.com>
+Build-Depends: debhelper (>=9), dh-autoreconf, libnfc-dev (>= 1.7.0~rc1), pkg-config
+Standards-Version: 3.9.4
+Homepage: http://code.google.com/p/mfoc/
+Vcs-Git: http://code.google.com/p/mfoc/
+Vcs-Browser: http://code.google.com/p/mfoc/source/browse/
+
+Package: mfoc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: MIFARE Classic offline cracker
+ MFOC is an open source implementation of "offline nested" attack. It
+ helps to recove keys from MIFARE Classic tags and dump content to a
+ file.

debian/copyright

@@ -0,0 +1,44 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: MFOC
+Source: http://nfc-tools.googlecode.com/svn/trunk/mfoc
+
+Files: *
+Copyright: 2009 Norbert Szetei, Pavol Luptak
+           2010 Micahal Boska, Romuald Conty
+           2011 Romuald Conty
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+
+Files: debian/*
+Copyright: 2011 Thomas Hood <jdthood@gmail.com>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".

debian/docs

@@ -0,0 +1 @@
+AUTHORS

debian/manpages

@@ -0,0 +1 @@
+src/mfoc.1

debian/rules

@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
+
+%:
+	dh $@ --with autoreconf 

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/watch

@@ -0,0 +1,7 @@
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+http://code.google.com/p/mfoc/downloads/list .*/mfoc-(.*).tar.gz
+

src/Makefile.am

@@ -1,7 +1,10 @@
+AM_CFLAGS  = @libnfc_CFLAGS@
+
 bin_PROGRAMS = mfoc
 
 noinst_HEADERS = crapto1.h mfoc.h mifare.h nfc-utils.h
-mfoc_SOURCES = crapto1.c crypto1.c mfoc.c mifare.c nfc-utils.c
-mfoc_LDADD = @LIBNFC_LIBS@
 
-# dist_man_MANS = mfoc.1
+mfoc_SOURCES = crapto1.c crypto1.c mfoc.c mifare.c nfc-utils.c
+mfoc_LDADD   = @libnfc_LIBS@
+
+dist_man_MANS = mfoc.1

src/crapto1.c

@@ -22,7 +22,7 @@
 
 #if !defined LOWMEM && defined __GNUC__
 static uint8_t filterlut[1 << 20];
-static void __attribute__((constructor)) fill_lut()
+static void __attribute__((constructor)) fill_lut(void)
 {
   uint32_t i;
   for (i = 0; i < 1 << 20; ++i)
@@ -126,8 +126,7 @@ extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
 static struct Crypto1State *
 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,
-	struct Crypto1State *sl, uint32_t in)
+        struct Crypto1State *sl, uint32_t in) {
-{
   uint32_t *o, *e, i;
 
   if (rem == -1) {
@@ -163,8 +162,7 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
       e_tail = binsearch(e_head, e = e_tail);
       sl = recover(o_tail--, o, oks,
                    e_tail--, e, eks, rem, sl, in);
-		}
+    } else if (*o_tail > *e_tail)
-		else if(*o_tail > *e_tail)
       o_tail = binsearch(o_head, o_tail) - 1;
     else
       e_tail = binsearch(e_head, e_tail) - 1;
@@ -176,8 +174,7 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
  * additionally you can use the in parameter to specify the value
  * that was fed into the lfsr at the time the keystream was generated
  */
-struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
+struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in) {
-{
   struct Crypto1State *statelist;
   uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
   uint32_t *even_head = 0, *even_tail = 0, eks = 0;
@@ -220,29 +217,32 @@ out:
 
 static const uint32_t S1[] = {     0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
                                    0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
-	0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
+                                   0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA
+                             };
 static const uint32_t S2[] = {  0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
                                 0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
                                 0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
-	0x7EC7EE90, 0x7F63F748, 0x79117020};
+                                0x7EC7EE90, 0x7F63F748, 0x79117020
+                             };
 static const uint32_t T1[] = {
   0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
   0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
   0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
-	0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
+  0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C
+};
 static const uint32_t T2[] = {  0x3C88B810, 0x5E445C08, 0x2982A580, 0x14C152C0,
                                 0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
                                 0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
                                 0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
                                 0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
-	0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
+                                0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0
+                             };
 static const uint32_t C1[] = { 0x846B5, 0x4235A, 0x211AD};
 static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
 /** Reverse 64 bits of keystream into possible cipher states
  * Variation mentioned in the paper. Somewhat optimized version
  */
-struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
+struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3) {
-{
   struct Crypto1State *statelist, *sl;
   uint8_t oks[32], eks[32], hi[32];
   uint32_t low = 0,  win = 0;
@@ -302,12 +302,17 @@ struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
       sl->even = win;
       ++sl;
       sl->odd = sl->even = 0;
-			continue2:;
+continue2:
+      ;
     }
   }
   return statelist;
 }
 
+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_prefix_ks(uint8_t ks[8], int isodd);
+
 /** lfsr_rollback_bit
  * Rollback the shift register in order to get previous states
  */
@@ -373,7 +378,8 @@ int nonce_distance(uint32_t from, uint32_t to)
 
 static uint32_t fastfwd[2][8] = {
   { 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
@@ -415,8 +421,7 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
  */
 static struct Crypto1State *
 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) {
-{
   uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
 
   for (c = 0; good && c < 8; ++c) {
@@ -444,6 +449,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)
@@ -454,8 +461,7 @@ check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8],
  * tag nonce was fed in
  */
 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]) {
-{
   struct Crypto1State *statelist, *s;
   uint32_t *odd, *even, *o, *e, top;
 

src/crapto1.h

@@ -37,6 +37,7 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in);
   struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3);
 
   void lfsr_rollback(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);
 #define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\
   uint32_t __n = 0,__M = 0, N = 0;\
@@ -61,7 +62,7 @@ static inline int parity(uint32_t x)
     x ^= x >> 4;
     return BIT(0x6996, x & 0xf);
 #else
-	asm(    "movl %1, %%eax\n"
+    __asm__("movl %1, %%eax\n"
             "mov %%ax, %%cx\n"
             "shrl $0x10, %%eax\n"
             "xor %%ax, %%cx\n"

src/crypto1.c

@@ -23,8 +23,7 @@
 #define SWAPENDIAN(x)\
   (x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
 
-struct Crypto1State * crypto1_create(uint64_t key)
+struct Crypto1State *crypto1_create(uint64_t key) {
-{
   struct Crypto1State *s = malloc(sizeof(*s));
   int i;
 

src/mfoc.1

@@ -0,0 +1,41 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.TH MFOC 1 "May 13, 2011"
+.SH NAME
+mfoc \- MIFARE Classic offline cracker
+.SH SYNOPSIS
+.B mfoc
+[ \fB\-h\fP ]
+[ \fB\-k\fP \fIKEY\fR ]...
+[ \fB\-O\fP \fIFILE\fR ]
+[ \fB\-P\fP \fINUM\fR ]
+[ \fB\-T\fP \fINUM\fR ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B mfoc
+command.
+.PP
+\fBmfoc\fP is a program that cracks the encryption of a MIFARE Classic chip and dumps the chip's keys and decrypted memory contents to a file.
+To run it you need to have access to an NFC reader and, of course, a card equipped with a MIFARE Classic chip.
+.SH OPTIONS
+A summary of options is included below.
+.TP
+\fB\-h\fP
+Show summary of options.
+.TP
+\fB\-k\fP \fIKEY\fR
+Initially try KEY in addition to the default keys.
+.TP
+\fB\-O\fP \fIFILE\fR
+Dump card contents to FILE.
+.TP
+\fB\-P\fP \fINUM\fR
+Probe each sector up to NUM times.  Default is 20.
+.TP
+\fB\-T\fP \fINUM\fR
+Set half the range for a possible distance tolerance to NUM.  Default is 20 (for a total range of 40).
+.SH AUTHOR
+.B mfoc
+was written by Norbert Szetei and Pavol Luptak with contributions by others.
+.PP
+This manual page was written by Thomas Hood <jdthood@gmail.com>.
+MIFARE is a trade mark of NXP bv, Netherlands.

src/mfoc.c

@@ -1,39 +1,45 @@
-/*  
+/*-
- 
+ * Mifare Classic Offline Cracker
- Mifare Classic Offline Cracker version 0.08
+ *
- 
+ * This program is free software; you can redistribute it and/or
- Requirements: crapto1 library http://code.google.com/p/crapto1
+ * modify it under the terms of the GNU General Public License
- libnfc                        http://www.libnfc.org
+ * as published by the Free Software Foundation; either version 2
- 
+ * of the License, or (at your option) any later version.
- This program is free software: you can redistribute it and/or modify
+ *
- it under the terms of the GNU General Public License as published by
+ * This program is distributed in the hope that it will be useful,
- the Free Software Foundation, either version 2 of the License, or
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- (at your option) any later version.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- 
+ * GNU General Public License for more details.
- This program is distributed in the hope that it will be useful,
+ *
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * You should have received a copy of the GNU General Public License
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * along with this program; if not, write to the Free Software
- GNU General Public License for more details.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
+ *
- You should have received a copy of the GNU General Public License
+ * Contact: <mifare@nethemba.com>
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
- 
+ * Porting to libnfc 1.3.3: Michal Boska <boska.michal@gmail.com>
- Contact: <mifare@nethemba.com>
+ * Porting to libnfc 1.3.9 and upper: Romuald Conty <romuald@libnfc.org>
-
+ *
- Porting to libnfc 1.3.3: Michal Boska <boska.michal@gmail.com>
- Porting to libnfc 1.3.9: Romuald Conty <romuald@libnfc.org>
- 
- URL http://eprint.iacr.org/2009/137.pdf
- URL http://www.sos.cs.ru.nl/applications/rfid/2008-esorics.pdf
- URL http://www.cosic.esat.kuleuven.be/rfidsec09/Papers/mifare_courtois_rfidsec09.pdf
- URL http://www.cs.ru.nl/~petervr/papers/grvw_2009_pickpocket.pdf
  */
 
+/*
+ * This implementation was written based on information provided by the
+ * following documents:
+ *
+ * http://eprint.iacr.org/2009/137.pdf
+ * http://www.sos.cs.ru.nl/applications/rfid/2008-esorics.pdf
+ * http://www.cosic.esat.kuleuven.be/rfidsec09/Papers/mifare_courtois_rfidsec09.pdf
+ * http://www.cs.ru.nl/~petervr/papers/grvw_2009_pickpocket.pdf
+ */
+
+#define _XOPEN_SOURCE 1 // To enable getopt
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
 
+#include <unistd.h>
+
 // NFC
 #include <nfc/nfc.h>
 
@@ -46,8 +52,16 @@
 #include "nfc-utils.h"
 #include "mfoc.h"
 
-int main(int argc, char * const argv[]) {
+nfc_context *context;
-	int ch, i, k, n, j, m, o;
+
+int main(int argc, char *const argv[])
+{
+  const nfc_modulation nm = {
+    .nmt = NMT_ISO14443A,
+    .nbr = NBR_106,
+  };
+
+  int ch, i, k, n, j, m;
   int key, block;
   int succeed = 1;
 
@@ -62,11 +76,11 @@ int main(int argc, char * const argv[]) {
   bool skip = false;
 
   // Next default key specified as option (-k)
-	byte_t * defKey = NULL; 
+  uint8_t *defKeys = NULL, *p;
+  size_t defKeys_len = 0;
 
   // Array with default Mifare Classic keys
-	byte_t defaultKeys[][6] = {
+  uint8_t defaultKeys[][6] = {
-		{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, // User defined key slot
     {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, // Default key (first key used by program if no user defined key)
     {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5}, // NFCForum MAD key
     {0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7}, // NFCForum content key
@@ -106,37 +120,41 @@ int main(int argc, char * const argv[]) {
       case 'P':
         // Number of probes
         if (!(probes = atoi(optarg)) || probes < 1) {
-					fprintf(stderr, "The number of probes must be a positive number\n"); 
+          ERR("The number of probes must be a positive number");
-					exit(1);
+          exit(EXIT_FAILURE);
         }
         // fprintf(stdout, "Number of probes: %d\n", probes);
         break;
-			case 'T':
+      case 'T': {
+        int res;
         // Nonce tolerance range
-				if (!(d.tolerance = atoi(optarg)) || d.tolerance < 0) {
+        if (((res = atoi(optarg)) < 0)) {
-					fprintf(stderr, "The nonce distances range must be a zero or a positive number\n"); 
+          ERR("The nonce distances range must be a zero or a positive number");
-					exit(1);
+          exit(EXIT_FAILURE);
         }
+        d.tolerance = (uint32_t)res;
         // fprintf(stdout, "Tolerance number: %d\n", probes);
+      }
       break;
       case 'k':
-				// Add this key to the default keys list
+        // Add this key to the default keys
-				if ((defKey = calloc(6, sizeof(byte_t))) == NULL) {
+        p = realloc(defKeys, defKeys_len + 6);
-					fprintf(stderr, "Cannot allocate memory for defKey\n");
+        if (!p) {
-					exit(1);
+          ERR("Cannot allocate memory for defKeys");
-				} else {
+          exit(EXIT_FAILURE);
-					bzero(defKey, 6);
-					num_to_bytes(strtol(optarg, NULL, 16), 6, defKey);
-					memcpy(defaultKeys[0], defKey, 6);
         }
-				fprintf(stdout, "The custom key 0x%012llx has been added to the default keys\n", bytes_to_num(defKey, 6));
+        defKeys = p;
+        memset(defKeys + defKeys_len, 0, 6);
+        num_to_bytes(strtoll(optarg, NULL, 16), 6, defKeys + defKeys_len);
+        fprintf(stdout, "The custom key 0x%012llx has been added to the default keys\n", bytes_to_num(defKeys + defKeys_len, 6));
+        defKeys_len = defKeys_len + 6;
 
         break;
       case 'O':
         // File output
         if (!(pfDump = fopen(optarg, "wb"))) {
           fprintf(stderr, "Cannot open: %s, exiting\n", optarg);
-					exit(1);
+          exit(EXIT_FAILURE);
         }
         // fprintf(stdout, "Output file: %s\n", optarg);
         break;
@@ -150,68 +168,110 @@ int main(int argc, char * const argv[]) {
   }
 
   if (!pfDump) {
-		fprintf(stderr, "Error, parameter -O is mandatory\n");
+    ERR("parameter -O is mandatory");
-		exit(1);
+    exit(EXIT_FAILURE);
   }
 
   // Initialize reader/tag structures
-	mf_init(&t, &r);
+  mf_init(&r);
-	// Configure reader settings
-	mf_configure(r.pdi);
-	mf_select_tag(r.pdi, &t.ti);
 
-	// Save tag uid and info about block size (b4K)
+  if (nfc_initiator_init(r.pdi) < 0) {
-	t.b4K = (t.ti.nai.abtAtqa[1] == 0x02);
+    nfc_perror(r.pdi, "nfc_initiator_init");
-	t.uid = (uint32_t) bytes_to_num(t.ti.nai.abtUid, 4);
+    goto error;
+  }
+  // Drop the field for a while, so can be reset
+  if (nfc_device_set_property_bool(r.pdi, NP_ACTIVATE_FIELD, true) < 0) {
+    nfc_perror(r.pdi, "nfc_device_set_property_bool activate field");
+    goto error;
+  }
+  // Let the reader only try once to find a tag
+  if (nfc_device_set_property_bool(r.pdi, NP_INFINITE_SELECT, false) < 0) {
+    nfc_perror(r.pdi, "nfc_device_set_property_bool infinite select");
+    goto error;
+  }
+  // Configure the CRC and Parity settings
+  if (nfc_device_set_property_bool(r.pdi, NP_HANDLE_CRC, true) < 0) {
+    nfc_perror(r.pdi, "nfc_device_set_property_bool crc");
+    goto error;
+  }
+  if (nfc_device_set_property_bool(r.pdi, NP_HANDLE_PARITY, true) < 0) {
+    nfc_perror(r.pdi, "nfc_device_set_property_bool parity");
+    goto error;
+  }
+
+  /*
+  	// wait for tag to appear
+  	for (i=0;!nfc_initiator_select_passive_target(r.pdi, nm, NULL, 0, &t.nt) && i < 10; i++) zsleep (100);
+  */
+
+  int tag_count;
+  if ((tag_count = nfc_initiator_select_passive_target(r.pdi, nm, NULL, 0, &t.nt)) < 0) {
+    nfc_perror(r.pdi, "nfc_initiator_select_passive_target");
+    goto error;
+  } else if (tag_count == 0) {
+    ERR("No tag found.");
+    goto error;
+  }
+
+  // Test if a compatible MIFARE tag is used
+  if ((t.nt.nti.nai.btSak & 0x08) == 0) {
+    ERR("only Mifare Classic is supported");
+    goto error;
+  }
+
+  // Save tag's block size (b4K)
+  t.b4K = (t.nt.nti.nai.abtAtqa[1] == 0x02);
+  t.authuid = (uint32_t) bytes_to_num(t.nt.nti.nai.abtUid + t.nt.nti.nai.szUidLen - 4, 4);
 
   t.num_blocks = (t.b4K) ? 0xff : 0x3f;
   t.num_sectors = t.b4K ? NR_TRAILERS_4k : NR_TRAILERS_1k;
 
   t.sectors = (void *) calloc(t.num_sectors, sizeof(sector));
   if (t.sectors == NULL) {
-		fprintf(stderr, "Cannot allocate memory for t.sectors\n"); 
+    ERR("Cannot allocate memory for t.sectors");
-		exit(1);
+    goto error;
   }
   if ((pk = (void *) malloc(sizeof(pKeys))) == NULL) {
-		fprintf(stderr, "Cannot allocate memory for pk\n"); 
+    ERR("Cannot allocate memory for pk");
-		exit(1);
+    goto error;
   }
   if ((bk = (void *) malloc(sizeof(bKeys))) == NULL) {
-		fprintf(stderr, "Cannot allocate memory for bk\n"); 
+    ERR("Cannot allocate memory for bk");
-		exit(1);
+    goto error;
   } else {
     bk->brokenKeys = NULL;
     bk->size = 0;
   }
 
-	d.distances = (void *) calloc(d.num_distances, sizeof(u_int32_t));
+  d.distances = (void *) calloc(d.num_distances, sizeof(uint32_t));
   if (d.distances == NULL) {
-		fprintf(stderr, "Cannot allocate memory for t.distances\n"); 
+    ERR("Cannot allocate memory for t.distances");
-		exit(1);
+    goto error;
-	}		
-	
-	// Test if a compatible MIFARE tag is used
-	if ((t.ti.nai.btSak & 0x08) == 0) {
-		printf("Error: inserted tag is not a MIFARE Classic card\n");
-		nfc_disconnect(r.pdi);
-		exit(1);
   }
 
   // Initialize t.sectors, keys are not known yet
-	for (i = 0; i < (t.num_sectors); ++i) {
+  for (uint8_t s = 0; s < (t.num_sectors); ++s) {
-		t.sectors[i].foundKeyA = t.sectors[i].foundKeyB = false;
+    t.sectors[s].foundKeyA = t.sectors[s].foundKeyB = false;
   }
 
-	fprintf(stdout, "Found MIFARE Classic %cK card with uid: %08x\n", (t.b4K ? '4' : '1'), t.uid);
+  print_nfc_target(&t.nt, true);
 
-	// Try to authenticate to all sectors with default keys
+  fprintf(stdout, "\nTry to authenticate to all sectors with default keys...\n");
+  fprintf(stdout, "Symbols: '.' no key found, '/' A key found, '\\' B key found, 'x' both keys found\n");
   // Set the authentication information (uid)
-	memcpy(mp.mpa.abtUid, t.ti.nai.abtUid, sizeof(mp.mpa.abtUid));
+  memcpy(mp.mpa.abtAuthUid, t.nt.nti.nai.abtUid + t.nt.nti.nai.szUidLen - 4, sizeof(mp.mpa.abtAuthUid));
   // Iterate over all keys (n = number of keys)
   n = sizeof(defaultKeys) / sizeof(defaultKeys[0]);
-	for (key = 0; key < n; key++) {
+  size_t defKey_bytes_todo = defKeys_len;
-		if (key == 0 && defKey == NULL) ++key; // Custom key not provided, try another key
+  key = 0;
+  while (key < n) {
+    if (defKey_bytes_todo > 0) {
+      memcpy(mp.mpa.abtKey, defKeys + defKeys_len - defKey_bytes_todo, sizeof(mp.mpa.abtKey));
+      defKey_bytes_todo -= sizeof(mp.mpa.abtKey);
+    } else {
       memcpy(mp.mpa.abtKey, defaultKeys[key], sizeof(mp.mpa.abtKey));
+      key++;
+    }
     fprintf(stdout, "[Key: %012llx] -> ", bytes_to_num(mp.mpa.abtKey, 6));
     fprintf(stdout, "[");
     i = 0; // Sector counter
@@ -220,9 +280,12 @@ int main(int argc, char * const argv[]) {
       if (trailer_block(block)) {
         if (!t.sectors[i].foundKeyA) {
           mc = MC_AUTH_A;
-					if (!nfc_initiator_mifare_cmd(r.pdi,mc,block,&mp)) {
+          int res;
-						// fprintf(stdout, "!!Error: AUTH [Key A:%012llx] sector %02x t_block %02x\n", 
+          if ((res = nfc_initiator_mifare_cmd(r.pdi, mc, block, &mp)) < 0) {
-						// 	bytes_to_num(mp.mpa.abtKey, 6), i, block);
+            if (res != NFC_EMFCAUTHFAIL) {
+              nfc_perror(r.pdi, "nfc_initiator_mifare_cmd");
+              goto error;
+            }
             mf_anticollision(t, r);
           } else {
             // Save all information about successfull keyA authentization
@@ -232,9 +295,12 @@ int main(int argc, char * const argv[]) {
         }
         if (!t.sectors[i].foundKeyB) {
           mc = MC_AUTH_B;
-					if (!nfc_initiator_mifare_cmd(r.pdi,mc,block,&mp)) {
+          int res;
-						// fprintf(stdout, "!!Error: AUTH [Key B:%012llx] sector %02x t_block %02x\n", 
+          if ((res = nfc_initiator_mifare_cmd(r.pdi, mc, block, &mp)) < 0) {
-						//	bytes_to_num(mp.mpa.abtKey, 6), i, block);
+            if (res != NFC_EMFCAUTHFAIL) {
+              nfc_perror(r.pdi, "nfc_initiator_mifare_cmd");
+              goto error;
+            }
             mf_anticollision(t, r);
             // No success, try next block
             t.sectors[i].trailer = block;
@@ -243,16 +309,16 @@ int main(int argc, char * const argv[]) {
             t.sectors[i].foundKeyB = true;
           }
         }
-				if ((t.sectors[i].foundKeyA) || (t.sectors[i].foundKeyB)) {
+        if ((t.sectors[i].foundKeyA) && (t.sectors[i].foundKeyB)) {
           fprintf(stdout, "x");
+        } else if (t.sectors[i].foundKeyA) {
+          fprintf(stdout, "/");
+        } else if (t.sectors[i].foundKeyB) {
+          fprintf(stdout, "\\");
         } else {
           fprintf(stdout, ".");
         }
         fflush(stdout);
-				mf_configure(r.pdi);
-				mf_anticollision(t, r);
-				// fprintf(stdout, "\nSuccess: AUTH [Key %c:%012llx] sector %02x t_block %02x\n", 
-				// 	(mc == MC_AUTH_A ? 'A' :'B'), bytes_to_num(mp.mpa.abtKey, 6), i, block);
         // Save position of a trailer block to sector struct
         t.sectors[i++].trailer = block;
       }
@@ -276,17 +342,20 @@ int main(int argc, char * const argv[]) {
   for (m = 0; m < 2; ++m) {
     if (e_sector == -1) break; // All keys are default, I am skipping recovery mode
     for (j = 0; j < (t.num_sectors); ++j) {
-			memcpy(mp.mpa.abtUid, t.ti.nai.abtUid, sizeof(mp.mpa.abtUid));
+      memcpy(mp.mpa.abtAuthUid, t.nt.nti.nai.abtUid + t.nt.nti.nai.szUidLen - 4, sizeof(mp.mpa.abtAuthUid));
       if ((dumpKeysA && !t.sectors[j].foundKeyA) || (!dumpKeysA && !t.sectors[j].foundKeyB)) {
 
         // First, try already broken keys
         skip = false;
-				for (o = 0; o < bk->size; o++) {
+        for (uint32_t o = 0; o < bk->size; o++) {
           num_to_bytes(bk->brokenKeys[o], 6, mp.mpa.abtKey);
-					mc = dumpKeysA ? 0x60 : 0x61;
+          mc = dumpKeysA ? MC_AUTH_A : MC_AUTH_B;
-					if (!nfc_initiator_mifare_cmd(r.pdi,mc,t.sectors[j].trailer,&mp)) {
+          int res;
-					//	fprintf(stdout, "!!Error: AUTH [Key A:%012llx] sector %02x t_block %02x, key %d\n", 
+          if ((res = nfc_initiator_mifare_cmd(r.pdi, mc, t.sectors[j].trailer, &mp)) < 0) {
-					//			bytes_to_num(mp.mpa.abtKey, 6), j, t.sectors[j].trailer, o);
+            if (res != NFC_EMFCAUTHFAIL) {
+              nfc_perror(r.pdi, "nfc_initiator_mifare_cmd");
+              goto error;
+            }
             mf_anticollision(t, r);
           } else {
             // Save all information about successfull authentization
@@ -338,10 +407,13 @@ int main(int argc, char * const argv[]) {
               // fprintf(stdout,"%d %llx\n",ck[i].count, ck[i].key);
               // Set required authetication method
               num_to_bytes(ck[i].key, 6, mp.mpa.abtKey);
-							mc = dumpKeysA ? 0x60 : 0x61;
+              mc = dumpKeysA ? MC_AUTH_A : MC_AUTH_B;
-							if (!nfc_initiator_mifare_cmd(r.pdi,mc,t.sectors[j].trailer,&mp)) {
+              int res;
-								// fprintf(stdout, "!!Error: AUTH [Key A:%llx] sector %02x t_block %02x\n", 
+              if ((res = nfc_initiator_mifare_cmd(r.pdi, mc, t.sectors[j].trailer, &mp)) < 0) {
-								// 	bytes_to_num(mp.mpa.abtKey, 6), j, t.sectors[j].trailer);
+                if (res != NFC_EMFCAUTHFAIL) {
+                  nfc_perror(r.pdi, "nfc_initiator_mifare_cmd");
+                  goto error;
+                }
                 mf_anticollision(t, r);
               } else {
                 // Save all information about successfull authentization
@@ -371,8 +443,8 @@ int main(int argc, char * const argv[]) {
         }
         // We haven't found any key, exiting
         if ((dumpKeysA && !t.sectors[j].foundKeyA) || (!dumpKeysA && !t.sectors[j].foundKeyB)) {
-					fprintf(stderr, "No success, maybe you should increase the probes\n");
+          ERR("No success, maybe you should increase the probes");
-					exit(1);
+          goto error;
         }
       }
     }
@@ -398,38 +470,52 @@ int main(int argc, char * const argv[]) {
 
       // Try A key, auth() + read()
       memcpy(mp.mpa.abtKey, t.sectors[i].KeyA, sizeof(t.sectors[i].KeyA));
-			if (!nfc_initiator_mifare_cmd(r.pdi, MC_AUTH_A, block, &mp)) {
+      int res;
-				// fprintf(stderr, "Error: Auth A\n");
+      if ((res = nfc_initiator_mifare_cmd(r.pdi, MC_AUTH_A, block, &mp)) < 0) {
+        if (res != NFC_EMFCAUTHFAIL) {
+          nfc_perror(r.pdi, "nfc_initiator_mifare_cmd");
+          goto error;
+        }
         mf_configure(r.pdi);
         mf_anticollision(t, r);
       } else { // and Read
-				if (nfc_initiator_mifare_cmd(r.pdi, MC_READ, block, &mp)) {
+        if ((res = nfc_initiator_mifare_cmd(r.pdi, MC_READ, block, &mp)) >= 0) {
           fprintf(stdout, "Block %02d, type %c, key %012llx :", block, 'A', bytes_to_num(t.sectors[i].KeyA, 6));
           print_hex(mp.mpd.abtData, 16);
           mf_configure(r.pdi);
-					mf_select_tag(r.pdi, &t.ti);
+          mf_select_tag(r.pdi, &(t.nt));
           failure = false;
         } else {
           // Error, now try read() with B key
-					// fprintf(stderr, "Error: Read A\n");
+          if (res != NFC_ERFTRANS) {
+            nfc_perror(r.pdi, "nfc_initiator_mifare_cmd");
+            goto error;
+          }
           mf_configure(r.pdi);
           mf_anticollision(t, r);
           memcpy(mp.mpa.abtKey, t.sectors[i].KeyB, sizeof(t.sectors[i].KeyB));
-					if (!nfc_initiator_mifare_cmd(r.pdi, MC_AUTH_B, block, &mp)) {
+          if ((res = nfc_initiator_mifare_cmd(r.pdi, MC_AUTH_B, block, &mp)) < 0) {
-						// fprintf(stderr, "Error: Auth B\n");
+            if (res != NFC_EMFCAUTHFAIL) {
+              nfc_perror(r.pdi, "nfc_initiator_mifare_cmd");
+              goto error;
+            }
             mf_configure(r.pdi);
             mf_anticollision(t, r);
           } else { // and Read
-						if (nfc_initiator_mifare_cmd(r.pdi, MC_READ, block, &mp)) {
+            if ((res = nfc_initiator_mifare_cmd(r.pdi, MC_READ, block, &mp)) >= 0) {
               fprintf(stdout, "Block %02d, type %c, key %012llx :", block, 'B', bytes_to_num(t.sectors[i].KeyB, 6));
               print_hex(mp.mpd.abtData, 16);
               mf_configure(r.pdi);
-							mf_select_tag(r.pdi, &t.ti);
+              mf_select_tag(r.pdi, &(t.nt));
               failure = false;
             } else {
+              if (res != NFC_ERFTRANS) {
+                nfc_perror(r.pdi, "nfc_initiator_mifare_cmd");
+                goto error;
+              }
               mf_configure(r.pdi);
               mf_anticollision(t, r);
-							// fprintf(stderr, "Error: Read B\n");
+              // ERR ("Error: Read B");
             }
           }
         }
@@ -440,14 +526,14 @@ int main(int argc, char * const argv[]) {
         memcpy(mtDump.amb[block].mbt.abtKeyB, t.sectors[i].KeyB, 6);
         if (!failure) memcpy(mtDump.amb[block].mbt.abtAccessBits, mp.mpd.abtData + 6, 4);
       } else if (!failure) memcpy(mtDump.amb[block].mbd.abtData, mp.mpd.abtData, 16);
-			memcpy(mp.mpa.abtUid,t.ti.nai.abtUid,4);
+      memcpy(mp.mpa.abtAuthUid, t.nt.nti.nai.abtUid + t.nt.nti.nai.szUidLen - 4, sizeof(mp.mpa.abtAuthUid));
     }
 
     // Finally save all keys + data to file
     if (fwrite(&mtDump, 1, sizeof(mtDump), pfDump) != sizeof(mtDump)) {
       fprintf(stdout, "Error, cannot write dump\n");
       fclose(pfDump);
-			exit(1);
+      goto error;
     }
     fclose(pfDump);
   }
@@ -456,62 +542,101 @@ int main(int argc, char * const argv[]) {
   free(d.distances);
 
   // Reset the "advanced" configuration to normal
-	nfc_configure(r.pdi, NDO_HANDLE_CRC, true);
+  nfc_device_set_property_bool(r.pdi, NP_HANDLE_CRC, true);
-	nfc_configure(r.pdi, NDO_HANDLE_PARITY, true);
+  nfc_device_set_property_bool(r.pdi, NP_HANDLE_PARITY, true);
 
   // Disconnect device and exit
-	nfc_disconnect(r.pdi);
+  nfc_close(r.pdi);
-    return 0;
+  nfc_exit(context);
+  exit(EXIT_SUCCESS);
+error:
+  nfc_close(r.pdi);
+  nfc_exit(context);
+  exit(EXIT_FAILURE);
 }
 
-void usage(FILE * stream, int errno) {
+void usage(FILE *stream, int errno)
-	fprintf(stream, "mfoc %s\n\n", PACKAGE_VERSION);
+{
-	fprintf(stream, "usage: mfoc [-h] [-P probnum] [-T tolerance] [-k custom_key] [-O output]\n\n");
+  fprintf(stream, "Usage: mfoc [-h] [-k key]... [-P probnum] [-T tolerance] [-O output]\n");
-	fprintf(stream, "example: mfoc -O card_dump\n");
-	fprintf(stream, "example: mfoc -k ffffeeeedddd -O card_dump\n");
-	fprintf(stream, "example: mfoc -P 50 -O card_dump\n");
   fprintf(stream, "\n");
-	fprintf(stream, "  h : print this help\n");
+  fprintf(stream, "  h     print this help and exit\n");
-//	fprintf(stream, "  B : instead of 'A' dump 'B' keys\n");
+//	fprintf(stream, "  B     instead of 'A' dump 'B' keys\n");
-	fprintf(stream, "  k : use a specified key instead of looking for defaults ones\n");
+  fprintf(stream, "  k     try the specified key in addition to the default keys\n");
-//	fprintf(stream, "  D : number of distance probes, default is 20\n");
+//	fprintf(stream, "  D     number of distance probes, default is 20\n");
-//	fprintf(stream, "  S : number of sets with keystreams, default is 5\n");
+//	fprintf(stream, "  S     number of sets with keystreams, default is 5\n");
-	fprintf(stream, "  P : number of probes for a key recovery for one sector, default is 20\n");
+  fprintf(stream, "  P     number of probes per sector, instead of default of 20\n");
-	fprintf(stream, "  T : range for a possible distance tolerance, default is 20 (40 in both direction)\n");
+  fprintf(stream, "  T     nonce tolerance half-range, instead of default of 20\n        (i.e., 40 for the total range, in both directions)\n");
-//	fprintf(stream, "  s : specify the list of sectors to crack, for example -s 0,1,3,5\n");
+//	fprintf(stream, "  s     specify the list of sectors to crack, for example -s 0,1,3,5\n");
-	fprintf(stream, "  O : dump file where the revealed keys should be stored\n");
+  fprintf(stream, "  O     file in which the card contents will be written (REQUIRED)\n");
   fprintf(stream, "\n");
+  fprintf(stream, "Example: mfoc -O mycard.mfd\n");
+  fprintf(stream, "Example: mfoc -k ffffeeeedddd -O mycard.mfd\n");
+  fprintf(stream, "Example: mfoc -P 50 -T 30 -O mycard.mfd\n");
+  fprintf(stream, "\n");
+  fprintf(stream, "This is mfoc version %s.\n", PACKAGE_VERSION);
+  fprintf(stream, "For more information, run: 'man mfoc'.\n");
   exit(errno);
 }
 
-void mf_init(mftag *t, mfreader *r) {
+void mf_init(mfreader *r)
+{
   // Connect to the first NFC device
-	r->pdi = nfc_connect(NULL);
+  nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
+  r->pdi = nfc_open(context, NULL);
   if (!r->pdi) {
-		fprintf(stderr, "!Error connecting to the NFC reader\n");
+    printf("No NFC device found.\n");
-		exit(1);
+    exit(EXIT_FAILURE);
   }
 }
 
-void mf_configure(nfc_device_t* pdi) {
+void mf_configure(nfc_device *pdi)
-	nfc_initiator_init(pdi);
+{
+  if (nfc_initiator_init(pdi) < 0) {
+    nfc_perror(pdi, "nfc_initiator_init");
+    exit(EXIT_FAILURE);
+  }
   // Drop the field for a while, so can be reset
-	nfc_configure(pdi,NDO_ACTIVATE_FIELD,false);
+  if (nfc_device_set_property_bool(pdi, NP_ACTIVATE_FIELD, false) < 0) {
+    nfc_perror(pdi, "nfc_device_set_property_bool activate field");
+    exit(EXIT_FAILURE);
+  }
   // Let the reader only try once to find a tag
-	nfc_configure(pdi,NDO_INFINITE_SELECT,false);
+  if (nfc_device_set_property_bool(pdi, NP_INFINITE_SELECT, false) < 0) {
+    nfc_perror(pdi, "nfc_device_set_property_bool infinite select");
+    exit(EXIT_FAILURE);
+  }
   // Configure the CRC and Parity settings
-	nfc_configure(pdi,NDO_HANDLE_CRC,true);
+  if (nfc_device_set_property_bool(pdi, NP_HANDLE_CRC, true) < 0) {
-	nfc_configure(pdi,NDO_HANDLE_PARITY,true);
+    nfc_perror(pdi, "nfc_device_set_property_bool crc");
+    exit(EXIT_FAILURE);
+  }
+  if (nfc_device_set_property_bool(pdi, NP_HANDLE_PARITY, true) < 0) {
+    nfc_perror(pdi, "nfc_device_set_property_bool parity");
+    exit(EXIT_FAILURE);
+  }
   // Enable the field so more power consuming cards can power themselves up
-	nfc_configure(pdi,NDO_ACTIVATE_FIELD,true);
+  if (nfc_device_set_property_bool(pdi, NP_ACTIVATE_FIELD, true) < 0) {
+    nfc_perror(pdi, "nfc_device_set_property_bool activate field");
+    exit(EXIT_FAILURE);
+  }
 }
 
-void mf_select_tag(nfc_device_t* pdi, nfc_target_info_t* ti) {
+void mf_select_tag(nfc_device *pdi, nfc_target *pnt)
+{
   // Poll for a ISO14443A (MIFARE) tag
-	if (!nfc_initiator_select_passive_target(pdi,NM_ISO14443A_106,NULL,0,ti)) {
+  const nfc_modulation nm = {
-		fprintf(stderr, "!Error connecting to the MIFARE Classic tag\n");
+    .nmt = NMT_ISO14443A,
-		nfc_disconnect(pdi);
+    .nbr = NBR_106,
-		exit(1);
+  };
+  if (nfc_initiator_select_passive_target(pdi, nm, NULL, 0, pnt) < 0) {
+    ERR("Unable to connect to the MIFARE Classic tag");
+    nfc_close(pdi);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
 }
 
@@ -522,7 +647,8 @@ int trailer_block(uint32_t block)
 }
 
 // Return position of sector if it is encrypted with the default key otherwise exit..
-int find_exploit_sector(mftag t) {
+int find_exploit_sector(mftag t)
+{
   int i;
   bool interesting = false;
 
@@ -542,18 +668,25 @@ int find_exploit_sector(mftag t) {
       return i;
     }
   }
-	fprintf(stderr, "\n\nNo sector encrypted with the default key has been found, exiting..\n");
+  ERR("\n\nNo sector encrypted with the default key has been found, exiting..");
-	exit(1);
+  exit(EXIT_FAILURE);
 }
 
-void mf_anticollision(mftag t, mfreader r) {
+void mf_anticollision(mftag t, mfreader r)
-	if (!nfc_initiator_select_passive_target(r.pdi, NM_ISO14443A_106, NULL, 0, &t.ti)) {
+{
-		fprintf(stderr, "\n\n!Error: tag has been removed\n");
+  const nfc_modulation nm = {
-		exit(1);
+    .nmt = NMT_ISO14443A,
+    .nbr = NBR_106,
+  };
+  if (nfc_initiator_select_passive_target(r.pdi, nm, NULL, 0, &t.nt) < 0) {
+    nfc_perror(r.pdi, "nfc_initiator_select_passive_target");
+    ERR("Tag has been removed");
+    exit(EXIT_FAILURE);
   }
 }
 
-int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d, pKeys *pk, char mode, bool dumpKeysA) {
+int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d, pKeys *pk, char mode, bool dumpKeysA)
+{
   struct Crypto1State *pcs;
   struct Crypto1State *revstate;
   struct Crypto1State *revstate_start;
@@ -563,48 +696,48 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
   // Possible key counter, just continue with a previous "session"
   uint32_t kcount = pk->size;
 
-	byte_t Nr[4] = { 0x00,0x00,0x00,0x00 }; // Reader nonce
+  uint8_t Nr[4] = { 0x00, 0x00, 0x00, 0x00 }; // Reader nonce
-	byte_t Auth[4] = { 0x00, t.sectors[e_sector].trailer, 0x00, 0x00 };
+  uint8_t Auth[4] = { 0x00, t.sectors[e_sector].trailer, 0x00, 0x00 };
-	byte_t AuthEnc[4] = { 0x00, t.sectors[e_sector].trailer, 0x00, 0x00 };
+  uint8_t AuthEnc[4] = { 0x00, t.sectors[e_sector].trailer, 0x00, 0x00 };
-	byte_t AuthEncPar[8] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+  uint8_t AuthEncPar[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
-	byte_t ArEnc[8] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+  uint8_t ArEnc[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	byte_t ArEncPar[8] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+  uint8_t ArEncPar[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
-	byte_t Rx[MAX_FRAME_LEN]; // Tag response
+  uint8_t Rx[MAX_FRAME_LEN]; // Tag response
-	byte_t RxPar[MAX_FRAME_LEN]; // Tag response
+  uint8_t RxPar[MAX_FRAME_LEN]; // Tag response
-	size_t RxLen;
 
-	u_int32_t Nt, NtLast, NtProbe, NtEnc, Ks1;
+  uint32_t Nt, NtLast, NtProbe, NtEnc, Ks1;
 
-	int i, m;
+  int i;
+  uint32_t m;
 
   // Prepare AUTH command
-	Auth[0] = (t.sectors[e_sector].foundKeyA) ? 0x60 : 0x61;
+  Auth[0] = (t.sectors[e_sector].foundKeyA) ? MC_AUTH_A : MC_AUTH_B;
-	append_iso14443a_crc(Auth,2);
+  iso14443a_crc_append(Auth, 2);
   // fprintf(stdout, "\nAuth command:\t");
   // print_hex(Auth, 4);
 
   // We need full control over the CRC
-	if (!nfc_configure(r.pdi, NDO_HANDLE_CRC, false))  {
+  if (nfc_device_set_property_bool(r.pdi, NP_HANDLE_CRC, false) < 0)  {
-		nfc_perror (r.pdi, "nfc_configure");
+    nfc_perror(r.pdi, "nfc_device_set_property_bool crc");
     exit(EXIT_FAILURE);
   }
 
   // Request plain tag-nonce
-	// fprintf(stdout, "\t[Nt]:\t");
+  // TODO: Set NP_EASY_FRAMING option only once if possible
-	if (!nfc_configure (r.pdi, NDO_EASY_FRAMING, false)) {
+  if (nfc_device_set_property_bool(r.pdi, NP_EASY_FRAMING, false) < 0) {
-		nfc_perror (r.pdi, "nfc_configure");
+    nfc_perror(r.pdi, "nfc_device_set_property_bool framing");
     exit(EXIT_FAILURE);
   }
 
-	if (!nfc_initiator_transceive_bytes(r.pdi, Auth, 4, Rx, &RxLen)) {
+  if (nfc_initiator_transceive_bytes(r.pdi, Auth, 4, Rx, sizeof(Rx), 0) < 0) {
     fprintf(stdout, "Error while requesting plain tag-nonce\n");
     exit(EXIT_FAILURE);
   }
 
-	if (!nfc_configure (r.pdi, NDO_EASY_FRAMING, true)) {
+  if (nfc_device_set_property_bool(r.pdi, NP_EASY_FRAMING, true) < 0) {
-		nfc_perror (r.pdi, "nfc_configure");
+    nfc_perror(r.pdi, "nfc_device_set_property_bool");
     exit(EXIT_FAILURE);
   }
   // print_hex(Rx, 4);
@@ -620,7 +753,7 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
   }
 
   // Load (plain) uid^nt into the cipher {48..79} bits
-	crypto1_word(pcs, bytes_to_num(Rx, 4) ^ t.uid, 0);
+  crypto1_word(pcs, bytes_to_num(Rx, 4) ^ t.authuid, 0);
 
   // Generate (encrypted) nr+parity by loading it into the cipher
   for (i = 0; i < 4; i++) {
@@ -640,14 +773,18 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
   }
 
   // Finally we want to send arbitrary parity bits
-	nfc_configure(r.pdi, NDO_HANDLE_PARITY, false);
+  if (nfc_device_set_property_bool(r.pdi, NP_HANDLE_PARITY, false) < 0) {
+    nfc_perror(r.pdi, "nfc_device_set_property_bool parity");
+    exit(EXIT_FAILURE);
+  }
 
   // Transmit reader-answer
   // fprintf(stdout, "\t{Ar}:\t");
   // print_hex_par(ArEnc, 64, ArEncPar);
-	if ((!nfc_initiator_transceive_bits(r.pdi, ArEnc, 64, ArEncPar, Rx, &RxLen, RxPar)) || (RxLen != 32)) {
+  int res;
-		fprintf(stderr, "Reader-answer transfer error, exiting..\n");
+  if (((res = nfc_initiator_transceive_bits(r.pdi, ArEnc, 64, ArEncPar, Rx, sizeof(Rx), RxPar)) < 0) || (res != 32)) {
-		exit(1);
+    ERR("Reader-answer transfer error, exiting..");
+    exit(EXIT_FAILURE);
   }
 
   // Now print the answer from the tag
@@ -657,8 +794,8 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
   // Decrypt the tag answer and verify that suc3(Nt) is At
   Nt = prng_successor(Nt, 32);
   if (!((crypto1_word(pcs, 0x00, 0) ^ bytes_to_num(Rx, 4)) == (Nt & 0xFFFFFFFF))) {
-		fprintf(stderr, "[At] is not Suc3(Nt), something is wrong, exiting..\n");
+    ERR("[At] is not Suc3(Nt), something is wrong, exiting..");
-		exit(1);
+    exit(EXIT_FAILURE);
   }
   // fprintf(stdout, "Authentication completed.\n\n");
 
@@ -674,9 +811,9 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
       }
 
       // Sending the encrypted Auth command
-			if (!nfc_initiator_transceive_bits(r.pdi, AuthEnc, 32, AuthEncPar,Rx, &RxLen, RxPar)) {
+      if (nfc_initiator_transceive_bits(r.pdi, AuthEnc, 32, AuthEncPar, Rx, sizeof(Rx), RxPar) < 0) {
         fprintf(stdout, "Error requesting encrypted tag-nonce\n");
-				exit(1);
+        exit(EXIT_FAILURE);
       }
 
       // Decrypt the encrypted auth
@@ -685,7 +822,7 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
       } else {
         pcs = crypto1_create(bytes_to_num(t.sectors[e_sector].KeyB, 6));
       }
-			NtLast = bytes_to_num(Rx, 4) ^ crypto1_word(pcs, bytes_to_num(Rx, 4) ^ t.uid, 1); 
+      NtLast = bytes_to_num(Rx, 4) ^ crypto1_word(pcs, bytes_to_num(Rx, 4) ^ t.authuid, 1);
 
       // Save the determined nonces distance
       d->distances[m] = nonce_distance(Nt, NtLast);
@@ -702,15 +839,15 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
         ArEnc[i] = crypto1_byte(pcs, 0x00, 0) ^(Nt & 0xFF);
         ArEncPar[i] = filter(pcs->odd) ^ oddparity(Nt);
       }
-			nfc_configure(r.pdi,NDO_HANDLE_PARITY,false);
+      nfc_device_set_property_bool(r.pdi, NP_HANDLE_PARITY, false);
-			if ((!nfc_initiator_transceive_bits(r.pdi, ArEnc, 64, ArEncPar, Rx, &RxLen, RxPar)) || (RxLen != 32)) {
+      if (((res = nfc_initiator_transceive_bits(r.pdi, ArEnc, 64, ArEncPar, Rx, sizeof(Rx), RxPar)) < 0) || (res != 32)) {
-				fprintf(stderr, "Reader-answer transfer error, exiting..\n");
+        ERR("Reader-answer transfer error, exiting..");
-				exit(1);
+        exit(EXIT_FAILURE);
       }
       Nt = prng_successor(Nt, 32);
       if (!((crypto1_word(pcs, 0x00, 0) ^ bytes_to_num(Rx, 4)) == (Nt & 0xFFFFFFFF))) {
-				fprintf(stderr, "[At] is not Suc3(Nt), something is wrong, exiting..\n");
+        ERR("[At] is not Suc3(Nt), something is wrong, exiting..");
-				exit(1);
+        exit(EXIT_FAILURE);
       }
     } // Next auth probe
 
@@ -722,9 +859,9 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
   // If we are in "Get Recovery" mode
   if (mode == 'r') {
     // Again, prepare the Auth command with MC_AUTH_A, recover the block and CRC
-		Auth[0] = dumpKeysA ? 0x60 : 0x61;
+    Auth[0] = dumpKeysA ? MC_AUTH_A : MC_AUTH_B;
     Auth[1] = a_sector;
-		append_iso14443a_crc(Auth,2);
+    iso14443a_crc_append(Auth, 2);
 
     // Encryption of the Auth command, sending the Auth command
     for (i = 0; i < 4; i++) {
@@ -732,9 +869,20 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
       // Encrypt the parity bits with the 4 plaintext bytes
       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, sizeof(Rx), RxPar) < 0) {
-			fprintf(stdout, "Error requesting encrypted tag-nonce\n");
+      ERR("while requesting encrypted tag-nonce");
-			exit(1);
+      exit(EXIT_FAILURE);
+    }
+
+    // Finally we want to send arbitrary parity bits
+    if (nfc_device_set_property_bool(r.pdi, NP_HANDLE_PARITY, true) < 0)  {
+      nfc_perror(r.pdi, "nfc_device_set_property_bool parity restore M");
+      exit(EXIT_FAILURE);
+    }
+
+    if (nfc_device_set_property_bool(r.pdi, NP_HANDLE_CRC, true) < 0)  {
+      nfc_perror(r.pdi, "nfc_device_set_property_bool crc restore M");
+      exit(EXIT_FAILURE);
     }
 
     // Save the encrypted nonce
@@ -757,12 +905,12 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
       revstate_start = NULL;
       if (valid_nonce(NtProbe, NtEnc, Ks1, d->parity)) {
         // And finally recover the first 32 bits of the key
-				revstate = lfsr_recovery32(Ks1, NtProbe ^ t.uid);
+        revstate = lfsr_recovery32(Ks1, NtProbe ^ t.authuid);
         if (revstate_start == NULL) {
           revstate_start = revstate;
         }
         while ((revstate->odd != 0x0) || (revstate->even != 0x0)) {
-					lfsr_rollback_word(revstate, NtProbe ^ t.uid, 0);
+          lfsr_rollback_word(revstate, NtProbe ^ t.authuid, 0);
           crypto1_get_lfsr(revstate, &lfsr);
           // Allocate a new space for keys
           if (((kcount % MEM_CHUNK) == 0) || (kcount >= pk->size)) {
@@ -770,8 +918,8 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
             // fprintf(stdout, "New chunk by %d, sizeof %lu\n", kcount, pk->size * sizeof(uint64_t));
             pk->possibleKeys = (uint64_t *) realloc((void *)pk->possibleKeys, pk->size * sizeof(uint64_t));
             if (pk->possibleKeys == NULL) {
-							fprintf(stderr, "Memory allocation error for pk->possibleKeys\n"); 
+              ERR("Memory allocation error for pk->possibleKeys");
-							exit(1);
+              exit(EXIT_FAILURE);
             }
           }
           pk->possibleKeys[kcount] = lfsr;
@@ -786,8 +934,8 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
     if (kcount != 0) {
       pk->size = --kcount;
       if ((pk->possibleKeys = (uint64_t *) realloc((void *)pk->possibleKeys, pk->size * sizeof(uint64_t))) == NULL) {
-				fprintf(stderr, "Memory allocation error for pk->possibleKeys\n"); 
+        ERR("Memory allocation error for pk->possibleKeys");
-				exit(1);
+        exit(EXIT_FAILURE);
       }
     }
   }
@@ -796,9 +944,10 @@ int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d
 }
 
 // Return the median value from the nonce distances array
-uint32_t median(denonce d) {
+uint32_t median(denonce d)
+{
   int middle = (int) d.num_distances / 2;
-	qsort(d.distances, d.num_distances, sizeof(u_int32_t), compar_int);
+  qsort(d.distances, d.num_distances, sizeof(uint32_t), compar_int);
 
   if (d.num_distances % 2 == 1) {
     // Odd number of elements
@@ -809,17 +958,20 @@ uint32_t median(denonce d) {
   }
 }
 
-int compar_int(const void * a, const void * b) {
+int compar_int(const void *a, const void *b)
+{
   return (*(uint64_t *)b - * (uint64_t *)a);
 }
 
 // Compare countKeys structure
-int compar_special_int(const void * a, const void * b) {
+int compar_special_int(const void *a, const void *b)
+{
   return (((countKeys *)b)->count - ((countKeys *)a)->count);
 }
 
-countKeys * uniqsort(uint64_t * possibleKeys, uint32_t size) {
+countKeys *uniqsort(uint64_t *possibleKeys, uint32_t size)
-	int i, j = 0;
+{
+  unsigned int i, j = 0;
   int count = 0;
   countKeys *our_counts;
 
@@ -827,8 +979,8 @@ countKeys * uniqsort(uint64_t * possibleKeys, uint32_t size) {
 
   our_counts = calloc(size, sizeof(countKeys));
   if (our_counts == NULL) {
-		fprintf(stderr, "Memory allocation error for our_counts\n");
+    ERR("Memory allocation error for our_counts");
-		exit(1);
+    exit(EXIT_FAILURE);
   }
 
   for (i = 0; i < size; i++) {
@@ -847,23 +999,25 @@ countKeys * uniqsort(uint64_t * possibleKeys, uint32_t size) {
 
 
 // Return 1 if the nonce is invalid else return 0
-int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, byte_t * parity) {
+int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity)
+{
   return ((odd_parity((Nt >> 24) & 0xFF) == ((parity[0]) ^ odd_parity((NtEnc >> 24) & 0xFF) ^ BIT(Ks1, 16))) & \
           (odd_parity((Nt >> 16) & 0xFF) == ((parity[1]) ^ odd_parity((NtEnc >> 16) & 0xFF) ^ BIT(Ks1, 8))) & \
           (odd_parity((Nt >> 8) & 0xFF) == ((parity[2]) ^ odd_parity((NtEnc >> 8) & 0xFF) ^ BIT(Ks1, 0)))) ? 1 : 0;
 }
 
-void num_to_bytes(uint64_t n, uint32_t len, byte_t* dest) {
+void num_to_bytes(uint64_t n, uint32_t len, uint8_t *dest)
+{
   while (len--) {
-		dest[len] = (byte_t) n;
+    dest[len] = (uint8_t) n;
     n >>= 8;
   }
 }
 
-long long unsigned int bytes_to_num(byte_t* src, uint32_t len) {
+long long unsigned int bytes_to_num(uint8_t *src, uint32_t len)
-	uint64_t num = 0;
-	while (len--)
 {
+  uint64_t num = 0;
+  while (len--) {
     num = (num << 8) | (*src);
     src++;
   }

src/mfoc.h

@@ -24,28 +24,28 @@
 #define odd_parity(i) (( (i) ^ (i)>>1 ^ (i)>>2 ^ (i)>>3 ^ (i)>>4 ^ (i)>>5 ^ (i)>>6 ^ (i)>>7 ^ 1) & 0x01)
 
 typedef struct {
-	byte_t KeyA[6];
+  uint8_t KeyA[6];
-	byte_t KeyB[6];
+  uint8_t KeyB[6];
   bool foundKeyA;
   bool foundKeyB;
-        byte_t trailer;                         // Value of a trailer block
+  uint8_t trailer;                         // Value of a trailer block
 } sector;
 
 typedef struct {
-        u_int32_t       *distances;
+  uint32_t       *distances;
-        u_int32_t       median;
+  uint32_t       median;
-        u_int32_t       num_distances;
+  uint32_t       num_distances;
-        u_int32_t       tolerance;
+  uint32_t       tolerance;
-        byte_t          parity[3];              // used for 3 bits of parity information
+  uint8_t        parity[3];              // used for 3 bits of parity information
 } denonce;                                      // Revealed information about nonce
 
 typedef struct {
-        nfc_target_info_t  ti;
+  nfc_target	 nt;
   sector         *sectors;                // Allocate later, we do not know the number of sectors yet
   sector         e_sector;		// Exploit sector
-        uint32_t        num_sectors;
+  uint8_t        num_sectors;
-        uint32_t        num_blocks;
+  uint8_t        num_blocks;
-        uint32_t        uid;
+  uint32_t       authuid;
   bool           b4K;
 } mftag;
 
@@ -60,7 +60,7 @@ typedef struct {
 } bKeys;
 
 typedef struct {
-        nfc_device_t    *pdi;
+  nfc_device     *pdi;
 } mfreader;
 
 typedef struct {
@@ -70,17 +70,17 @@ typedef struct {
 
 
 void usage(FILE *stream, int errno);
-void mf_init(mftag *t, mfreader *r);
+void mf_init(mfreader *r);
-void mf_configure(nfc_device_t* pdi);
+void mf_configure(nfc_device *pdi);
-void mf_select_tag(nfc_device_t* pdi, nfc_target_info_t* ti);
+void mf_select_tag(nfc_device *pdi, nfc_target *pnt);
 int trailer_block(uint32_t block);
 int find_exploit_sector(mftag t);
 void mf_anticollision(mftag t, mfreader r);
 int mf_enhanced_auth(int e_sector, int a_sector, mftag t, mfreader r, denonce *d, pKeys *pk, char mode, bool dumpKeysA);
 uint32_t median(denonce d);
 int compar_int(const void *a, const void *b);
-int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, byte_t * parity);
+int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity);
 int compar_special_int(const void *a, const void *b);
 countKeys *uniqsort(uint64_t *possibleKeys, uint32_t size);
-void num_to_bytes(uint64_t n, uint32_t len, byte_t* dest);
+void num_to_bytes(uint64_t n, uint32_t len, uint8_t *dest);
-long long unsigned int bytes_to_num(byte_t* src, uint32_t len);
+long long unsigned int bytes_to_num(uint8_t *src, uint32_t len);

src/mifare.c

@@ -1,3 +1,50 @@
+/*-
+ * Public platform independent Near Field Communication (NFC) library examples
+ *
+ * Copyright (C) 2009 Roel Verdult
+ * Copyright (C) 2010 Romain Tartière
+ * Copyright (C) 2010, 2011, 2013 Romuald Conty
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *  1) Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  2 )Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Note that this license only applies on the examples, NFC library itself is under LGPL
+ *
+ */
+
+/**
+ * @file mifare.c
+ * @brief provide samples structs and functions to manipulate MIFARE Classic and Ultralight tags using libnfc
+ */
+
+/*
+ * This implementation was written based on information provided by the
+ * following document:
+ *
+ * MIFARE Classic Specification
+ *  MF1ICS50
+ *  Functional specification
+ *  Rev. 5.3 - 29 January 2008
+ *  http://www.nxp.com/acrobat/other/identification/M001053_MF1ICS50_rev5_3.pdf
+ */
+
 #include "mifare.h"
 
 #include <string.h>
@@ -5,29 +52,33 @@
 #include <nfc/nfc.h>
 
 /**
- * @brief Execute a MIFARE Classic Command
+ * @brief Execute a MIFARE Classic command
- * @return Returns true if action was successfully performed; otherwise returns false.
+ * @return Returns NFC_SUCCESS if action was successfully performed; otherwise returns error code (negative value).
  * @param pmp Some commands need additional information. This information should be supplied in the mifare_param union.
  *
- * The specified MIFARE command will be executed on the tag. There are different commands possible, they all require the destination block number.
+ * The specified MIFARE command will be executed on the tag. There are
+ * different commands possible, they all require the destination block number.
+ *
  * @note There are three different types of information (Authenticate, Data and Value).
  *
  * First an authentication must take place using Key A or B. It requires a 48 bit Key (6 bytes) and the UID.
- * They are both used to initialize the internal cipher-state of the PN53X chip (http://libnfc.org/hardware/pn53x-chip).
  * After a successful authentication it will be possible to execute other commands (e.g. Read/Write).
- * The MIFARE Classic Specification (http://www.nxp.com/acrobat/other/identification/M001053_MF1ICS50_rev5_3.pdf) explains more about this process.
+ *
+ * Like libnfc's functions, this one returns negative value on error (libnfc's
+ * error code) but two of them need a special attention in this context (MIFARE
+ * Classic):
+ *  - NFC_EMFCAUTHFAIL, "MIFARE authentication failed", means key is not valid
+ *  on specified sector.
+ *  - NFC_ERFTRANS, "Invalid received frame", when occurs on MIFARE command
+ *  read or write after a successful authentication, means permissions allowed
+ *  by current acces bytes are not sufficient to process the command.
  */
-bool
+int
-nfc_initiator_mifare_cmd (nfc_device_t * pnd, const mifare_cmd mc, const uint8_t ui8Block, mifare_param * pmp)
+nfc_initiator_mifare_cmd(nfc_device *pnd, const mifare_cmd mc, const uint8_t ui8Block, mifare_param *pmp)
 {
-  byte_t  abtRx[265];
+  uint8_t  abtRx[265];
-  size_t  szRxLen;
   size_t  szParamLen;
-  byte_t  abtCmd[265];
+  uint8_t  abtCmd[265];
-
-  // Make sure we are dealing with a active device
-  if (!pnd->bActive)
-    return false;
 
   abtCmd[0] = mc;               // The MIFARE Classic command
   abtCmd[1] = ui8Block;         // The block address (1K=0x00..0x39, 4K=0x00..0xff)
@@ -42,45 +93,49 @@ nfc_initiator_mifare_cmd (nfc_device_t * pnd, const mifare_cmd mc, const uint8_t
       // Authenticate command
     case MC_AUTH_A:
     case MC_AUTH_B:
-    szParamLen = sizeof (mifare_param_auth);
+      szParamLen = sizeof(struct mifare_param_auth);
       break;
 
       // Data command
     case MC_WRITE:
-    szParamLen = sizeof (mifare_param_data);
+      szParamLen = sizeof(struct mifare_param_data);
       break;
 
       // Value command
     case MC_DECREMENT:
     case MC_INCREMENT:
     case MC_TRANSFER:
-    szParamLen = sizeof (mifare_param_value);
+      szParamLen = sizeof(struct mifare_param_value);
       break;
 
       // Please fix your code, you never should reach this statement
     default:
-    return false;
+      return NFC_EINVARG;
       break;
   }
 
   // When available, copy the parameter bytes
   if (szParamLen)
-    memcpy (abtCmd + 2, (byte_t *) pmp, szParamLen);
+    memcpy(abtCmd + 2, (uint8_t *) pmp, szParamLen);
 
-  // Fire the mifare command
+  // FIXME: Save and restore bEasyFraming
-  if (!nfc_initiator_transceive_bytes (pnd, abtCmd, 2 + szParamLen, abtRx, &szRxLen)) {
+  int res;
-    if (pnd->iLastError != 0x14)
+  if ((res = nfc_device_set_property_bool(pnd, NP_EASY_FRAMING, true)) < 0) {
-      nfc_perror (pnd, "nfc_initiator_transceive_bytes");
+    return res;
-    return false;
   }
+  // Fire the mifare command
+  if ((res = nfc_initiator_transceive_bytes(pnd, abtCmd, 2 + szParamLen, abtRx, sizeof(abtRx), -1))  < 0) {
+    return res;
+  }
+
   // When we have executed a read command, copy the received bytes into the param
   if (mc == MC_READ) {
-    if (szRxLen == 16) {
+    if (res == 16) {
       memcpy(pmp->mpd.abtData, abtRx, 16);
     } else {
-      return false;
+      return NFC_EINVARG;
     }
   }
   // Command succesfully executed
-  return true;
+  return NFC_SUCCESS;
 }

src/mifare.h

@@ -1,23 +1,36 @@
+/*-
+ * Public platform independent Near Field Communication (NFC) library examples
+ *
+ * Copyright (C) 2009 Roel Verdult
+ * Copyright (C) 2010 Romain Tartière
+ * Copyright (C) 2010, 2011, 2013 Romuald Conty
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *  1) Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  2 )Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Note that this license only applies on the examples, NFC library itself is under LGPL
+ *
+ */
+
 /**
- * Public platform independent Near Field Communication (NFC) library
+ * @file mifare.h
- * 
- * Copyright (C) 2009, Roel Verdult, 2010, Romuald Conty
- * 
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
- * 
- * @file mifaretag.h
  * @brief provide samples structs and functions to manipulate MIFARE Classic and Ultralight tags using libnfc
  */
 
@@ -26,7 +39,7 @@
 
 #include <nfc/nfc-types.h>
 
-// Compiler directive, set struct alignment to 1 byte_t for compatibility
+// Compiler directive, set struct alignment to 1 uint8_t for compatibility
 #pragma pack(1)
 
 typedef enum {
@@ -41,50 +54,50 @@ typedef enum {
 } mifare_cmd;
 
 // MIFARE command params
-typedef struct {
+struct mifare_param_auth {
-  byte_t  abtKey[6];
+  uint8_t  abtKey[6];
-  byte_t  abtUid[4];
+  uint8_t  abtAuthUid[4];
-} mifare_param_auth;
+};
 
-typedef struct {
+struct mifare_param_data {
-  byte_t  abtData[16];
+  uint8_t  abtData[16];
-} mifare_param_data;
+};
 
-typedef struct {
+struct mifare_param_value {
-  byte_t  abtValue[4];
+  uint8_t  abtValue[4];
-} mifare_param_value;
+};
 
 typedef union {
-  mifare_param_auth mpa;
+  struct mifare_param_auth mpa;
-  mifare_param_data mpd;
+  struct mifare_param_data mpd;
-  mifare_param_value mpv;
+  struct mifare_param_value mpv;
 } mifare_param;
 
 // Reset struct alignment to default
 #  pragma pack()
 
-bool    nfc_initiator_mifare_cmd (nfc_device_t * pnd, const mifare_cmd mc, const uint8_t ui8Block, mifare_param * pmp);
+int    nfc_initiator_mifare_cmd(nfc_device *pnd, const mifare_cmd mc, const uint8_t ui8Block, mifare_param *pmp);
 
-// Compiler directive, set struct alignment to 1 byte_t for compatibility
+// Compiler directive, set struct alignment to 1 uint8_t for compatibility
 #  pragma pack(1)
 
 // MIFARE Classic
 typedef struct {
-  byte_t  abtUID[4];
+  uint8_t  abtUID[4];
-  byte_t  btBCC;
+  uint8_t  btBCC;
-  byte_t  btUnknown;
+  uint8_t  btUnknown;
-  byte_t  abtATQA[2];
+  uint8_t  abtATQA[2];
-  byte_t  abtUnknown[8];
+  uint8_t  abtUnknown[8];
 } mifare_classic_block_manufacturer;
 
 typedef struct {
-  byte_t  abtData[16];
+  uint8_t  abtData[16];
 } mifare_classic_block_data;
 
 typedef struct {
-  byte_t  abtKeyA[6];
+  uint8_t  abtKeyA[6];
-  byte_t  abtAccessBits[4];
+  uint8_t  abtAccessBits[4];
-  byte_t  abtKeyB[6];
+  uint8_t  abtKeyB[6];
 } mifare_classic_block_trailer;
 
 typedef union {
@@ -99,17 +112,17 @@ typedef struct {
 
 // MIFARE Ultralight
 typedef struct {
-  byte_t  sn0[3];
+  uint8_t  sn0[3];
-  byte_t  btBCC0;
+  uint8_t  btBCC0;
-  byte_t  sn1[4];
+  uint8_t  sn1[4];
-  byte_t  btBCC1;
+  uint8_t  btBCC1;
-  byte_t  internal;
+  uint8_t  internal;
-  byte_t  lock[2];
+  uint8_t  lock[2];
-  byte_t  otp[4];
+  uint8_t  otp[4];
 } mifareul_block_manufacturer;
 
 typedef struct {
-  byte_t  abtData[16];
+  uint8_t  abtData[16];
 } mifareul_block_data;
 
 typedef union {

src/nfc-utils.c

@@ -1,44 +1,65 @@
+/*-
+ * Free/Libre Near Field Communication (NFC) library
+ *
+ * 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:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *  1) Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  2 )Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Note that this license only applies on the examples, NFC library itself is under LGPL
+ *
+ */
+/**
+ * @file nfc-utils.c
+ * @brief Provide some examples shared functions like print, parity calculation, options parsing.
+ */
 #include <nfc/nfc.h>
+#include <err.h>
 
 #include "nfc-utils.h"
 
-static const byte_t OddParity[256] = {
+uint8_t
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+oddparity(const uint8_t bt)
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1
-};
-
-byte_t
-oddparity (const byte_t bt)
 {
-  return OddParity[bt];
+  // cf http://graphics.stanford.edu/~seander/bithacks.html#ParityParallel
+  return (0x9669 >> ((bt ^(bt >> 4)) & 0xF)) & 1;
 }
 
 void
-oddparity_bytes_ts (const byte_t * pbtData, const size_t szLen, byte_t * pbtPar)
+oddparity_bytes_ts(const uint8_t *pbtData, const size_t szLen, uint8_t *pbtPar)
 {
   size_t  szByteNr;
   // Calculate the parity bits for the command
   for (szByteNr = 0; szByteNr < szLen; szByteNr++) {
-    pbtPar[szByteNr] = OddParity[pbtData[szByteNr]];
+    pbtPar[szByteNr] = oddparity(pbtData[szByteNr]);
   }
 }
 
 void
-print_hex (const byte_t * pbtData, const size_t szBytes)
+print_hex(const uint8_t *pbtData, const size_t szBytes)
 {
   size_t  szPos;
 
@@ -49,7 +70,7 @@ print_hex (const byte_t * pbtData, const size_t szBytes)
 }
 
 void
-print_hex_bits (const byte_t * pbtData, const size_t szBits)
+print_hex_bits(const uint8_t *pbtData, const size_t szBits)
 {
   uint8_t uRemainder;
   size_t  szPos;
@@ -71,7 +92,7 @@ print_hex_bits (const byte_t * pbtData, const size_t szBits)
 }
 
 void
-print_hex_par (const byte_t * pbtData, const size_t szBits, const byte_t * pbtDataPar)
+print_hex_par(const uint8_t *pbtData, const size_t szBits, const uint8_t *pbtDataPar)
 {
   uint8_t uRemainder;
   size_t  szPos;
@@ -79,7 +100,7 @@ print_hex_par (const byte_t * pbtData, const size_t szBits, const byte_t * pbtDa
 
   for (szPos = 0; szPos < szBytes; szPos++) {
     printf("%02x", pbtData[szPos]);
-    if (OddParity[pbtData[szPos]] != pbtDataPar[szPos]) {
+    if (oddparity(pbtData[szPos]) != pbtDataPar[szPos]) {
       printf("! ");
     } else {
       printf("  ");
@@ -97,95 +118,11 @@ print_hex_par (const byte_t * pbtData, const size_t szBits, const byte_t * pbtDa
   printf("\n");
 }
 
-#define SAK_ISO14443_4_COMPLIANT 0x20
-#define SAK_ISO18092_COMPLIANT   0x40
-
 void
-print_nfc_iso14443a_info (const nfc_iso14443a_info_t nai)
+print_nfc_target(const nfc_target *pnt, bool verbose)
 {
-  printf ("    ATQA (SENS_RES): ");
+  char *s;
-  print_hex (nai.abtAtqa, 2);
+  str_nfc_target(&s, pnt, verbose);
-  printf ("       UID (NFCID%c): ", (nai.abtUid[0] == 0x08 ? '3' : '1'));
+  printf("%s", s);
-  print_hex (nai.abtUid, nai.szUidLen);
+  nfc_free(s);
-  printf ("      SAK (SEL_RES): ");
-  print_hex (&nai.btSak, 1);
-  if (nai.szAtsLen) {
-    printf ("          ATS (ATR): ");
-    print_hex (nai.abtAts, nai.szAtsLen);
-  }
-  if ((nai.btSak & SAK_ISO14443_4_COMPLIANT) || (nai.btSak & SAK_ISO18092_COMPLIANT)) {
-    printf ("     Compliant with: ");
-    if (nai.btSak & SAK_ISO14443_4_COMPLIANT)
-      printf ("ISO/IEC 14443-4 ");
-    if (nai.btSak & SAK_ISO18092_COMPLIANT)
-      printf ("ISO/IEC 18092");
-    printf ("\n");
-  }
-}
-
-void
-print_nfc_felica_info (const nfc_felica_info_t nfi)
-{
-  printf ("        ID (NFCID2): ");
-  print_hex (nfi.abtId, 8);
-  printf ("    Parameter (PAD): ");
-  print_hex (nfi.abtPad, 8);
-}
-
-void
-print_nfc_iso14443b_info (const nfc_iso14443b_info_t nbi)
-{
-  printf ("               ATQB: ");
-  print_hex (nbi.abtAtqb, 12);
-  printf ("                 ID: ");
-  print_hex (nbi.abtId, 4);
-  printf ("                CID: %02x\n", nbi.btCid);
-  if (nbi.szInfLen > 0) {
-    printf ("                INF: ");
-    print_hex (nbi.abtInf, nbi.szInfLen);
-  }
-  printf ("             PARAMS: %02x %02x %02x %02x\n", nbi.btParam1, nbi.btParam2, nbi.btParam3, nbi.btParam4);
-}
-
-/**
- * @brief Tries to parse arguments to find device descriptions.
- * @return Returns the list of found device descriptions.
- */
-nfc_device_desc_t *
-parse_device_desc (int argc, const char *argv[], size_t * szFound)
-{
-  nfc_device_desc_t *pndd = 0;
-  int     arg;
-  *szFound = 0;
-
-  // Get commandline options
-  for (arg = 1; arg < argc; arg++) {
-
-    if (0 == strcmp (argv[arg], "--device")) {
-
-      if (argc > arg + 1) {
-        char    buffer[256];
-
-        pndd = malloc (sizeof (nfc_device_desc_t));
-
-        strncpy (buffer, argv[++arg], 256);
-
-        // Driver.
-        pndd->pcDriver = (char *) malloc (256);
-        strcpy (pndd->pcDriver, strtok (buffer, ":"));
-
-        // Port.
-        pndd->pcPort = (char *) malloc (256);
-        strcpy (pndd->pcPort, strtok (NULL, ":"));
-
-        // Speed.
-        sscanf (strtok (NULL, ":"), "%u", &pndd->uiSpeed);
-
-        *szFound = 1;
-      }
-      break;
-    }
-  }
-
-  return pndd;
 }

src/nfc-utils.h

@@ -1,22 +1,39 @@
+/*-
+ * Free/Libre Near Field Communication (NFC) library
+ *
+ * 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:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *  1) Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  2 )Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Note that this license only applies on the examples, NFC library itself is under LGPL
+ *
+ */
+
 /**
- * Public platform independent Near Field Communication (NFC) library
- * 
- * Copyright (C) 2010, Romuald Conty
- * 
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
- * 
  * @file nfc-utils.h
  * @brief Provide some examples shared functions like print, parity calculation, options parsing.
  */
@@ -26,18 +43,61 @@
 
 #  include <stdlib.h>
 #  include <string.h>
+#  include <err.h>
 
-byte_t  oddparity (const byte_t bt);
+/**
-void    oddparity_byte_ts (const byte_t * pbtData, const size_t szLen, byte_t * pbtPar);
+ * @macro DBG
+ * @brief Print a message of standard output only in DEBUG mode
+ */
+#ifdef DEBUG
+#  define DBG(...) do { \
+    warnx ("DBG %s:%d", __FILE__, __LINE__); \
+    warnx ("    " __VA_ARGS__ ); \
+  } while (0)
+#else
+#  define DBG(...) {}
+#endif
 
-void    print_hex (const byte_t * pbtData, const size_t szLen);
+/**
-void    print_hex_bits (const byte_t * pbtData, const size_t szBits);
+ * @macro WARN
-void    print_hex_par (const byte_t * pbtData, const size_t szBits, const byte_t * pbtDataPar);
+ * @brief Print a warn message
+ */
+#ifdef DEBUG
+#  define WARN(...) do { \
+    warnx ("WARNING %s:%d", __FILE__, __LINE__); \
+    warnx ("    " __VA_ARGS__ ); \
+  } while (0)
+#else
+#  define WARN(...) warnx ("WARNING: " __VA_ARGS__ )
+#endif
 
-void    print_nfc_iso14443a_info (const nfc_iso14443a_info_t nai);
+/**
-void    print_nfc_iso14443b_info (const nfc_iso14443b_info_t nbi);
+ * @macro ERR
-void    print_nfc_felica_info (const nfc_felica_info_t nfi);
+ * @brief Print a error message
+ */
+#ifdef DEBUG
+#  define ERR(...) do { \
+    warnx ("ERROR %s:%d", __FILE__, __LINE__); \
+    warnx ("    " __VA_ARGS__ ); \
+  } while (0)
+#else
+#  define ERR(...)  warnx ("ERROR: " __VA_ARGS__ )
+#endif
 
-nfc_device_desc_t *parse_device_desc (int argc, const char *argv[], size_t * szFound);
+#ifndef MIN
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+#ifndef MAX
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+
+uint8_t  oddparity(const uint8_t bt);
+void    oddparity_bytes_ts(const uint8_t *pbtData, const size_t szLen, uint8_t *pbtPar);
+
+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);
 
 #endif