Commit 5517f34b authored by kokke's avatar kokke Committed by GitHub
Browse files

Update aes.c

parent 63f9288c
...@@ -44,12 +44,12 @@ NOTE: String length must be evenly divisible by 16byte (str_len % 16 == 0) ...@@ -44,12 +44,12 @@ NOTE: String length must be evenly divisible by 16byte (str_len % 16 == 0)
#define Nb 4 #define Nb 4
#define BLOCKLEN 16 //Block length in bytes AES is 128b block only #define BLOCKLEN 16 //Block length in bytes AES is 128b block only
#ifdef AES256 #if defined(AES256) && (AES256 == 1)
#define Nk 8 #define Nk 8
#define KEYLEN 32 #define KEYLEN 32
#define Nr 14 #define Nr 14
#define keyExpSize 240 #define keyExpSize 240
#elif defined(AES192) #elif defined(AES192) && (AES192 == 1)
#define Nk 6 #define Nk 6
#define KEYLEN 24 #define KEYLEN 24
#define Nr 12 #define Nr 12
...@@ -214,7 +214,7 @@ static void KeyExpansion(void) ...@@ -214,7 +214,7 @@ static void KeyExpansion(void)
tempa[0] = tempa[0] ^ Rcon[i/Nk]; tempa[0] = tempa[0] ^ Rcon[i/Nk];
} }
#ifdef AES256 #if defined(AES256) && (AES256 == 1)
if (i % Nk == 4) if (i % Nk == 4)
{ {
// Function Subword() // Function Subword()
...@@ -453,7 +453,7 @@ static void InvCipher(void) ...@@ -453,7 +453,7 @@ static void InvCipher(void)
/*****************************************************************************/ /*****************************************************************************/
/* Public functions: */ /* Public functions: */
/*****************************************************************************/ /*****************************************************************************/
#if defined(ECB) && ECB #if defined(ECB) && (ECB == 1)
void AES_ECB_encrypt(const uint8_t* input, const uint8_t* key, uint8_t* output, const uint32_t length) void AES_ECB_encrypt(const uint8_t* input, const uint8_t* key, uint8_t* output, const uint32_t length)
...@@ -489,7 +489,7 @@ void AES_ECB_decrypt(const uint8_t* input, const uint8_t* key, uint8_t *output, ...@@ -489,7 +489,7 @@ void AES_ECB_decrypt(const uint8_t* input, const uint8_t* key, uint8_t *output,
#if defined(CBC) && CBC #if defined(CBC) && (CBC == 1)
static void XorWithIv(uint8_t* buf) static void XorWithIv(uint8_t* buf)
...@@ -575,4 +575,4 @@ void AES_CBC_decrypt_buffer(uint8_t* output, uint8_t* input, uint32_t length, co ...@@ -575,4 +575,4 @@ void AES_CBC_decrypt_buffer(uint8_t* output, uint8_t* input, uint32_t length, co
} }
} }
#endif // #if defined(CBC) && CBC #endif // #if defined(CBC) && (CBC == 1)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment