Merge branch 'master' into fix_hfmfsim

[proxmark3-svn] / client / mfkey.h

diff --git a/client/mfkey.h b/client/mfkey.h
index ad5a863da0ae0095c30a222d7de146eca1c73a35..be32fe1bd890a8c9bd827907b0cf74e28f940a00 100644 (file)
--- a/client/mfkey.h
+++ b/client/mfkey.h
@@ -15,19 +15,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
 
 #include <stdint.h>
 #include <stdbool.h>

-
-typedef struct {
-                         uint32_t cuid;
-                         uint8_t  sector;
-                         uint8_t  keytype;
-                         uint32_t nonce;
-                         uint32_t ar;
-                         uint32_t nr;
-                         uint32_t at;
-                         uint32_t nonce2;
-                         uint32_t ar2;
-                         uint32_t nr2;
-                       } nonces_t;
+#include "mifare.h"

 
 extern bool mfkey32(nonces_t data, uint64_t *outputkey);
 extern bool mfkey32_moebius(nonces_t data, uint64_t *outputkey);
 
 extern bool mfkey32(nonces_t data, uint64_t *outputkey);
 extern bool mfkey32_moebius(nonces_t data, uint64_t *outputkey);