Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / client / nonce2key / nonce2key.h

diff --git a/client/nonce2key/nonce2key.h b/client/nonce2key/nonce2key.h
index dd0701465d65ca386de718f8d76325215e84014a..e7d5f431194f92a4777bc2726c66aad8038ff0b4 100644 (file)
--- a/client/nonce2key/nonce2key.h
+++ b/client/nonce2key/nonce2key.h
@@ -10,10 +10,14 @@
 // MIFARE Darkside hack
 //-----------------------------------------------------------------------------
 
-#include "crapto1.h"
-#include <inttypes.h>
+#ifndef __NONCE2KEY_H
+#define __NONCE2KEY_H
+
 #include <stdio.h>
+#include <stdlib.h>
+#include "crapto1.h"
+#include "common.h"
 
-typedef unsigned char byte_t;
+int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key); 
 
-int nonce2key(uint32_t uid, uint32_t nt, uint64_t par_info, uint64_t ks_info, uint64_t * key); 
\ No newline at end of file
+#endif