X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fmd5.c;h=480c860c0aa9b0d9aa2be2001804ca56e4b09f54;hp=94bb2fe1f872ddbd2e2b97ecd45ce150433c7ca2;hb=f7195b02ffc90bb9ee482c537074a84f8561aa61;hpb=0b63a24d54ba4708c88e31bdd74b0145956c1478 diff --git a/pppd/md5.c b/pppd/md5.c index 94bb2fe..480c860 100644 --- a/pppd/md5.c +++ b/pppd/md5.c @@ -92,6 +92,12 @@ static unsigned char PADDING[64] = { (a) += (b); \ } +#ifdef __STDC__ +#define UL(x) x##U +#else +#define UL(x) x +#endif + /* The routine MD5Init initializes the message-digest context mdContext. All fields are set to zero. */ @@ -202,88 +208,88 @@ UINT4 *in; #define S12 12 #define S13 17 #define S14 22 - FF ( a, b, c, d, in[ 0], S11, 3614090360U); /* 1 */ - FF ( d, a, b, c, in[ 1], S12, 3905402710U); /* 2 */ - FF ( c, d, a, b, in[ 2], S13, 606105819U); /* 3 */ - FF ( b, c, d, a, in[ 3], S14, 3250441966U); /* 4 */ - FF ( a, b, c, d, in[ 4], S11, 4118548399U); /* 5 */ - FF ( d, a, b, c, in[ 5], S12, 1200080426U); /* 6 */ - FF ( c, d, a, b, in[ 6], S13, 2821735955U); /* 7 */ - FF ( b, c, d, a, in[ 7], S14, 4249261313U); /* 8 */ - FF ( a, b, c, d, in[ 8], S11, 1770035416U); /* 9 */ - FF ( d, a, b, c, in[ 9], S12, 2336552879U); /* 10 */ - FF ( c, d, a, b, in[10], S13, 4294925233U); /* 11 */ - FF ( b, c, d, a, in[11], S14, 2304563134U); /* 12 */ - FF ( a, b, c, d, in[12], S11, 1804603682U); /* 13 */ - FF ( d, a, b, c, in[13], S12, 4254626195U); /* 14 */ - FF ( c, d, a, b, in[14], S13, 2792965006U); /* 15 */ - FF ( b, c, d, a, in[15], S14, 1236535329U); /* 16 */ + FF ( a, b, c, d, in[ 0], S11, UL(3614090360)); /* 1 */ + FF ( d, a, b, c, in[ 1], S12, UL(3905402710)); /* 2 */ + FF ( c, d, a, b, in[ 2], S13, UL( 606105819)); /* 3 */ + FF ( b, c, d, a, in[ 3], S14, UL(3250441966)); /* 4 */ + FF ( a, b, c, d, in[ 4], S11, UL(4118548399)); /* 5 */ + FF ( d, a, b, c, in[ 5], S12, UL(1200080426)); /* 6 */ + FF ( c, d, a, b, in[ 6], S13, UL(2821735955)); /* 7 */ + FF ( b, c, d, a, in[ 7], S14, UL(4249261313)); /* 8 */ + FF ( a, b, c, d, in[ 8], S11, UL(1770035416)); /* 9 */ + FF ( d, a, b, c, in[ 9], S12, UL(2336552879)); /* 10 */ + FF ( c, d, a, b, in[10], S13, UL(4294925233)); /* 11 */ + FF ( b, c, d, a, in[11], S14, UL(2304563134)); /* 12 */ + FF ( a, b, c, d, in[12], S11, UL(1804603682)); /* 13 */ + FF ( d, a, b, c, in[13], S12, UL(4254626195)); /* 14 */ + FF ( c, d, a, b, in[14], S13, UL(2792965006)); /* 15 */ + FF ( b, c, d, a, in[15], S14, UL(1236535329)); /* 16 */ /* Round 2 */ #define S21 5 #define S22 9 #define S23 14 #define S24 20 - GG ( a, b, c, d, in[ 1], S21, 4129170786U); /* 17 */ - GG ( d, a, b, c, in[ 6], S22, 3225465664U); /* 18 */ - GG ( c, d, a, b, in[11], S23, 643717713U); /* 19 */ - GG ( b, c, d, a, in[ 0], S24, 3921069994U); /* 20 */ - GG ( a, b, c, d, in[ 5], S21, 3593408605U); /* 21 */ - GG ( d, a, b, c, in[10], S22, 38016083U); /* 22 */ - GG ( c, d, a, b, in[15], S23, 3634488961U); /* 23 */ - GG ( b, c, d, a, in[ 4], S24, 3889429448U); /* 24 */ - GG ( a, b, c, d, in[ 9], S21, 568446438U); /* 25 */ - GG ( d, a, b, c, in[14], S22, 3275163606U); /* 26 */ - GG ( c, d, a, b, in[ 3], S23, 4107603335U); /* 27 */ - GG ( b, c, d, a, in[ 8], S24, 1163531501U); /* 28 */ - GG ( a, b, c, d, in[13], S21, 2850285829U); /* 29 */ - GG ( d, a, b, c, in[ 2], S22, 4243563512U); /* 30 */ - GG ( c, d, a, b, in[ 7], S23, 1735328473U); /* 31 */ - GG ( b, c, d, a, in[12], S24, 2368359562U); /* 32 */ + GG ( a, b, c, d, in[ 1], S21, UL(4129170786)); /* 17 */ + GG ( d, a, b, c, in[ 6], S22, UL(3225465664)); /* 18 */ + GG ( c, d, a, b, in[11], S23, UL( 643717713)); /* 19 */ + GG ( b, c, d, a, in[ 0], S24, UL(3921069994)); /* 20 */ + GG ( a, b, c, d, in[ 5], S21, UL(3593408605)); /* 21 */ + GG ( d, a, b, c, in[10], S22, UL( 38016083)); /* 22 */ + GG ( c, d, a, b, in[15], S23, UL(3634488961)); /* 23 */ + GG ( b, c, d, a, in[ 4], S24, UL(3889429448)); /* 24 */ + GG ( a, b, c, d, in[ 9], S21, UL( 568446438)); /* 25 */ + GG ( d, a, b, c, in[14], S22, UL(3275163606)); /* 26 */ + GG ( c, d, a, b, in[ 3], S23, UL(4107603335)); /* 27 */ + GG ( b, c, d, a, in[ 8], S24, UL(1163531501)); /* 28 */ + GG ( a, b, c, d, in[13], S21, UL(2850285829)); /* 29 */ + GG ( d, a, b, c, in[ 2], S22, UL(4243563512)); /* 30 */ + GG ( c, d, a, b, in[ 7], S23, UL(1735328473)); /* 31 */ + GG ( b, c, d, a, in[12], S24, UL(2368359562)); /* 32 */ /* Round 3 */ #define S31 4 #define S32 11 #define S33 16 #define S34 23 - HH ( a, b, c, d, in[ 5], S31, 4294588738U); /* 33 */ - HH ( d, a, b, c, in[ 8], S32, 2272392833U); /* 34 */ - HH ( c, d, a, b, in[11], S33, 1839030562U); /* 35 */ - HH ( b, c, d, a, in[14], S34, 4259657740U); /* 36 */ - HH ( a, b, c, d, in[ 1], S31, 2763975236U); /* 37 */ - HH ( d, a, b, c, in[ 4], S32, 1272893353U); /* 38 */ - HH ( c, d, a, b, in[ 7], S33, 4139469664U); /* 39 */ - HH ( b, c, d, a, in[10], S34, 3200236656U); /* 40 */ - HH ( a, b, c, d, in[13], S31, 681279174U); /* 41 */ - HH ( d, a, b, c, in[ 0], S32, 3936430074U); /* 42 */ - HH ( c, d, a, b, in[ 3], S33, 3572445317U); /* 43 */ - HH ( b, c, d, a, in[ 6], S34, 76029189U); /* 44 */ - HH ( a, b, c, d, in[ 9], S31, 3654602809U); /* 45 */ - HH ( d, a, b, c, in[12], S32, 3873151461U); /* 46 */ - HH ( c, d, a, b, in[15], S33, 530742520U); /* 47 */ - HH ( b, c, d, a, in[ 2], S34, 3299628645U); /* 48 */ + HH ( a, b, c, d, in[ 5], S31, UL(4294588738)); /* 33 */ + HH ( d, a, b, c, in[ 8], S32, UL(2272392833)); /* 34 */ + HH ( c, d, a, b, in[11], S33, UL(1839030562)); /* 35 */ + HH ( b, c, d, a, in[14], S34, UL(4259657740)); /* 36 */ + HH ( a, b, c, d, in[ 1], S31, UL(2763975236)); /* 37 */ + HH ( d, a, b, c, in[ 4], S32, UL(1272893353)); /* 38 */ + HH ( c, d, a, b, in[ 7], S33, UL(4139469664)); /* 39 */ + HH ( b, c, d, a, in[10], S34, UL(3200236656)); /* 40 */ + HH ( a, b, c, d, in[13], S31, UL( 681279174)); /* 41 */ + HH ( d, a, b, c, in[ 0], S32, UL(3936430074)); /* 42 */ + HH ( c, d, a, b, in[ 3], S33, UL(3572445317)); /* 43 */ + HH ( b, c, d, a, in[ 6], S34, UL( 76029189)); /* 44 */ + HH ( a, b, c, d, in[ 9], S31, UL(3654602809)); /* 45 */ + HH ( d, a, b, c, in[12], S32, UL(3873151461)); /* 46 */ + HH ( c, d, a, b, in[15], S33, UL( 530742520)); /* 47 */ + HH ( b, c, d, a, in[ 2], S34, UL(3299628645)); /* 48 */ /* Round 4 */ #define S41 6 #define S42 10 #define S43 15 #define S44 21 - II ( a, b, c, d, in[ 0], S41, 4096336452U); /* 49 */ - II ( d, a, b, c, in[ 7], S42, 1126891415U); /* 50 */ - II ( c, d, a, b, in[14], S43, 2878612391U); /* 51 */ - II ( b, c, d, a, in[ 5], S44, 4237533241U); /* 52 */ - II ( a, b, c, d, in[12], S41, 1700485571U); /* 53 */ - II ( d, a, b, c, in[ 3], S42, 2399980690U); /* 54 */ - II ( c, d, a, b, in[10], S43, 4293915773U); /* 55 */ - II ( b, c, d, a, in[ 1], S44, 2240044497U); /* 56 */ - II ( a, b, c, d, in[ 8], S41, 1873313359U); /* 57 */ - II ( d, a, b, c, in[15], S42, 4264355552U); /* 58 */ - II ( c, d, a, b, in[ 6], S43, 2734768916U); /* 59 */ - II ( b, c, d, a, in[13], S44, 1309151649U); /* 60 */ - II ( a, b, c, d, in[ 4], S41, 4149444226U); /* 61 */ - II ( d, a, b, c, in[11], S42, 3174756917U); /* 62 */ - II ( c, d, a, b, in[ 2], S43, 718787259U); /* 63 */ - II ( b, c, d, a, in[ 9], S44, 3951481745U); /* 64 */ + II ( a, b, c, d, in[ 0], S41, UL(4096336452)); /* 49 */ + II ( d, a, b, c, in[ 7], S42, UL(1126891415)); /* 50 */ + II ( c, d, a, b, in[14], S43, UL(2878612391)); /* 51 */ + II ( b, c, d, a, in[ 5], S44, UL(4237533241)); /* 52 */ + II ( a, b, c, d, in[12], S41, UL(1700485571)); /* 53 */ + II ( d, a, b, c, in[ 3], S42, UL(2399980690)); /* 54 */ + II ( c, d, a, b, in[10], S43, UL(4293915773)); /* 55 */ + II ( b, c, d, a, in[ 1], S44, UL(2240044497)); /* 56 */ + II ( a, b, c, d, in[ 8], S41, UL(1873313359)); /* 57 */ + II ( d, a, b, c, in[15], S42, UL(4264355552)); /* 58 */ + II ( c, d, a, b, in[ 6], S43, UL(2734768916)); /* 59 */ + II ( b, c, d, a, in[13], S44, UL(1309151649)); /* 60 */ + II ( a, b, c, d, in[ 4], S41, UL(4149444226)); /* 61 */ + II ( d, a, b, c, in[11], S42, UL(3174756917)); /* 62 */ + II ( c, d, a, b, in[ 2], S43, UL( 718787259)); /* 63 */ + II ( b, c, d, a, in[ 9], S44, UL(3951481745)); /* 64 */ buf[0] += a; buf[1] += b;