X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fmd4.c;h=88f3413c544951e77e9e60f587320c59ca52032e;hb=81a4d35394096e4e9bd7b9b189e91190e58b02a7;hp=cda9f943d0f25fa40d4597c19401e2ee027e8fc4;hpb=e28f47d5e53abe7317d9a82703bbbee044482d4f;p=ppp.git diff --git a/pppd/md4.c b/pppd/md4.c index cda9f94..88f3413 100644 --- a/pppd/md4.c +++ b/pppd/md4.c @@ -30,6 +30,9 @@ /* Implementation notes: ** This implementation assumes that ints are 32-bit quantities. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #define TRUE 1 #define FALSE 0 @@ -87,8 +90,7 @@ ** This is a user-callable routine. */ void -MD4Print(MDp) -MD4_CTX *MDp; +MD4Print(MD4_CTX *MDp) { int i,j; for (i=0;i<4;i++) @@ -101,8 +103,7 @@ MD4_CTX *MDp; ** This is a user-callable routine. */ void -MD4Init(MDp) -MD4_CTX *MDp; +MD4Init(MD4_CTX *MDp) { int i; MDp->buffer[0] = I0; @@ -120,9 +121,7 @@ MD4_CTX *MDp; ** This routine is not user-callable. */ static void -MDblock(MDp,Xb) -MD4_CTX *MDp; -unsigned char *Xb; +MDblock(MD4_CTX *MDp, unsigned char *Xb) { register unsigned int tmp, A, B, C, D; unsigned int X[16]; @@ -206,10 +205,7 @@ unsigned char *Xb; ** if desired. */ void -MD4Update(MDp,X,count) -MD4_CTX *MDp; -unsigned char *X; -unsigned int count; +MD4Update(MD4_CTX *MDp, unsigned char *X, unsigned int count) { unsigned int i, tmp, bit, byte, mask; unsigned char XX[64]; @@ -249,7 +245,8 @@ unsigned int count; byte = count >> 3; bit = count & 7; /* Copy X into XX since we need to modify it */ - for (i=0;i<=byte;i++) XX[i] = X[i]; + if (count) + for (i=0;i<=byte;i++) XX[i] = X[i]; for (i=byte+1;i<64;i++) XX[i] = 0; /* Add padding '1' bit and low-order zeros in last byte */ mask = 1 << (7 - bit); @@ -276,9 +273,7 @@ unsigned int count; ** Finish up MD4 computation and return message digest. */ void -MD4Final(buf, MD) -unsigned char *buf; -MD4_CTX *MD; +MD4Final(unsigned char *buf, MD4_CTX *MD) { int i, j; unsigned int w;