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

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

diff --git a/aes/aes_keyschedule.h b/aes/aes_keyschedule.h
index b013971df759b2b74f26d5c40c6e6bedeed94f5b..ab5786ab602bb1d706df99109b7078a513e8d8a3 100644 (file)
--- a/aes/aes_keyschedule.h
+++ b/aes/aes_keyschedule.h
@@ -19,7 +19,7 @@
 /**
  * \file     aes_keyschedule.h
  * \email    daniel.otte@rub.de
- * \author   Daniel Otte 
+ * \author   Daniel Otte
  * \date     2008-12-30
  * \license  GPLv3 or later
  * \ingroup  AES
@@ -29,10 +29,10 @@
 #ifndef AES_KEYSCHEDULE_H_
 #define AES_KEYSCHEDULE_H_
 
-#include "aes.h"
-/** \fn void aes_init(const void* key, uint16_t keysize_b, aes_genctx_t* ctx)
+#include "aes_types.h"
+/**
  * \brief initialize the keyschedule
- * 
+ *
  * This function computes the keyschedule from a given key with a given length
  * and stores it in the context variable
  * \param key       pointer to the key material
@@ -41,9 +41,9 @@
  */
 void aes_init(const void* key, uint16_t keysize_b, aes_genctx_t* ctx);
 
-/** \fn void aes128_init(const void* key, aes128_ctx_t* ctx)
+/**
  * \brief initialize the keyschedule for 128 bit key
- * 
+ *
  * This function computes the keyschedule from a given 128 bit key
  * and stores it in the context variable
  * \param key       pointer to the key material
@@ -51,9 +51,9 @@ void aes_init(const void* key, uint16_t keysize_b, aes_genctx_t* ctx);
  */
 void aes128_init(const void* key, aes128_ctx_t* ctx);
 
-/** \fn void aes192_init(const void* key, aes192_ctx_t* ctx)
+/**
  * \brief initialize the keyschedule for 192 bit key
- * 
+ *
  * This function computes the keyschedule from a given 192 bit key
  * and stores it in the context variable
  * \param key       pointer to the key material
@@ -61,9 +61,9 @@ void aes128_init(const void* key, aes128_ctx_t* ctx);
  */
 void aes192_init(const void* key, aes192_ctx_t* ctx);
 
-/** \fn void aes256_init(const void* key, aes256_ctx_t* ctx)
+/**
  * \brief initialize the keyschedule for 256 bit key
- * 
+ *
  * This function computes the keyschedule from a given 256 bit key
  * and stores it in the context variable
  * \param key       pointer to the key material
@@ -72,4 +72,4 @@ void aes192_init(const void* key, aes192_ctx_t* ctx);
 void aes256_init(const void* key, aes256_ctx_t* ctx);
 
 #endif /* AES_KEYSCHEDULE_H_ */
-       
+