fixing some warnings (AES); simplifyning AES headers (now simply include "aes.h"...

[avr-crypto-lib.git] / aes / aes.h

diff --git a/aes/aes.h b/aes/aes.h
index 9d5b77087efed4dad22018ed795eceec26b9ca97..8e651f496d9d772864ba03cf47964232449c2692 100644 (file)
--- a/aes/aes.h
+++ b/aes/aes.h
@@ -19,38 +19,25 @@
 /**
  * \file     aes.h
  * \email    daniel.otte@rub.de
- * \author   Daniel Otte 
+ * \author   Daniel Otte
  * \date     2008-12-30
  * \license  GPLv3 or later
- * 
+ *
  */
 #ifndef AES_H_
 #define AES_H_
 
 #include <stdint.h>
 
-typedef struct{
-       uint8_t ks[16];
-} aes_roundkey_t;
-
-typedef struct{
-       aes_roundkey_t key[10+1];
-} aes128_ctx_t;
-
-typedef struct{
-       aes_roundkey_t key[12+1];
-} aes192_ctx_t;
-
-typedef struct{
-       aes_roundkey_t key[14+1];
-} aes256_ctx_t;
-
-typedef struct{
-       aes_roundkey_t key[1]; /* just to avoid the warning */
-} aes_genctx_t;
-
-typedef struct{
-       uint8_t s[16];
-} aes_cipher_state_t;
+#include "aes_types.h"
+#include "aes128_enc.h"
+#include "aes192_enc.h"
+#include "aes256_enc.h"
+#include "aes128_dec.h"
+#include "aes192_dec.h"
+#include "aes256_dec.h"
+#include "aes_enc.h"
+#include "aes_dec.h"
+#include "aes_keyschedule.h"
 
 #endif