--- truecrypt/crypto/cast_lcl.h	2018/04/24 16:37:52	1.1
+++ truecrypt/crypto/cast_lcl.h	2018/04/24 16:43:23	1.1.1.2
@@ -61,10 +61,10 @@
 #endif
 
 #undef c2l
-#define c2l(c,l)	(l =((unsigned long)(*((c)++)))    , \
-			 l|=((unsigned long)(*((c)++)))<< 8L, \
-			 l|=((unsigned long)(*((c)++)))<<16L, \
-			 l|=((unsigned long)(*((c)++)))<<24L)
+#define c2l(c,l)	(l =((unsigned __int32)(*((c)++)))    , \
+			 l|=((unsigned __int32)(*((c)++)))<< 8L, \
+			 l|=((unsigned __int32)(*((c)++)))<<16L, \
+			 l|=((unsigned __int32)(*((c)++)))<<24L)
 
 /* NOTE - c is not incremented as per c2l */
 #undef c2ln
@@ -72,14 +72,14 @@
 			c+=n; \
 			l1=l2=0; \
 			switch (n) { \
-			case 8: l2 =((unsigned long)(*(--(c))))<<24L; \
-			case 7: l2|=((unsigned long)(*(--(c))))<<16L; \
-			case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \
-			case 5: l2|=((unsigned long)(*(--(c))));     \
-			case 4: l1 =((unsigned long)(*(--(c))))<<24L; \
-			case 3: l1|=((unsigned long)(*(--(c))))<<16L; \
-			case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \
-			case 1: l1|=((unsigned long)(*(--(c))));     \
+			case 8: l2 =((unsigned __int32)(*(--(c))))<<24L; \
+			case 7: l2|=((unsigned __int32)(*(--(c))))<<16L; \
+			case 6: l2|=((unsigned __int32)(*(--(c))))<< 8L; \
+			case 5: l2|=((unsigned __int32)(*(--(c))));     \
+			case 4: l1 =((unsigned __int32)(*(--(c))))<<24L; \
+			case 3: l1|=((unsigned __int32)(*(--(c))))<<16L; \
+			case 2: l1|=((unsigned __int32)(*(--(c))))<< 8L; \
+			case 1: l1|=((unsigned __int32)(*(--(c))));     \
 				} \
 			}
 
@@ -110,14 +110,14 @@
 			c+=n; \
 			l1=l2=0; \
 			switch (n) { \
-			case 8: l2 =((unsigned long)(*(--(c))))    ; \
-			case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
-			case 6: l2|=((unsigned long)(*(--(c))))<<16; \
-			case 5: l2|=((unsigned long)(*(--(c))))<<24; \
-			case 4: l1 =((unsigned long)(*(--(c))))    ; \
-			case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
-			case 2: l1|=((unsigned long)(*(--(c))))<<16; \
-			case 1: l1|=((unsigned long)(*(--(c))))<<24; \
+			case 8: l2 =((unsigned __int32)(*(--(c))))    ; \
+			case 7: l2|=((unsigned __int32)(*(--(c))))<< 8; \
+			case 6: l2|=((unsigned __int32)(*(--(c))))<<16; \
+			case 5: l2|=((unsigned __int32)(*(--(c))))<<24; \
+			case 4: l1 =((unsigned __int32)(*(--(c))))    ; \
+			case 3: l1|=((unsigned __int32)(*(--(c))))<< 8; \
+			case 2: l1|=((unsigned __int32)(*(--(c))))<<16; \
+			case 1: l1|=((unsigned __int32)(*(--(c))))<<24; \
 				} \
 			}
 
@@ -137,10 +137,10 @@
 			}
 
 #undef n2l
-#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L, \
-                         l|=((unsigned long)(*((c)++)))<<16L, \
-                         l|=((unsigned long)(*((c)++)))<< 8L, \
-                         l|=((unsigned long)(*((c)++))))
+#define n2l(c,l)        (l =((unsigned __int32)(*((c)++)))<<24L, \
+                         l|=((unsigned __int32)(*((c)++)))<<16L, \
+                         l|=((unsigned __int32)(*((c)++)))<< 8L, \
+                         l|=((unsigned __int32)(*((c)++))))
 
 #undef l2n
 #define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \