X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2Fciphers_def.h;h=98e445c400c605055e0cd7a625685c1a1e559777;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hp=499b7db89135ccc8344b8a2e81a80e26e2735991;hpb=80b4db88b6f302b1ff088f4312c7b4e9d4aa1fb4;p=silc.git

diff --git a/lib/silccrypt/ciphers_def.h b/lib/silccrypt/ciphers_def.h
index 499b7db8..98e445c4 100644
--- a/lib/silccrypt/ciphers_def.h
+++ b/lib/silccrypt/ciphers_def.h
@@ -23,8 +23,8 @@
 
 /* General definitions for algorithms */
 typedef unsigned char u1byte;
-typedef uint32 u4byte;
-typedef uint32 u32;
+typedef SilcUInt32 u4byte;
+typedef SilcUInt32 u32;
 
 #define rotr(x, nr) (((x) >> ((int)(nr))) | ((x) << (32 - (int)(nr))))
 #define rotl(x, nr) (((x) << ((int)(nr))) | ((x) >> (32 - (int)(nr))))
@@ -83,22 +83,22 @@ do {						\
   SILC_GET32_LSB(d[3], &s[12]);			\
 } while(0);
 
-#define SILC_CBC_DEC_POST(s, d, p, t, iv)	\
+#define SILC_CBC_DEC_POST(s, d, p, t, siv)	\
 do {						\
-  s[0] ^= iv[0];				\
-  s[1] ^= iv[1];				\
-  s[2] ^= iv[2];				\
-  s[3] ^= iv[3];				\
+  s[0] ^= siv[0];				\
+  s[1] ^= siv[1];				\
+  s[2] ^= siv[2];				\
+  s[3] ^= siv[3];				\
 						\
   SILC_PUT32_LSB(s[0], &d[0]);			\
   SILC_PUT32_LSB(s[1], &d[4]);			\
   SILC_PUT32_LSB(s[2], &d[8]);			\
   SILC_PUT32_LSB(s[3], &d[12]);			\
 						\
-  iv[0] = t[0];					\
-  iv[1] = t[1];					\
-  iv[2] = t[2];					\
-  iv[3] = t[3];					\
+  siv[0] = t[0];				\
+  siv[1] = t[1];				\
+  siv[2] = t[2];				\
+  siv[3] = t[3];				\
 						\
   d += 16;					\
   p += 16;					\