Merge branch 'master' of https://github.com/Proxmark/proxmark3

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

diff --git a/client/nonce2key/nonce2key.h b/client/nonce2key/nonce2key.h
index c195d97421e1fc2849da9f3232bc889c839ebf01..e7d5f431194f92a4777bc2726c66aad8038ff0b4 100644 (file)
--- a/client/nonce2key/nonce2key.h
+++ b/client/nonce2key/nonce2key.h
@@ -13,12 +13,11 @@
 #ifndef __NONCE2KEY_H
 #define __NONCE2KEY_H
 
 #ifndef __NONCE2KEY_H
 #define __NONCE2KEY_H
 

-#include <inttypes.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>

 #include "crapto1.h"
 #include "crapto1.h"

+#include "common.h"

 
 

-typedef unsigned char byte_t;
-
-int nonce2key(uint32_t uid, uint32_t nt, uint64_t par_info, uint64_t ks_info, uint64_t * key); 
+int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key); 

 
 #endif
 
 #endif