ADD: lf indalademod output, The binary string is now printed with linebreaks every...

[proxmark3-svn] / armsrc / desfire_crypto.c

diff --git a/armsrc/desfire_crypto.c b/armsrc/desfire_crypto.c
index b77ad8ef9141c05cb0e42c52e9e51da04c0d2aaf..8bb8034838afb89e82fad9e7378e0dda11c9636f 100644 (file)
--- a/armsrc/desfire_crypto.c
+++ b/armsrc/desfire_crypto.c
@@ -27,9 +27,8 @@
  */
 #include "desfire_crypto.h"
 
-static void      xor (const uint8_t *ivect, uint8_t *data, const size_t len);
-
-static size_t    key_macing_length (desfirekey_t key);
+static void xor (const uint8_t *ivect, uint8_t *data, const size_t len);
+static size_t key_macing_length (desfirekey_t key);
 
 static void xor (const uint8_t *ivect, uint8_t *data, const size_t len) {
     for (size_t i = 0; i < len; i++) {
@@ -321,7 +320,7 @@ void* mifare_cryto_postprocess_data (desfiretag_t tag, void *data, ssize_t *nbyt
                     *nbytes = -1;
                     res = NULL;
 #ifdef WITH_DEBUG
-                    printf ("No room for MAC!");
+                    Dbprintf ("No room for MAC!");
 #endif
                     break;
                 }
@@ -336,7 +335,7 @@ void* mifare_cryto_postprocess_data (desfiretag_t tag, void *data, ssize_t *nbyt
 
                 if (0 != memcmp ((uint8_t *)data + *nbytes - 1, (uint8_t *)edata + edl - 8, 4)) {
 #ifdef WITH_DEBUG
-                    printf ("MACing not verified");
+                    Dbprintf ("MACing not verified");
                     hexdump ((uint8_t *)data + *nbytes - 1, key_macing_length (key), "Expect ", 0);
                     hexdump ((uint8_t *)edata + edl - 8, key_macing_length (key), "Actual ", 0);
 #endif
@@ -366,7 +365,7 @@ void* mifare_cryto_postprocess_data (desfiretag_t tag, void *data, ssize_t *nbyt
                 ((uint8_t *)data)[*nbytes - 9] = first_cmac_byte;
                 if (0 != memcmp (DESFIRE (tag)->cmac, (uint8_t *)data + *nbytes - 9, 8)) {
 #ifdef WITH_DEBUG
-                    printf ("CMAC NOT verified :-(");
+                    Dbprintf ("CMAC NOT verified :-(");
                     hexdump ((uint8_t *)data + *nbytes - 9, 8, "Expect ", 0);
                     hexdump (DESFIRE (tag)->cmac, 8, "Actual ", 0);
 #endif