Merge pull request #81 from mdp/fixguard

[proxmark3-svn] / common / desfire.h

diff --git a/common/desfire.h b/common/desfire.h
index c163c5c5ff26852b2cb16be35f552f7c88515064..a2b0599e949891557f14284e4d20332f961e05dc 100644 (file)
--- a/common/desfire.h
+++ b/common/desfire.h
@@ -3,8 +3,8 @@
 
 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>

-

 #include "aes.h"
 #include "aes.h"

+#include "mifare.h"

 
 #define MAX_CRYPTO_BLOCK_SIZE 16
 /* Mifare DESFire EV1 Application crypto operations */
 
 #define MAX_CRYPTO_BLOCK_SIZE 16
 /* Mifare DESFire EV1 Application crypto operations */


@@ -110,8 +110,6 @@ enum DESFIRE_FILE_TYPES {
     MDFT_CYCLIC_RECORD_FILE_WITH_BACKUP = 0x04
 };
 
     MDFT_CYCLIC_RECORD_FILE_WITH_BACKUP = 0x04
 };
 

-
-

 enum DESFIRE_STATUS {
     OPERATION_OK                               = 0x00,
     NO_CHANGES                                         = 0x0c,
 enum DESFIRE_STATUS {
     OPERATION_OK                               = 0x00,
     NO_CHANGES                                         = 0x0c,