From ea73746d323e0d57a1f4291f45ea2acf51e9cdf2 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 10 Jun 2020 09:02:58 +0200 Subject: [PATCH] text --- armsrc/Standalone/hf_msdsal.c | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/armsrc/Standalone/hf_msdsal.c b/armsrc/Standalone/hf_msdsal.c index e9f700a01..f97dc0d7c 100644 --- a/armsrc/Standalone/hf_msdsal.c +++ b/armsrc/Standalone/hf_msdsal.c @@ -119,7 +119,7 @@ static uint8_t treatPDOL(uint8_t *apdu) { //Generate GET PROCES void RunMod(void) { StandAloneMode(); - Dbprintf(_YELLOW_(">>") "Reading Visa cards & Emulating a Visa MSD Transaction a.k.a. MSDSal Started<<"); + DbpString(_YELLOW_(">>") "Reading Visa cards & Emulating a Visa MSD Transaction a.k.a. MSDSal Started " _YELLOW_("<<")); FpgaDownloadAndGo(FPGA_BITSTREAM_HF); //For reading process @@ -206,10 +206,10 @@ void RunMod(void) { //Checking if the user wants to go directly to emulation mode using a hardcoded track 2 if (chktoken == true && token[0] != 0x00) { state = STATE_EMU; - Dbprintf(_YELLOW_("[") "Initialized emulation mode " _YELLOW_("]")); + DbpString(_YELLOW_("[ ") "Initialized emulation mode" _YELLOW_(" ]")); DbpString("\n"_YELLOW_("!!") "Waiting for a card reader..."); } else { - DbpString(_YELLOW_("[") "Initialized reading mode " _YELLOW_("]")); + DbpString(_YELLOW_("[ ") "Initialized reading mode" _YELLOW_(" ]")); DbpString("\n"_YELLOW_("!!") "Waiting for a Visa card..."); } @@ -228,12 +228,12 @@ void RunMod(void) { if (state == STATE_READ) { if (chktoken == true && token[0] != 0x00) { //Only change to emulation if it saved a track 2 in memory state = STATE_EMU; - Dbprintf(_YELLOW_("[") "In emulation mode " _YELLOW_("]")); + DbpString(_YELLOW_("[ ") "In emulation mode" _YELLOW_(" ]")); } else - Dbprintf(_YELLOW_("!!") "Nothing in memory to emulate"); + DbpString(_YELLOW_("!!") "Nothing in memory to emulate"); } else { state = STATE_READ; - Dbprintf(_YELLOW_("[") "In reading mode " _YELLOW_("]")); + DbpString(_YELLOW_("[ ") "In reading mode" _YELLOW_(" ]")); } } @@ -248,7 +248,7 @@ void RunMod(void) { if (iso14443a_select_card(NULL, &card_a_info, NULL, true, 0, false)) { - Dbprintf(_YELLOW_("+") "Found ISO 14443 Type A!"); + DbpString(_YELLOW_("+") "Found ISO 14443 Type A!"); for (uint8_t i = 0; i < 4; i++) { chktoken = false; @@ -257,11 +257,11 @@ void RunMod(void) { uint8_t apdulen = iso14_apdu(apdus[i], (uint16_t) apdusLen[i], false, apdubuffer, NULL); if (apdulen > 0) { - Dbprintf(_YELLOW_("[") "Proxmark command " _YELLOW_("]")); + DbpString(_YELLOW_("[ ") "Proxmark command" _YELLOW_(" ]")); Dbhexdump(apdusLen[i], apdus[i], false); - Dbprintf(_GREEN_("[") "Card answer " _GREEN_("]")); + DbpString(_GREEN_("[ ") "Card answer" _GREEN_(" ]")); Dbhexdump(apdulen - 2, apdubuffer, false); - Dbprintf("----"); + DbpString("----"); for (uint8_t u = 0; u < apdulen; u++) { if (i == 1) { @@ -284,24 +284,24 @@ void RunMod(void) { } if (i == 1) { - Dbprintf(_GREEN_("[") "Challenge generated " _GREEN_("]")); + DbpString(_GREEN_("[ ") "Challenge generated" _GREEN_(" ]")); Dbhexdump(plen, existpdol ? ppdol : processing, false); } } else { - Dbprintf(_YELLOW_("!!") "Error reading the card"); + DbpString(_YELLOW_("!!") "Error reading the card"); } LED_B_OFF(); } if (chktoken) { - Dbprintf(_RED_("[") "Track 2 " _RED_("]")); + DbpString(_RED_("[ ") "Track 2" _RED_(" ]")); Dbhexdump(19, (uint8_t *)token, false); - Dbprintf(_YELLOW_("!!") "Card number"); + DbpString(_YELLOW_("!!") "Card number"); Dbhexdump(8, (uint8_t *)token, false); DbpString("---"); LED_C_ON(); state = STATE_EMU; - Dbprintf(_YELLOW_("[") "Initialized emulation mode " _YELLOW_("]")); + DbpString(_YELLOW_("[ ") "Initialized emulation mode" _YELLOW_(" ]")); DbpString("\n"_YELLOW_("!!") "Waiting for a card reader..."); } } @@ -318,7 +318,7 @@ void RunMod(void) { DbpString(_YELLOW_("!!") "Error initializing the emulation process!"); SpinDelay(500); state = STATE_READ; - DbpString(_YELLOW_("[") "Initialized reading mode " _YELLOW_("]")); + DbpString(_YELLOW_("[ ") "Initialized reading mode" _YELLOW_(" ]")); DbpString("\n" _YELLOW_("!!") "Waiting for a Visa card..."); break; } @@ -336,7 +336,7 @@ void RunMod(void) { LED_B_OFF(); // Clean receive command buffer if (!GetIso14443aCommandFromReader(receivedCmd, receivedCmdPar, &len)) { - Dbprintf(_YELLOW_("!!") "Emulator stopped"); + DbpString(_YELLOW_("!!") "Emulator stopped"); retval = PM3_EOPABORTED; break; } @@ -367,7 +367,7 @@ void RunMod(void) { DbpString(_YELLOW_("+") "Request for RATS"); p_response = &responses[RATS]; } else { - Dbprintf(_YELLOW_("[") "Card reader command " _YELLOW_("]")); + DbpString(_YELLOW_("[ ") "Card reader command" _YELLOW_(" ]")); Dbhexdump(len, receivedCmd, false); if (receivedCmd[0] == 0x02 || receivedCmd[0] == 0x03) { //Emulate a Visa MSD(Magnetic stripe data) card @@ -408,7 +408,7 @@ void RunMod(void) { } } } else { - Dbprintf(_YELLOW_("!!") "Received unknown command!"); + DbpString(_YELLOW_("!!") "Received unknown command!"); if (prevCmd < 4) { memcpy(dynamic_response_info.response, receivedCmd, len); dynamic_response_info.response_n = len; @@ -418,9 +418,9 @@ void RunMod(void) { } } if (dynamic_response_info.response_n > 0) { - Dbprintf(_GREEN_("[") "Proxmark3 answer " _GREEN_("]")); + DbpString(_GREEN_("[ ") "Proxmark3 answer" _GREEN_(" ]")); Dbhexdump(dynamic_response_info.response_n, dynamic_response_info.response, false); - Dbprintf("----"); + DbpString("----"); // Add CRC bytes, always used in ISO 14443A-4 compliant cards AddCrc14A(dynamic_response_info.response, dynamic_response_info.response_n);