From 995c94dc0331e9410db747ef5a4a580c32cedff8 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sat, 21 Jan 2017 10:25:29 +0100 Subject: [PATCH 1/1] CHG: moved to header file --- armsrc/desfire_crypto.h | 2 -- armsrc/desfire_key.c | 2 +- armsrc/desfire_key.h | 8 +++++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/armsrc/desfire_crypto.h b/armsrc/desfire_crypto.h index 47da8354..df5a6887 100644 --- a/armsrc/desfire_crypto.h +++ b/armsrc/desfire_crypto.h @@ -2,10 +2,8 @@ #define __DESFIRE_CRYPTO_H #include -//#include #include #include "printf.h" - #include "iso14443a.h" #include "../common/desfire.h" #include "des.h" diff --git a/armsrc/desfire_key.c b/armsrc/desfire_key.c index 9ae2c3f0..800ff6da 100644 --- a/armsrc/desfire_key.c +++ b/armsrc/desfire_key.c @@ -16,7 +16,7 @@ * * $Id$ */ -#include + #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 0d99903e..df932643 100644 --- a/armsrc/desfire_key.h +++ b/armsrc/desfire_key.h @@ -1,7 +1,10 @@ #ifndef __DESFIRE_KEY_INCLUDED #define __DESFIRE_KEY_INCLUDED -#include "iso14443a.h" -// desfire_key.h + +#include +#include +#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); @@ -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); - #endif \ No newline at end of file -- 2.39.2