From: Gordon M. <go...@us...> - 2004-02-01 06:21:20
|
Update of /cvsroot/bitcollider/bitcollider/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25066/lib Modified Files: sboxes.c tiger.c Log Message: * tiger.c, sboxes.c add 'ULL' qualifier to long constants to avoid flood of warnings Index: sboxes.c =================================================================== RCS file: /cvsroot/bitcollider/bitcollider/lib/sboxes.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** sboxes.c 28 Feb 2001 23:29:57 -0000 1.1 --- sboxes.c 1 Feb 2004 06:19:31 -0000 1.2 *************** *** 11,524 **** #include "tiger.h" word64 table[4*256] = { ! 0x02AAB17CF7E90C5E /* 0 */, 0xAC424B03E243A8EC /* 1 */, ! 0x72CD5BE30DD5FCD3 /* 2 */, 0x6D019B93F6F97F3A /* 3 */, ! 0xCD9978FFD21F9193 /* 4 */, 0x7573A1C9708029E2 /* 5 */, ! 0xB164326B922A83C3 /* 6 */, 0x46883EEE04915870 /* 7 */, ! 0xEAACE3057103ECE6 /* 8 */, 0xC54169B808A3535C /* 9 */, ! 0x4CE754918DDEC47C /* 10 */, 0x0AA2F4DFDC0DF40C /* 11 */, ! 0x10B76F18A74DBEFA /* 12 */, 0xC6CCB6235AD1AB6A /* 13 */, ! 0x13726121572FE2FF /* 14 */, 0x1A488C6F199D921E /* 15 */, [...999 lines suppressed...] ! 0x03F38C96BA582C52ULL /* 984 */, 0xCAD1BDBD7FD85DB2ULL /* 985 */, ! 0xBBB442C16082AE83ULL /* 986 */, 0xB95FE86BA5DA9AB0ULL /* 987 */, ! 0xB22E04673771A93FULL /* 988 */, 0x845358C9493152D8ULL /* 989 */, ! 0xBE2A488697B4541EULL /* 990 */, 0x95A2DC2DD38E6966ULL /* 991 */, ! 0xC02C11AC923C852BULL /* 992 */, 0x2388B1990DF2A87BULL /* 993 */, ! 0x7C8008FA1B4F37BEULL /* 994 */, 0x1F70D0C84D54E503ULL /* 995 */, ! 0x5490ADEC7ECE57D4ULL /* 996 */, 0x002B3C27D9063A3AULL /* 997 */, ! 0x7EAEA3848030A2BFULL /* 998 */, 0xC602326DED2003C0ULL /* 999 */, ! 0x83A7287D69A94086ULL /* 1000 */, 0xC57A5FCB30F57A8AULL /* 1001 */, ! 0xB56844E479EBE779ULL /* 1002 */, 0xA373B40F05DCBCE9ULL /* 1003 */, ! 0xD71A786E88570EE2ULL /* 1004 */, 0x879CBACDBDE8F6A0ULL /* 1005 */, ! 0x976AD1BCC164A32FULL /* 1006 */, 0xAB21E25E9666D78BULL /* 1007 */, ! 0x901063AAE5E5C33CULL /* 1008 */, 0x9818B34448698D90ULL /* 1009 */, ! 0xE36487AE3E1E8ABBULL /* 1010 */, 0xAFBDF931893BDCB4ULL /* 1011 */, ! 0x6345A0DC5FBBD519ULL /* 1012 */, 0x8628FE269B9465CAULL /* 1013 */, ! 0x1E5D01603F9C51ECULL /* 1014 */, 0x4DE44006A15049B7ULL /* 1015 */, ! 0xBF6C70E5F776CBB1ULL /* 1016 */, 0x411218F2EF552BEDULL /* 1017 */, ! 0xCB0C0708705A36A3ULL /* 1018 */, 0xE74D14754F986044ULL /* 1019 */, ! 0xCD56D9430EA8280EULL /* 1020 */, 0xC12591D7535F5065ULL /* 1021 */, ! 0xC83223F1720AEF96ULL /* 1022 */, 0xC3A0396F7363A51FULL /* 1023 */}; Index: tiger.c =================================================================== RCS file: /cvsroot/bitcollider/bitcollider/lib/tiger.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** tiger.c 10 Sep 2001 21:04:40 -0000 1.3 --- tiger.c 1 Feb 2004 06:19:31 -0000 1.4 *************** *** 87,91 **** #define key_schedule \ ! x0 -= x7 ^ 0xA5A5A5A5A5A5A5A5; \ x1 ^= x0; \ x2 += x1; \ --- 87,91 ---- #define key_schedule \ ! x0 -= x7 ^ 0xA5A5A5A5A5A5A5A5ULL; \ x1 ^= x0; \ x2 += x1; \ *************** *** 102,106 **** x5 ^= x4; \ x6 += x5; \ ! x7 -= x6 ^ 0x0123456789ABCDEF; #define feedforward \ --- 102,106 ---- x5 ^= x4; \ x6 += x5; \ ! x7 -= x6 ^ 0x0123456789ABCDEFULL; #define feedforward \ *************** *** 175,181 **** unsigned char temp[64]; ! res[0]=0x0123456789ABCDEF; ! res[1]=0xFEDCBA9876543210; ! res[2]=0xF096A5B4C3B2E187; for(i=length; i>=64; i-=64) --- 175,181 ---- unsigned char temp[64]; ! res[0]=0x0123456789ABCDEFULL; ! res[1]=0xFEDCBA9876543210ULL; ! res[2]=0xF096A5B4C3B2E187ULL; for(i=length; i>=64; i-=64) |