From d6a9da4e4b97beb2f564b6d5665bb804c5f171c9 Mon Sep 17 00:00:00 2001 From: "rconty@il4p.fr" Date: Fri, 1 Apr 2011 09:17:40 +0000 Subject: [PATCH] Silent some warnings. --- configure.ac | 2 ++ src/mfcuk_keyrecovery_darkside.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 8baa292..241698c 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,8 @@ 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]) +AC_DEFINE(_XOPEN_SOURCE, 600, [Enable POSIX extensions if present]) + # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL AC_TYPE_SIZE_T diff --git a/src/mfcuk_keyrecovery_darkside.c b/src/mfcuk_keyrecovery_darkside.c index 65bef70..a82a455 100644 --- a/src/mfcuk_keyrecovery_darkside.c +++ b/src/mfcuk_keyrecovery_darkside.c @@ -138,6 +138,7 @@ #include #include #include +#include #include #include @@ -1593,7 +1594,7 @@ int main(int argc, char* argv[]) if ( !mfcuk_key_arr_to_uint64( &(current_default_keys[j][0]), &crntVerifKey) ) { - WARN("mfcuk_key_arr_to_uint64() failed, verification key will be %012llx", crntVerifKey); + WARN("mfcuk_key_arr_to_uint64() failed, verification key will be %012"PRIx64"", crntVerifKey); } /* @@ -1630,7 +1631,7 @@ int main(int argc, char* argv[]) } else { - ERR("AUTH sector %d, block %d, key %012llx, key-type 0x%02x, error code 0x%02x", i, block, crntVerifKey, k, uiErrCode); + ERR("AUTH sector %d, block %d, key %012"PRIx64", key-type 0x%02x, error code 0x%02x", i, block, crntVerifKey, k, uiErrCode); } // Reset advanced settings @@ -1646,7 +1647,7 @@ int main(int argc, char* argv[]) if ( !nfc_initiator_mifare_cmd(pnd, k, block, &mp) ) { - ERR("AUTH sector %d, block %d, key %012llx, key-type 0x%02x, error code 0x%02x", i, block, crntVerifKey, k, uiErrCode); + ERR("AUTH sector %d, block %d, key %012"PRIx64", key-type 0x%02x, error code 0x%02x", i, block, crntVerifKey, k, uiErrCode); } else { @@ -1757,7 +1758,7 @@ int main(int argc, char* argv[]) if ( !mfcuk_key_uint64_to_arr( &ui64KeyRecovered, (j == keyA)?(&(ptr_trailer->abtKeyA[0])):(&(ptr_trailer->abtKeyB[0])) ) ) { - WARN("mfcuk_key_uint64_to_arr() failed, recovered key should have been %012llx", ui64KeyRecovered); + WARN("mfcuk_key_uint64_to_arr() failed, recovered key should have been %012"PRIx64"", ui64KeyRecovered); } } } // for (j=keyA; j<=keyB; j++)