Merge branch 'topic/mm-fixes' of git://208.110.73.182/silc into silc.1.1.branch

[silc.git] / lib / silccrypt / rijndael_internal.h

diff --git a/lib/silccrypt/rijndael_internal.h b/lib/silccrypt/rijndael_internal.h
index bd6051fd3771bb5eb5141e13d9a7628412316867..83a01f3c5d3596594531dda4b617d2b33f568017 100644 (file)
--- a/lib/silccrypt/rijndael_internal.h
+++ b/lib/silccrypt/rijndael_internal.h
@@ -44,6 +44,7 @@ typedef union {
 typedef struct {
   uint_32t ks[KS_LENGTH];
   aes_inf inf;
+  unsigned char pad[16];
 } aes_encrypt_ctx;
 
 typedef struct {
@@ -52,8 +53,10 @@ typedef struct {
 } aes_decrypt_ctx;
 
 typedef struct {
-  aes_encrypt_ctx enc;
-  aes_decrypt_ctx dec;
+  union {
+    aes_encrypt_ctx enc;
+    aes_decrypt_ctx dec;
+  } u;
 } AesContext;
 
 #define AES_RETURN void