diff --git a/configure.ac b/configure.ac index 381ea5c..dd3d60f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,15 +1,13 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.64]) AC_INIT([mfcuk], [0.3.1], [zveriu@gmail.com]) -AM_INIT_AUTOMAKE - AC_CONFIG_MACRO_DIR([m4]) +AC_PROG_CC + AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) # Checks for libnfc. @@ -36,10 +34,10 @@ if test x"$WITH_NFC" = "x0"; then fi fi CFLAGS="$CFLAGS $LIBNFC_CFLAGS" -AC_CHECK_HEADERS([nfc/nfc.h],[WITH_NFC=1], AC_MSG_ERROR([A version of libnfc greater than or equal to 1.3 is required])) +AC_CHECK_HEADERS([nfc/nfc.h],[WITH_NFC=1], AC_MSG_ERROR([A version of libnfc greater than or equal to $LIBNFC_REQUIRED_VERSION is required])) if test x"$WITH_NFC" = "x0"; then - AC_MSG_ERROR([A version of libnfc greater than or equal to 1.3 is required.]) + AC_MSG_ERROR([A version of libnfc greater than or equal to $LIBNFC_REQUIRED_VERSION is required.]) fi # Checks for programs. @@ -49,6 +47,8 @@ AC_PROG_CC AC_CHECK_LIB([nfc], [nfc_version]) # Checks for header files. +AC_CHECK_HEADERS([byteswap.h]) +AC_CHECK_HEADERS([endian.h sys/endian.h CoreFoundation/CoreFoundation.h]) AC_CHECK_HEADERS([stdint.h stdlib.h string.h sys/time.h unistd.h]) # Checks for typedefs, structures, and compiler characteristics. diff --git a/src/Makefile.am b/src/Makefile.am index d57ba0d..c32a1b6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,6 @@ mfcuk_keyrecovery_darkside_SOURCES = \ mfcuk_mifare.c \ mfcuk_utils.c \ mifare.c \ - mirror-subr.c \ nfc-utils.c mfcuk_keyrecovery_darkside_LDADD = -lnfc -lusb -lpcsclite diff --git a/src/mfcuk_keyrecovery_darkside.c b/src/mfcuk_keyrecovery_darkside.c index d851216..1dc45b2 100644 --- a/src/mfcuk_keyrecovery_darkside.c +++ b/src/mfcuk_keyrecovery_darkside.c @@ -19,9 +19,6 @@ Package: MiFare Classic Universal toolKit (MFCUK) - Package version: - 0.1 - Filename: mfcuk_keyrecovery_darkside.c @@ -116,17 +113,33 @@ -------------------------------------------------------------------------------- */ +#include "config.h" + +#if defined(HAVE_SYS_TYPES_H) +# include +#endif + +#if defined(HAVE_SYS_ENDIAN_H) +# include +#endif + +#if defined(HAVE_ENDIAN_H) +# include +#endif + +#if defined(HAVE_COREFOUNDATION_COREFOUNDATION_H) +# include +#endif + +#if defined(HAVE_BYTESWAP_H) +# include +#endif + #include #include #include #include -#ifdef __FreeBSD__ -# include -#else -# include -#endif - #ifdef WIN32 #define NOMINMAX #include "windows.h" @@ -151,7 +164,6 @@ // imported from libnfc's examples #include "mifare.h" #include "nfc-utils.h" -#include "mirror-subr.h" // internal #include "mfcuk_mifare.h" @@ -241,7 +253,7 @@ uint32_t mfcuk_verify_key_block(nfc_device_t* pnd, uint32_t uiUID, uint64_t ui64 nfc_configure (pnd, NDO_EASY_FRAMING, true); // Save the tag nonce (nt) - nt = bswap32(*((uint32_t *) &abtRx)); + nt = bswap_32(*((uint32_t *) &abtRx)); nt_orig = nt; // Init cipher with key @@ -396,7 +408,7 @@ uint32_t mfcuk_key_recovery_block(nfc_device_t* pnd, uint32_t uiUID, uint64_t ui //print_hex(abtRx,4); // Save the tag nonce (nt) - nt = bswap32(*((uint32_t *) &abtRx)); + nt = bswap_32(*((uint32_t *) &abtRx)); // zveriu //printf("INFO - Nonce distance %d (from 0x%08x, to 0x%08x)\n", nonce_distance(nt, nt_orig), nt, nt_orig); @@ -1080,7 +1092,7 @@ int main(int argc, char* argv[]) if (st >= MIFARE_CLASSIC_UID_BYTELENGTH) { - tag_recover_verify.uid = bswap32(*((uint32_t *) &uidOpt)); + tag_recover_verify.uid = bswap_32(*((uint32_t *) &uidOpt)); memcpy( tag_recover_verify.tag_basic.amb[0].mbm.abtUID, uidOpt, MIFARE_CLASSIC_UID_BYTELENGTH ); bfOpts[ch] = true; } @@ -1460,7 +1472,7 @@ int main(int argc, char* argv[]) memcpy( ptr_trailer, ptr_trailer_dump, sizeof(*ptr_trailer) ); tag_recover_verify.type = tag_recover_verify.tag_basic.amb[0].mbm.btUnknown; - tag_recover_verify.uid = bswap32 (*((uint32_t *) &(tag_recover_verify.tag_basic.amb[0].mbm.abtUID))); + tag_recover_verify.uid = bswap_32 (*((uint32_t *) &(tag_recover_verify.tag_basic.amb[0].mbm.abtUID))); } } @@ -1511,13 +1523,13 @@ int main(int argc, char* argv[]) } // Tag on the reader UID - tag_on_reader.uid = bswap32(*((uint32_t *) &(ti.nai.abtUid))); + tag_on_reader.uid = bswap_32(*((uint32_t *) &(ti.nai.abtUid))); memcpy( tag_on_reader.tag_basic.amb[0].mbm.abtUID, ti.nai.abtUid, MIFARE_CLASSIC_UID_BYTELENGTH); // No command line tag UID specified, take it from the tag on the reader if ( !bfOpts['U'] ) { - tag_recover_verify.uid = bswap32(*((uint32_t *) &(ti.nai.abtUid))); + tag_recover_verify.uid = bswap_32(*((uint32_t *) &(ti.nai.abtUid))); memcpy( tag_recover_verify.tag_basic.amb[0].mbm.abtUID, ti.nai.abtUid, MIFARE_CLASSIC_UID_BYTELENGTH); } diff --git a/src/mfcuk_keyrecovery_darkside.h b/src/mfcuk_keyrecovery_darkside.h index 608ae28..251e9a4 100644 --- a/src/mfcuk_keyrecovery_darkside.h +++ b/src/mfcuk_keyrecovery_darkside.h @@ -2,9 +2,6 @@ Package: MiFare Classic Universal toolKit (MFCUK) - Package version: - 0.1 - Filename: mfcuk_keyrecovery_darkside.h @@ -53,8 +50,6 @@ #define _MFCUK_KEYRECOVERY_DARKSIDE_H_ // Define package and executable related info -#define PACKAGE_NAME "MFCUK - MiFare Classic Universal toolKit" -#define PACKAGE_VERSION "0.1" #define BUILD_NAME "Mifare Classic DarkSide Key Recovery Tool" #define BUILD_VERSION "0.3" #define BUILD_AUTHOR "Andrei Costin, zveriu@gmail.com, http://andreicostin.com" diff --git a/src/mirror-subr.c b/src/mirror-subr.c deleted file mode 100644 index 4685293..0000000 --- a/src/mirror-subr.c +++ /dev/null @@ -1,82 +0,0 @@ -/*- - * Public platform independent Near Field Communication (NFC) library - * - * Copyright (C) 2009, Roel Verdult - * - * 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 - */ - - /** - * @file mirror-subr.c - * @brief - */ - -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif // HAVE_CONFIG_H - -#include - -#include "mirror-subr.h" - -static const byte_t ByteMirror[256] = { - 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, - 0xb0, 0x70, 0xf0, 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, 0x18, 0x98, - 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, - 0xe4, 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, 0x0c, 0x8c, 0x4c, 0xcc, - 0x2c, 0xac, 0x6c, 0xec, 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, 0x02, - 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, - 0x72, 0xf2, 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, 0x1a, 0x9a, 0x5a, - 0xda, 0x3a, 0xba, 0x7a, 0xfa, 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, - 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, 0x0e, 0x8e, 0x4e, 0xce, 0x2e, - 0xae, 0x6e, 0xee, 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, 0x01, 0x81, - 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, - 0xf1, 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, 0x19, 0x99, 0x59, 0xd9, - 0x39, 0xb9, 0x79, 0xf9, 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, 0x15, - 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, - 0x6d, 0xed, 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, 0x03, 0x83, 0x43, - 0xc3, 0x23, 0xa3, 0x63, 0xe3, 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, - 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, - 0xbb, 0x7b, 0xfb, 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, 0x17, 0x97, - 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, - 0xef, 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff -}; - -byte_t mirror(byte_t bt) -{ - return ByteMirror[bt]; -} - -void mirror_bytes(byte_t *pbts, size_t szLen) -{ - size_t szByteNr; - - for (szByteNr=0; szByteNr - * - * - * @file mirror-subr.h - * @brief - */ - -#ifndef _LIBNFC_MIRROR_SUBR_H_ -#define _LIBNFC_MIRROR_SUBR_H_ - -#include - -#include - - -byte_t mirror(byte_t bt); -uint32_t mirror32(uint32_t ui32Bits); -uint64_t mirror64(uint64_t ui64Bits); -void mirror_byte_ts(byte_t *pbts, size_t szLen); - -#endif // _LIBNFC_MIRROR_SUBR_H_