github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

hf_aveful: last minute code formatting

Browse source
This commit is contained in:
Ave 2020-09-03 18:44:30 +03:00
commit 2687d9f3ec
No known key found for this signature in database
GPG key ID: 398DD7BD03276F6D
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
armsrc/Standalone/hf_aveful.c
View file

@ -8,11 +8,11 @@
// main code for HF Mifare Ultralight read/simulation by Ave Ozkal // main code for HF Mifare Ultralight read/simulation by Ave Ozkal
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/* Several parts of this code is based on code by Craig Young from HF_YOUNG */ // Several parts of this code is based on code by Craig Young from HF_YOUNG
/* This code does not: // This code does not:
- Account for cards with authentication (MFU EV1 etc) // - Account for cards with authentication (MFU EV1 etc)
- Determine if cards have block count that's not the same as the BLOCKS def */ // - Determine if cards have block count that's not the same as the BLOCKS def
#include "standalone.h" // standalone definitions #include "standalone.h" // standalone definitions
#include "proxmark3_arm.h" #include "proxmark3_arm.h"
@ -80,20 +80,17 @@ void RunMod(void) {
DbpString("Found ultralight with UID: "); DbpString("Found ultralight with UID: ");
Dbhexdump(card.uidlen, card.uid, 0); Dbhexdump(card.uidlen, card.uid, 0);
state = STATE_READ; state = STATE_READ;
} } else {
else {
DbpString("Found non-ultralight card, ignoring."); DbpString("Found non-ultralight card, ignoring.");
} }
} }
} } else if (state == STATE_READ) {
else if (state == STATE_READ) {
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
iso14443a_select_card(NULL, NULL, NULL, true, 0, true); iso14443a_select_card(NULL, NULL, NULL, true, 0, true);
bool read_successful = true; bool read_successful = true;
Dbprintf("Contents:"); Dbprintf("Contents:");
for (int i = 0; i < BLOCKS; i++) for (int i = 0; i < BLOCKS; i++) {
{
uint8_t dataout[4] = {0x00}; uint8_t dataout[4] = {0x00};
if (mifare_ultra_readblock(i, dataout)) { if (mifare_ultra_readblock(i, dataout)) {
// If there's an error reading, go back to search state // If there's an error reading, go back to search state
@ -113,8 +110,7 @@ void RunMod(void) {
Dbprintf("Read failure, going back to search state."); Dbprintf("Read failure, going back to search state.");
state = STATE_SEARCH; state = STATE_SEARCH;
} }
} } else if (state == 2) {
else if (state == 2) {
uint8_t flags = FLAG_7B_UID_IN_DATA; uint8_t flags = FLAG_7B_UID_IN_DATA;
Dbprintf("Starting simulation, press pm3-button to stop and go back to search state."); Dbprintf("Starting simulation, press pm3-button to stop and go back to search state.");