CHG: moved to header file

diff --git a/armsrc/desfire_crypto.h b/armsrc/desfire_crypto.h
index 47da8354c50ae2058092daca7f6e1feff0ae428b..df5a6887786957199fc42bb30f8a3f437ea55a3d 100644 (file)
--- a/armsrc/desfire_crypto.h
+++ b/armsrc/desfire_crypto.h
@@ -2,10 +2,8 @@
 #define __DESFIRE_CRYPTO_H
 
 #include <string.h>
 #define __DESFIRE_CRYPTO_H
 
 #include <string.h>

-//#include <strings.h>

 #include <stdarg.h>
 #include "printf.h"
 #include <stdarg.h>
 #include "printf.h"

-

 #include "iso14443a.h"
 #include "../common/desfire.h"
 #include "des.h"
 #include "iso14443a.h"
 #include "../common/desfire.h"
 #include "des.h"

diff --git a/armsrc/desfire_key.c b/armsrc/desfire_key.c
index 9ae2c3f0c74d4a8f5bdad95247ffb3cade561b58..800ff6da6a826eb7b3979556acbcf3300ef91cd3 100644 (file)
--- a/armsrc/desfire_key.c
+++ b/armsrc/desfire_key.c
@@ -16,7 +16,7 @@
  * 
  * $Id$
  */
  * 
  * $Id$
  */

-#include <stdlib.h>
+

 #include "desfire_key.h"
 
 static inline void update_key_schedules (desfirekey_t key);
 #include "desfire_key.h"
 
 static inline void update_key_schedules (desfirekey_t key);

diff --git a/armsrc/desfire_key.h b/armsrc/desfire_key.h
index 0d99903ec49c2c9e718d8188f4b99c8d543046cb..df932643f8df8bb199ae54734b3d5d8b08562e9d 100644 (file)
--- a/armsrc/desfire_key.h
+++ b/armsrc/desfire_key.h
@@ -1,7 +1,10 @@
 #ifndef __DESFIRE_KEY_INCLUDED
 #define __DESFIRE_KEY_INCLUDED
 #ifndef __DESFIRE_KEY_INCLUDED
 #define __DESFIRE_KEY_INCLUDED

-#include "iso14443a.h"
-// desfire_key.h
+
+#include <stdlib.h>
+#include <stdint.h>
+#include "desfire.h"
+#include "iso14443a.h" //test

 void           Desfire_des_key_new (const uint8_t value[8], desfirekey_t key);
 void           Desfire_3des_key_new (const uint8_t value[16], desfirekey_t key);
 void           Desfire_des_key_new_with_version (const uint8_t value[8], desfirekey_t key);
 void           Desfire_des_key_new (const uint8_t value[8], desfirekey_t key);
 void           Desfire_3des_key_new (const uint8_t value[16], desfirekey_t key);
 void           Desfire_des_key_new_with_version (const uint8_t value[8], desfirekey_t key);


@@ -13,5 +16,4 @@ void          Desfire_aes_key_new_with_version (const uint8_t value[16], uint8_t versio
 uint8_t        Desfire_key_get_version (desfirekey_t key);
 void           Desfire_key_set_version (desfirekey_t key, uint8_t version);
 void           Desfire_session_key_new (const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey, desfirekey_t key);
 uint8_t        Desfire_key_get_version (desfirekey_t key);
 void           Desfire_key_set_version (desfirekey_t key, uint8_t version);
 void           Desfire_session_key_new (const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey, desfirekey_t key);

-

 #endif
\ No newline at end of file
 #endif
\ No newline at end of file