X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2Faes.c;h=32bfc5c687b2ba5bd4ef9a0e4dc0f0befd786cff;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hp=163c51fa8d65b8bc27bb3d52036fc6666c5fcc6c;hpb=fd0c4d112ec084cfd310a1e45644a64ec6ac3efa;p=silc.git

diff --git a/lib/silccrypt/aes.c b/lib/silccrypt/aes.c
index 163c51fa..32bfc5c6 100644
--- a/lib/silccrypt/aes.c
+++ b/lib/silccrypt/aes.c
@@ -40,6 +40,7 @@ Mean:          500 cycles =    51.2 mbits/sec
 */
 
 #include "silcincludes.h"
+#include "rijndael_internal.h"
 #include "aes.h"
 
 /* 
@@ -50,7 +51,7 @@ Mean:          500 cycles =    51.2 mbits/sec
 
 SILC_CIPHER_API_SET_KEY(aes)
 {
-  uint32 k[8];
+  SilcUInt32 k[8];
 
   SILC_GET_WORD_KEY(key, k, keylen);
   rijndael_set_key((RijndaelContext *)context, k, keylen);
@@ -86,7 +87,7 @@ SILC_CIPHER_API_CONTEXT_LEN(aes)
 
 SILC_CIPHER_API_ENCRYPT_CBC(aes)
 {
-  uint32 tiv[4];
+  SilcUInt32 tiv[4];
   int i;
 
   SILC_CBC_GET_IV(tiv, iv);
@@ -111,7 +112,7 @@ SILC_CIPHER_API_ENCRYPT_CBC(aes)
 
 SILC_CIPHER_API_DECRYPT_CBC(aes)
 {
-  uint32 tmp[4], tmp2[4], tiv[4];
+  SilcUInt32 tmp[4], tmp2[4], tiv[4];
   int i;
 
   SILC_CBC_GET_IV(tiv, iv);
@@ -122,12 +123,12 @@ SILC_CIPHER_API_DECRYPT_CBC(aes)
 
   for (i = 16; i < len; i += 16) {
     SILC_CBC_DEC_PRE(tmp, src);
-    rijndael_decrypt((RijndaelContext *)context, tmp, tmp2);
+    rijndael_decrypt((RijndaelContext *)context, tmp, tmp2); 
     SILC_CBC_DEC_POST(tmp2, dst, src, tmp, tiv);
   }
-
+  
   SILC_CBC_PUT_IV(tiv, iv);
-
+  
   return TRUE;
 }