From: Theodore Tso Date: Thu, 13 Oct 1994 21:51:17 +0000 (+0000) Subject: Add the UL macro to control how unsigned long constants are compiled. X-Git-Tag: krb5-1.0-beta5~1129 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd231361be8282ce937b35abd7d9ad57643725df;p=krb5.git Add the UL macro to control how unsigned long constants are compiled. If we have an ANSI C environment, use the UL suffix to keep the compiler from warning about numbers that would overflow a signed long. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4498 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog index 28394f430..68ae47e21 100644 --- a/src/lib/crypto/md4/ChangeLog +++ b/src/lib/crypto/md4/ChangeLog @@ -1,3 +1,10 @@ +Thu Oct 13 17:48:21 1994 Theodore Y. Ts'o (tytso@dcl) + + * md4.c (UL): Add the UL macro to control how unsigned long + constants are compiled. If we have an ANSI C environment, + use the UL suffix to keep the compiler from warning about + numbers that would overflow a signed long. + Tue Oct 4 14:54:19 1994 Theodore Y. Ts'o (tytso@dcl) * md4crypto.c: diff --git a/src/lib/crypto/md4/md4.c b/src/lib/crypto/md4/md4.c index 02fd554f3..50eb1618a 100644 --- a/src/lib/crypto/md4/md4.c +++ b/src/lib/crypto/md4/md4.c @@ -38,6 +38,12 @@ #include #include +#ifdef __STDC__ +#define UL(x) x##UL +#else +#define UL(x) ((krb5_ui_4) x) +#endif + /* forward declaration */ #if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) static void Transform (krb5_ui_4 *, krb5_ui_4 *); @@ -70,10 +76,10 @@ static unsigned char PADDING[64] = { {(a) += F ((b), (c), (d)) + (x); \ (a) = ROTATE_LEFT ((a), (s));} #define GG(a, b, c, d, x, s) \ - {(a) += G ((b), (c), (d)) + (x) + (krb5_ui_4)013240474631; \ + {(a) += G ((b), (c), (d)) + (x) + UL(013240474631); \ (a) = ROTATE_LEFT ((a), (s));} #define HH(a, b, c, d, x, s) \ - {(a) += H ((b), (c), (d)) + (x) + (krb5_ui_4)015666365641; \ + {(a) += H ((b), (c), (d)) + (x) + UL(015666365641); \ (a) = ROTATE_LEFT ((a), (s));} void MD4Init (mdContext) @@ -83,10 +89,10 @@ MD4_CTX *mdContext; /* Load magic initialization constants. */ - mdContext->buf[0] = (krb5_ui_4)0x67452301; - mdContext->buf[1] = (krb5_ui_4)0xefcdab89; - mdContext->buf[2] = (krb5_ui_4)0x98badcfe; - mdContext->buf[3] = (krb5_ui_4)0x10325476; + mdContext->buf[0] = UL(0x67452301); + mdContext->buf[1] = UL(0xefcdab89); + mdContext->buf[2] = UL(0x98badcfe); + mdContext->buf[3] = UL(0x10325476); } void MD4Update (mdContext, inBuf, inLen) diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index b7ec789e3..dcee11fb1 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,10 @@ +Thu Oct 13 17:50:19 1994 Theodore Y. Ts'o (tytso@dcl) + + * md5.c (UL): Add the UL macro to control how unsigned long + constants are compiled. If we have an ANSI C environment, + use the UL suffix to keep the compiler from warning about + numbers that would overflow a signed long. + Tue Oct 4 14:55:10 1994 Theodore Y. Ts'o (tytso@dcl) * md5crypto.c: diff --git a/src/lib/crypto/md5/md5.c b/src/lib/crypto/md5/md5.c index c5840aae5..7f498f265 100644 --- a/src/lib/crypto/md5/md5.c +++ b/src/lib/crypto/md5/md5.c @@ -38,6 +38,12 @@ #include #include +#ifdef __STDC__ +#define UL(x) x##UL +#else +#define UL(x) ((krb5_ui_4) x) +#endif + /* *********************************************************************** ** Message-digest routines: ** @@ -105,10 +111,10 @@ MD5_CTX *mdContext; /* Load magic initialization constants. */ - mdContext->buf[0] = (krb5_ui_4)0x67452301L; - mdContext->buf[1] = (krb5_ui_4)0xefcdab89L; - mdContext->buf[2] = (krb5_ui_4)0x98badcfeL; - mdContext->buf[3] = (krb5_ui_4)0x10325476L; + mdContext->buf[0] = UL(0x67452301); + mdContext->buf[1] = UL(0xefcdab89); + mdContext->buf[2] = UL(0x98badcfe); + mdContext->buf[3] = UL(0x10325476); } /* The routine MD5Update updates the message-digest context to @@ -205,88 +211,88 @@ krb5_ui_4 *in; #define S12 12 #define S13 17 #define S14 22 - FF ( a, b, c, d, in[ 0], S11, 3614090360L); /* 1 */ - FF ( d, a, b, c, in[ 1], S12, 3905402710L); /* 2 */ - FF ( c, d, a, b, in[ 2], S13, 606105819L); /* 3 */ - FF ( b, c, d, a, in[ 3], S14, 3250441966L); /* 4 */ - FF ( a, b, c, d, in[ 4], S11, 4118548399L); /* 5 */ - FF ( d, a, b, c, in[ 5], S12, 1200080426L); /* 6 */ - FF ( c, d, a, b, in[ 6], S13, 2821735955L); /* 7 */ - FF ( b, c, d, a, in[ 7], S14, 4249261313L); /* 8 */ - FF ( a, b, c, d, in[ 8], S11, 1770035416L); /* 9 */ - FF ( d, a, b, c, in[ 9], S12, 2336552879L); /* 10 */ - FF ( c, d, a, b, in[10], S13, 4294925233L); /* 11 */ - FF ( b, c, d, a, in[11], S14, 2304563134L); /* 12 */ - FF ( a, b, c, d, in[12], S11, 1804603682L); /* 13 */ - FF ( d, a, b, c, in[13], S12, 4254626195L); /* 14 */ - FF ( c, d, a, b, in[14], S13, 2792965006L); /* 15 */ - FF ( b, c, d, a, in[15], S14, 1236535329L); /* 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, 4129170786L); /* 17 */ - GG ( d, a, b, c, in[ 6], S22, 3225465664L); /* 18 */ - GG ( c, d, a, b, in[11], S23, 643717713L); /* 19 */ - GG ( b, c, d, a, in[ 0], S24, 3921069994L); /* 20 */ - GG ( a, b, c, d, in[ 5], S21, 3593408605L); /* 21 */ - GG ( d, a, b, c, in[10], S22, 38016083L); /* 22 */ - GG ( c, d, a, b, in[15], S23, 3634488961L); /* 23 */ - GG ( b, c, d, a, in[ 4], S24, 3889429448L); /* 24 */ - GG ( a, b, c, d, in[ 9], S21, 568446438L); /* 25 */ - GG ( d, a, b, c, in[14], S22, 3275163606L); /* 26 */ - GG ( c, d, a, b, in[ 3], S23, 4107603335L); /* 27 */ - GG ( b, c, d, a, in[ 8], S24, 1163531501L); /* 28 */ - GG ( a, b, c, d, in[13], S21, 2850285829L); /* 29 */ - GG ( d, a, b, c, in[ 2], S22, 4243563512L); /* 30 */ - GG ( c, d, a, b, in[ 7], S23, 1735328473L); /* 31 */ - GG ( b, c, d, a, in[12], S24, 2368359562L); /* 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, 4294588738L); /* 33 */ - HH ( d, a, b, c, in[ 8], S32, 2272392833L); /* 34 */ - HH ( c, d, a, b, in[11], S33, 1839030562L); /* 35 */ - HH ( b, c, d, a, in[14], S34, 4259657740L); /* 36 */ - HH ( a, b, c, d, in[ 1], S31, 2763975236L); /* 37 */ - HH ( d, a, b, c, in[ 4], S32, 1272893353L); /* 38 */ - HH ( c, d, a, b, in[ 7], S33, 4139469664L); /* 39 */ - HH ( b, c, d, a, in[10], S34, 3200236656L); /* 40 */ - HH ( a, b, c, d, in[13], S31, 681279174L); /* 41 */ - HH ( d, a, b, c, in[ 0], S32, 3936430074L); /* 42 */ - HH ( c, d, a, b, in[ 3], S33, 3572445317L); /* 43 */ - HH ( b, c, d, a, in[ 6], S34, 76029189L); /* 44 */ - HH ( a, b, c, d, in[ 9], S31, 3654602809L); /* 45 */ - HH ( d, a, b, c, in[12], S32, 3873151461L); /* 46 */ - HH ( c, d, a, b, in[15], S33, 530742520L); /* 47 */ - HH ( b, c, d, a, in[ 2], S34, 3299628645L); /* 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, 4096336452L); /* 49 */ - II ( d, a, b, c, in[ 7], S42, 1126891415L); /* 50 */ - II ( c, d, a, b, in[14], S43, 2878612391L); /* 51 */ - II ( b, c, d, a, in[ 5], S44, 4237533241L); /* 52 */ - II ( a, b, c, d, in[12], S41, 1700485571L); /* 53 */ - II ( d, a, b, c, in[ 3], S42, 2399980690L); /* 54 */ - II ( c, d, a, b, in[10], S43, 4293915773L); /* 55 */ - II ( b, c, d, a, in[ 1], S44, 2240044497L); /* 56 */ - II ( a, b, c, d, in[ 8], S41, 1873313359L); /* 57 */ - II ( d, a, b, c, in[15], S42, 4264355552L); /* 58 */ - II ( c, d, a, b, in[ 6], S43, 2734768916L); /* 59 */ - II ( b, c, d, a, in[13], S44, 1309151649L); /* 60 */ - II ( a, b, c, d, in[ 4], S41, 4149444226L); /* 61 */ - II ( d, a, b, c, in[11], S42, 3174756917L); /* 62 */ - II ( c, d, a, b, in[ 2], S43, 718787259L); /* 63 */ - II ( b, c, d, a, in[ 9], S44, 3951481745L); /* 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;