When doing multi-dimensional arrays always include the 'row' elements in a set of brackets:
Example of warning:
int base[2][4] {
1,2,3,4,
5,6,7,8
};
The compiler is unsure where the end of the first row of 4 items. So to
clear this up you must do:
int base[2][4] {
{ 1,2,3,4 },
{ 5,6,7,8 }
};
Stephen
------------------
PATCH
------------------Index: cast.cpp
===================================================================
RCS file: /cvsroot/cryptopp/c5/cast.cpp,v
retrieving revision 1.1.1.1
diff -U2 -r1.1.1.1 cast.cpp
--- cast.cpp 4 Oct 2002 17:31:42 -0000 1.1.1.1
+++ cast.cpp 3 Nov 2003 05:51:08 -0000
@@ -151,48 +151,63 @@
// The following CAST-256 implementation was contributed by Leonard
Janke
+/* FIXME: aggregate has a partly bracketed initializer
+
+ SOLUTION: When initializing a multi-dimensional array use brackets
around each 'row'.
+*/
const word32 CAST256::Base::t_m[8][24]={
- 0x5a827999, 0xd151d6a1, 0x482133a9, 0xbef090b1, 0x35bfedb9,
0xac8f4ac1,
- 0x235ea7c9, 0x9a2e04d1, 0x10fd61d9, 0x87ccbee1, 0xfe9c1be9,
0x756b78f1,
- 0xec3ad5f9, 0x630a3301, 0xd9d99009, 0x50a8ed11, 0xc7784a19,
0x3e47a721,
- 0xb5170429, 0x2be66131, 0xa2b5be39, 0x19851b41, 0x90547849,
0x0723d551,
- 0xc95c653a, 0x402bc242, 0xb6fb1f4a, 0x2dca7c52, 0xa499d95a,
0x1b693662,
- 0x9238936a, 0x0907f072, 0x7fd74d7a, 0xf6a6aa82, 0x6d76078a,
0xe4456492,
- 0x5b14c19a, 0xd1e41ea2, 0x48b37baa, 0xbf82d8b2, 0x365235ba,
0xad2192c2,
- 0x23f0efca, 0x9ac04cd2, 0x118fa9da, 0x885f06e2, 0xff2e63ea,
0x75fdc0f2,
- 0x383650db, 0xaf05ade3, 0x25d50aeb, 0x9ca467f3, 0x1373c4fb,
0x8a432203,
- 0x01127f0b, 0x77e1dc13, 0xeeb1391b, 0x65809623, 0xdc4ff32b,
0x531f5033,
- 0xc9eead3b, 0x40be0a43, 0xb78d674b, 0x2e5cc453, 0xa52c215b,
0x1bfb7e63,
- 0x92cadb6b, 0x099a3873, 0x8069957b, 0xf738f283, 0x6e084f8b,
0xe4d7ac93,
- 0xa7103c7c, 0x1ddf9984, 0x94aef68c, 0x0b7e5394, 0x824db09c,
0xf91d0da4,
- 0x6fec6aac, 0xe6bbc7b4, 0x5d8b24bc, 0xd45a81c4, 0x4b29decc,
0xc1f93bd4,
- 0x38c898dc, 0xaf97f5e4, 0x266752ec, 0x9d36aff4, 0x14060cfc,
0x8ad56a04,
- 0x01a4c70c, 0x78742414, 0xef43811c, 0x6612de24, 0xdce23b2c,
0x53b19834,
- 0x15ea281d, 0x8cb98525, 0x0388e22d, 0x7a583f35, 0xf1279c3d,
0x67f6f945,
- 0xdec6564d, 0x5595b355, 0xcc65105d, 0x43346d65, 0xba03ca6d,
0x30d32775,
- 0xa7a2847d, 0x1e71e185, 0x95413e8d, 0x0c109b95, 0x82dff89d,
0xf9af55a5,
- 0x707eb2ad, 0xe74e0fb5, 0x5e1d6cbd, 0xd4ecc9c5, 0x4bbc26cd,
0xc28b83d5,
- 0x84c413be, 0xfb9370c6, 0x7262cdce, 0xe9322ad6, 0x600187de,
0xd6d0e4e6,
- 0x4da041ee, 0xc46f9ef6, 0x3b3efbfe, 0xb20e5906, 0x28ddb60e,
0x9fad1316,
- 0x167c701e, 0x8d4bcd26, 0x041b2a2e, 0x7aea8736, 0xf1b9e43e,
0x68894146,
- 0xdf589e4e, 0x5627fb56, 0xccf7585e, 0x43c6b566, 0xba96126e,
0x31656f76,
- 0xf39dff5f, 0x6a6d5c67, 0xe13cb96f, 0x580c1677, 0xcedb737f,
0x45aad087,
- 0xbc7a2d8f, 0x33498a97, 0xaa18e79f, 0x20e844a7, 0x97b7a1af,
0x0e86feb7,
- 0x85565bbf, 0xfc25b8c7, 0x72f515cf, 0xe9c472d7, 0x6093cfdf,
0xd7632ce7,
- 0x4e3289ef, 0xc501e6f7, 0x3bd143ff, 0xb2a0a107, 0x296ffe0f,
0xa03f5b17,
- 0x6277eb00, 0xd9474808, 0x5016a510, 0xc6e60218, 0x3db55f20,
0xb484bc28,
- 0x2b541930, 0xa2237638, 0x18f2d340, 0x8fc23048, 0x06918d50,
0x7d60ea58,
- 0xf4304760, 0x6affa468, 0xe1cf0170, 0x589e5e78, 0xcf6dbb80,
0x463d1888,
- 0xbd0c7590, 0x33dbd298, 0xaaab2fa0, 0x217a8ca8, 0x9849e9b0, 0x0f1946b8
+ { 0x5a827999, 0xd151d6a1, 0x482133a9, 0xbef090b1, 0x35bfedb9,
0xac8f4ac1,
+ 0x235ea7c9, 0x9a2e04d1, 0x10fd61d9, 0x87ccbee1, 0xfe9c1be9,
0x756b78f1,
+ 0xec3ad5f9, 0x630a3301, 0xd9d99009, 0x50a8ed11, 0xc7784a19,
0x3e47a721,
+ 0xb5170429, 0x2be66131, 0xa2b5be39, 0x19851b41, 0x90547849,
0x0723d551 },
+
+ { 0xc95c653a, 0x402bc242, 0xb6fb1f4a, 0x2dca7c52, 0xa499d95a,
0x1b693662,
+ 0x9238936a, 0x0907f072, 0x7fd74d7a, 0xf6a6aa82, 0x6d76078a,
0xe4456492,
+ 0x5b14c19a, 0xd1e41ea2, 0x48b37baa, 0xbf82d8b2, 0x365235ba,
0xad2192c2,
+ 0x23f0efca, 0x9ac04cd2, 0x118fa9da, 0x885f06e2, 0xff2e63ea,
0x75fdc0f2 },
+
+ { 0x383650db, 0xaf05ade3, 0x25d50aeb, 0x9ca467f3, 0x1373c4fb,
0x8a432203,
+ 0x01127f0b, 0x77e1dc13, 0xeeb1391b, 0x65809623, 0xdc4ff32b,
0x531f5033,
+ 0xc9eead3b, 0x40be0a43, 0xb78d674b, 0x2e5cc453, 0xa52c215b,
0x1bfb7e63,
+ 0x92cadb6b, 0x099a3873, 0x8069957b, 0xf738f283, 0x6e084f8b,
0xe4d7ac93 },
+
+ { 0xa7103c7c, 0x1ddf9984, 0x94aef68c, 0x0b7e5394, 0x824db09c,
0xf91d0da4,
+ 0x6fec6aac, 0xe6bbc7b4, 0x5d8b24bc, 0xd45a81c4, 0x4b29decc,
0xc1f93bd4,
+ 0x38c898dc, 0xaf97f5e4, 0x266752ec, 0x9d36aff4, 0x14060cfc,
0x8ad56a04,
+ 0x01a4c70c, 0x78742414, 0xef43811c, 0x6612de24, 0xdce23b2c,
0x53b19834 },
+
+ { 0x15ea281d, 0x8cb98525, 0x0388e22d, 0x7a583f35, 0xf1279c3d,
0x67f6f945,
+ 0xdec6564d, 0x5595b355, 0xcc65105d, 0x43346d65, 0xba03ca6d,
0x30d32775,
+ 0xa7a2847d, 0x1e71e185, 0x95413e8d, 0x0c109b95, 0x82dff89d,
0xf9af55a5,
+ 0x707eb2ad, 0xe74e0fb5, 0x5e1d6cbd, 0xd4ecc9c5, 0x4bbc26cd,
0xc28b83d5 },
+
+ { 0x84c413be, 0xfb9370c6, 0x7262cdce, 0xe9322ad6, 0x600187de,
0xd6d0e4e6,
+ 0x4da041ee, 0xc46f9ef6, 0x3b3efbfe, 0xb20e5906, 0x28ddb60e,
0x9fad1316,
+ 0x167c701e, 0x8d4bcd26, 0x041b2a2e, 0x7aea8736, 0xf1b9e43e,
0x68894146,
+ 0xdf589e4e, 0x5627fb56, 0xccf7585e, 0x43c6b566, 0xba96126e,
0x31656f76 },
+
+ { 0xf39dff5f, 0x6a6d5c67, 0xe13cb96f, 0x580c1677, 0xcedb737f,
0x45aad087,
+ 0xbc7a2d8f, 0x33498a97, 0xaa18e79f, 0x20e844a7, 0x97b7a1af,
0x0e86feb7,
+ 0x85565bbf, 0xfc25b8c7, 0x72f515cf, 0xe9c472d7, 0x6093cfdf,
0xd7632ce7,
+ 0x4e3289ef, 0xc501e6f7, 0x3bd143ff, 0xb2a0a107, 0x296ffe0f,
0xa03f5b17 },
+
+ { 0x6277eb00, 0xd9474808, 0x5016a510, 0xc6e60218, 0x3db55f20,
0xb484bc28,
+ 0x2b541930, 0xa2237638, 0x18f2d340, 0x8fc23048, 0x06918d50,
0x7d60ea58,
+ 0xf4304760, 0x6affa468, 0xe1cf0170, 0x589e5e78, 0xcf6dbb80,
0x463d1888,
+ 0xbd0c7590, 0x33dbd298, 0xaaab2fa0, 0x217a8ca8, 0x9849e9b0,
0x0f1946b8 }
};
+/* FIXME: aggregate has a partly bracketed initializer
+
+ SOLUTION: When initializing a multi-dimensional array use brackets
around each 'row'.
+*/
const unsigned int CAST256::Base::t_r[8][24]={
- 19, 27, 3, 11, 19, 27, 3, 11, 19, 27, 3, 11, 19, 27, 3, 11, 19, 27, 3,
11, 19, 27, 3, 11,
- 4, 12, 20, 28, 4, 12, 20, 28, 4, 12, 20, 28, 4, 12, 20, 28, 4, 12, 20,
28, 4, 12, 20, 28,
- 21, 29, 5, 13, 21, 29, 5, 13, 21, 29, 5, 13, 21, 29, 5, 13, 21, 29, 5,
13, 21, 29, 5, 13,
- 6, 14, 22, 30, 6, 14, 22, 30, 6, 14, 22, 30, 6, 14, 22, 30, 6, 14, 22,
30, 6, 14, 22, 30,
- 23, 31, 7, 15, 23, 31, 7, 15, 23, 31, 7, 15, 23, 31, 7, 15, 23, 31, 7,
15, 23, 31, 7, 15,
- 8, 16, 24, 0, 8, 16, 24, 0, 8, 16, 24, 0, 8, 16, 24, 0, 8, 16, 24, 0,
8, 16, 24, 0,
- 25, 1, 9, 17, 25, 1, 9, 17, 25, 1, 9, 17, 25, 1, 9, 17, 25, 1, 9, 17,
25, 1, 9, 17,
- 10, 18, 26, 2, 10, 18, 26, 2, 10, 18, 26, 2, 10, 18, 26, 2, 10, 18,
26, 2, 10, 18, 26, 2
+ { 19, 27, 3, 11, 19, 27, 3, 11, 19, 27, 3, 11, 19, 27, 3, 11, 19, 27,
3, 11, 19, 27, 3, 11 },
+ { 4, 12, 20, 28, 4, 12, 20, 28, 4, 12, 20, 28, 4, 12, 20, 28, 4, 12,
20, 28, 4, 12, 20, 28 },
+ { 21, 29, 5, 13, 21, 29, 5, 13, 21, 29, 5, 13, 21, 29, 5, 13, 21, 29,
5, 13, 21, 29, 5, 13 },
+ { 6, 14, 22, 30, 6, 14, 22, 30, 6, 14, 22, 30, 6, 14, 22, 30, 6, 14,
22, 30, 6, 14, 22, 30 },
+ { 23, 31, 7, 15, 23, 31, 7, 15, 23, 31, 7, 15, 23, 31, 7, 15, 23, 31,
7, 15, 23, 31, 7, 15 },
+ { 8, 16, 24, 0, 8, 16, 24, 0, 8, 16, 24, 0, 8, 16, 24, 0, 8, 16, 24,
0, 8, 16, 24, 0 },
+ { 25, 1, 9, 17, 25, 1, 9, 17, 25, 1, 9, 17, 25, 1, 9, 17, 25, 1, 9,
17, 25, 1, 9, 17 },
+ { 10, 18, 26, 2, 10, 18, 26, 2, 10, 18, 26, 2, 10, 18, 26, 2, 10, 18,
26, 2, 10, 18, 26, 2 }
};
--
Stephen Torri
GPG Key: http://www.cs.wustl.edu/~storri/storri.asc
signature.asc
Description: This is a digitally signed message part
