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

Sync nfc-utils.[hc] with devel libnfc files

Browse source
This commit is contained in:
Romuald Conty 2013-04-04 23:55:00 +02:00
parent ba7e75cd16
commit e5024608f3
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mfoc.c
View file

@ -82,8 +82,6 @@ int main(int argc, char *const argv[])
// Array with default Mifare Classic keys // Array with default Mifare Classic keys
uint8_t defaultKeys[][6] = { uint8_t defaultKeys[][6] = {
{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, // Default key (first key used by program if no user defined key) {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
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // Blank key {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // Blank key
{0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5}, {0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5},
{0x4d, 0x3a, 0x99, 0xc3, 0x51, 0xdd}, {0x4d, 0x3a, 0x99, 0xc3, 0x51, 0xdd},
@ -251,7 +249,7 @@ int main(int argc, char *const argv[])
t.sectors[s].foundKeyA = t.sectors[s].foundKeyB = false; t.sectors[s].foundKeyA = t.sectors[s].foundKeyB = false;
} }
print_nfc_target(t.nt, true); print_nfc_target(&t.nt, true);
fprintf(stdout, "\nTry to authenticate to all sectors with default keys...\n"); 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"); fprintf(stdout, "Symbols: '.' no key found, '/' A key found, '\\' B key found, 'x' both keys found\n");

18
src/nfc-utils.c
View file

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

14
src/nfc-utils.h
View file

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