From f4d37f21efe37a04d07c7d39e37acc2d13c344ba Mon Sep 17 00:00:00 2001 From: cloudwalk Date: Fri, 2 Oct 2020 01:56:48 +0000 Subject: [PATCH] mdfour: Switch to stdint. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12982 d7cf8633-e32d-0410-b094-e92efae38249 --- mdfour.c | 27 +++++++++------------------ mdfour.h | 16 +++------------- 2 files changed, 12 insertions(+), 31 deletions(-) diff --git a/mdfour.c b/mdfour.c index 46c3abf8..ae92e375 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,18 +88,13 @@ 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; @@ -112,7 +103,7 @@ static void copy64(uint32 *M, const unsigned char *in) (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 +124,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 +150,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 diff --git a/mdfour.h b/mdfour.h index c6542a21..5a141755 100644 --- a/mdfour.h +++ b/mdfour.h @@ -28,21 +28,11 @@ #ifndef _MDFOUR_H #define _MDFOUR_H -#ifndef int32 -#define int32 int -#endif - -#if SIZEOF_INT > 4 -#define LARGE_INT32 -#endif - -#ifndef uint32 -#define uint32 unsigned int32 -#endif +#include struct mdfour_s { - uint32 A, B, C, D; - uint32 totalN; + uint32_t A, B, C, D; + uint32_t totalN; }; void mdfour_begin(struct mdfour_s *md); // old: MD4Init -- 2.39.2