X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=mdfour.c;h=ae92e3758af2ac487f1b732662fe731a6d1cda79;hp=46c3abf82e70c031b0c923f151f1d9750a3fddb7;hb=HEAD;hpb=20a31a160b9dbb9788b943d3284a26c873a62c3b

diff --git a/mdfour.c b/mdfour.c
index 46c3abf8..5164994a 100644
--- a/mdfour.c
+++ b/mdfour.c
@@ -39,23 +39,19 @@
 #define F(X,Y,Z) (((X)&(Y)) | ((~(X))&(Z)))
 #define G(X,Y,Z) (((X)&(Y)) | ((X)&(Z)) | ((Y)&(Z)))
 #define H(X,Y,Z) ((X)^(Y)^(Z))
-#ifdef LARGE_INT32
-#define lshift(x,s) ((((x)<<(s))&0xFFFFFFFF) | (((x)>>(32-(s)))&0xFFFFFFFF))
-#else
 #define lshift(x,s) (((x)<<(s)) | ((x)>>(32-(s))))
-#endif
 
 #define ROUND1(a,b,c,d,k,s) a = lshift(a + F(b,c,d) + X[k], s)
 #define ROUND2(a,b,c,d,k,s) a = lshift(a + G(b,c,d) + X[k] + 0x5A827999,s)
 #define ROUND3(a,b,c,d,k,s) a = lshift(a + H(b,c,d) + X[k] + 0x6ED9EBA1,s)
 
 /* this applies md4 to 64 byte chunks */
-static void mdfour64(struct mdfour_s *md, uint32 *M)
+static void mdfour64(struct mdfour_s *md, uint32_t *M)
 {
 	int j;
-	uint32 AA, BB, CC, DD;
-	uint32 X[16];
-	uint32 A,B,C,D;
+	uint32_t AA, BB, CC, DD;
+	uint32_t X[16];
+	uint32_t A,B,C,D;
 
 	for (j=0;j<16;j++)
 		X[j] = M[j];
@@ -92,27 +88,23 @@ static void mdfour64(struct mdfour_s *md, uint32 *M)
 
 	A += AA; B += BB; C += CC; D += DD;
 
-#ifdef LARGE_INT32
-	A &= 0xFFFFFFFF; B &= 0xFFFFFFFF;
-	C &= 0xFFFFFFFF; D &= 0xFFFFFFFF;
-#endif
-
 	for (j=0;j<16;j++)
 		X[j] = 0;
 
 	md->A = A; md->B = B; md->C = C; md->D = D;
 }
 
-static void copy64(uint32 *M, const unsigned char *in)
+static void copy64(uint32_t *M, const unsigned char *in)
 {
 	int i;
 
+	// UBSan: (unsigned) is because promotion to int causes signed overflow when in[] >= 128
 	for (i=0;i<16;i++)
-		M[i] = (in[i*4+3]<<24) | (in[i*4+2]<<16) |
+		M[i] = ((unsigned)in[i*4+3]<<24) | (in[i*4+2]<<16) |
 			(in[i*4+1]<<8) | (in[i*4+0]<<0);
 }
 
-static void copy4(unsigned char *out,uint32 x)
+static void copy4(unsigned char *out,uint32_t x)
 {
 	out[0] = x&0xFF;
 	out[1] = (x>>8)&0xFF;
@@ -133,8 +125,8 @@ void mdfour_begin(struct mdfour_s *md)
 static void mdfour_tail(struct mdfour_s *md, const unsigned char *in, int n)
 {
 	unsigned char buf[128];
-	uint32 M[16];
-	uint32 b;
+	uint32_t M[16];
+	uint32_t b;
 
 	md->totalN += n;
 
@@ -159,7 +151,7 @@ static void mdfour_tail(struct mdfour_s *md, const unsigned char *in, int n)
 
 void mdfour_update(struct mdfour_s *md, const unsigned char *in, int n)
 {
-	uint32 M[16];
+	uint32_t M[16];
 
 // start of edit by Ashley Rose Hale (LadyHavoc)
 // commented out to prevent crashing when length is 0