okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Introduced various new typedefs for windows platform (int32_t, int64_t, etc...)

Browse source 
- Applied md5 64-bit safety patch by Tony White.
This commit is contained in:
Thilo Schulz 2006-04-27 13:39:41 +00:00
parent c116695ea7
commit 235e2c215f
4 changed files with 40 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

43
code/qcommon/md4.c
View file

@ -30,21 +30,9 @@
#include "q_shared.h"
#include "qcommon.h"
#ifndef int32
#define int32 int
#endif
#if SIZEOF_INT > 4
#define LARGE_INT32
#endif
#ifndef uint32
#define uint32 unsigned int32
#endif
struct mdfour {
uint32 A, B, C, D;
uint32 totalN;
uint32_t A, B, C, D;
uint32_t totalN;
};
@ -58,23 +46,19 @@ static struct mdfour *m;
#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(uint32 *M)
static void mdfour64(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];
@ -111,18 +95,13 @@ static void mdfour64(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;
m->A = A; m->B = B; m->C = C; m->D = D;
}
static void copy64(uint32 *M, byte *in)
static void copy64(uint32_t *M, byte *in)
{
int i;
@ -131,7 +110,7 @@ static void copy64(uint32 *M, byte *in)
(in[i*4+1]<<8) | (in[i*4+0]<<0);
}
static void copy4(byte *out,uint32 x)
static void copy4(byte *out,uint32_t x)
{
out[0] = x&0xFF;
out[1] = (x>>8)&0xFF;
@ -152,8 +131,8 @@ void mdfour_begin(struct mdfour *md)
static void mdfour_tail(byte *in, int n)
{
byte buf[128];
uint32 M[16];
uint32 b;
uint32_t M[16];
uint32_t b;
m->totalN += n;
@ -178,7 +157,7 @@ static void mdfour_tail(byte *in, int n)
static void mdfour_update(struct mdfour *md, byte *in, int n)
{
uint32 M[16];
uint32_t M[16];
if (n == 0) mdfour_tail(in, n);