From ebf858b9ae4ab56b3948e9577774f666d7b370dd Mon Sep 17 00:00:00 2001 From: joe-conigliaro Date: Fri, 26 Jul 2019 02:41:38 +1000 Subject: [PATCH] crypto: remove unnecessary casts and comments --- vlib/crypto/aes/const.v | 98 ++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 51 deletions(-) diff --git a/vlib/crypto/aes/const.v b/vlib/crypto/aes/const.v index f55d1280d2..9cb1ab6f79 100644 --- a/vlib/crypto/aes/const.v +++ b/vlib/crypto/aes/const.v @@ -28,77 +28,73 @@ const ( // Powers of x mod poly in GF(2). const ( - // powx = [16]byte{ PowX = [ byte(0x01), - byte(0x02), - byte(0x04), - byte(0x08), - byte(0x10), - byte(0x20), - byte(0x40), - byte(0x80), - byte(0x1b), - byte(0x36), - byte(0x6c), - byte(0xd8), - byte(0xab), - byte(0x4d), - byte(0x9a), - byte(0x2f), + 0x02, + 0x04, + 0x08, + 0x10, + 0x20, + 0x40, + 0x80, + 0x1b, + 0x36, + 0x6c, + 0xd8, + 0xab, + 0x4d, + 0x9a, + 0x2f, ] ) // FIPS-197 Figure 7. S-box substitution values in hexadecimal format. const ( -// SBox0 = byte{ SBox0 = [ - byte(0x63), byte(0x7c), byte(0x77), byte(0x7b), byte(0xf2), byte(0x6b), byte(0x6f), byte(0xc5), byte(0x30), byte(0x01), byte(0x67), byte(0x2b), byte(0xfe), byte(0xd7), byte(0xab), byte(0x76), - byte(0xca), byte(0x82), byte(0xc9), byte(0x7d), byte(0xfa), byte(0x59), byte(0x47), byte(0xf0), byte(0xad), byte(0xd4), byte(0xa2), byte(0xaf), byte(0x9c), byte(0xa4), byte(0x72), byte(0xc0), - byte(0xb7), byte(0xfd), byte(0x93), byte(0x26), byte(0x36), byte(0x3f), byte(0xf7), byte(0xcc), byte(0x34), byte(0xa5), byte(0xe5), byte(0xf1), byte(0x71), byte(0xd8), byte(0x31), byte(0x15), - byte(0x04), byte(0xc7), byte(0x23), byte(0xc3), byte(0x18), byte(0x96), byte(0x05), byte(0x9a), byte(0x07), byte(0x12), byte(0x80), byte(0xe2), byte(0xeb), byte(0x27), byte(0xb2), byte(0x75), - byte(0x09), byte(0x83), byte(0x2c), byte(0x1a), byte(0x1b), byte(0x6e), byte(0x5a), byte(0xa0), byte(0x52), byte(0x3b), byte(0xd6), byte(0xb3), byte(0x29), byte(0xe3), byte(0x2f), byte(0x84), - byte(0x53), byte(0xd1), byte(0x00), byte(0xed), byte(0x20), byte(0xfc), byte(0xb1), byte(0x5b), byte(0x6a), byte(0xcb), byte(0xbe), byte(0x39), byte(0x4a), byte(0x4c), byte(0x58), byte(0xcf), - byte(0xd0), byte(0xef), byte(0xaa), byte(0xfb), byte(0x43), byte(0x4d), byte(0x33), byte(0x85), byte(0x45), byte(0xf9), byte(0x02), byte(0x7f), byte(0x50), byte(0x3c), byte(0x9f), byte(0xa8), - byte(0x51), byte(0xa3), byte(0x40), byte(0x8f), byte(0x92), byte(0x9d), byte(0x38), byte(0xf5), byte(0xbc), byte(0xb6), byte(0xda), byte(0x21), byte(0x10), byte(0xff), byte(0xf3), byte(0xd2), - byte(0xcd), byte(0x0c), byte(0x13), byte(0xec), byte(0x5f), byte(0x97), byte(0x44), byte(0x17), byte(0xc4), byte(0xa7), byte(0x7e), byte(0x3d), byte(0x64), byte(0x5d), byte(0x19), byte(0x73), - byte(0x60), byte(0x81), byte(0x4f), byte(0xdc), byte(0x22), byte(0x2a), byte(0x90), byte(0x88), byte(0x46), byte(0xee), byte(0xb8), byte(0x14), byte(0xde), byte(0x5e), byte(0x0b), byte(0xdb), - byte(0xe0), byte(0x32), byte(0x3a), byte(0x0a), byte(0x49), byte(0x06), byte(0x24), byte(0x5c), byte(0xc2), byte(0xd3), byte(0xac), byte(0x62), byte(0x91), byte(0x95), byte(0xe4), byte(0x79), - byte(0xe7), byte(0xc8), byte(0x37), byte(0x6d), byte(0x8d), byte(0xd5), byte(0x4e), byte(0xa9), byte(0x6c), byte(0x56), byte(0xf4), byte(0xea), byte(0x65), byte(0x7a), byte(0xae), byte(0x08), - byte(0xba), byte(0x78), byte(0x25), byte(0x2e), byte(0x1c), byte(0xa6), byte(0xb4), byte(0xc6), byte(0xe8), byte(0xdd), byte(0x74), byte(0x1f), byte(0x4b), byte(0xbd), byte(0x8b), byte(0x8a), - byte(0x70), byte(0x3e), byte(0xb5), byte(0x66), byte(0x48), byte(0x03), byte(0xf6), byte(0x0e), byte(0x61), byte(0x35), byte(0x57), byte(0xb9), byte(0x86), byte(0xc1), byte(0x1d), byte(0x9e), - byte(0xe1), byte(0xf8), byte(0x98), byte(0x11), byte(0x69), byte(0xd9), byte(0x8e), byte(0x94), byte(0x9b), byte(0x1e), byte(0x87), byte(0xe9), byte(0xce), byte(0x55), byte(0x28), byte(0xdf), - byte(0x8c), byte(0xa1), byte(0x89), byte(0x0d), byte(0xbf), byte(0xe6), byte(0x42), byte(0x68), byte(0x41), byte(0x99), byte(0x2d), byte(0x0f), byte(0xb0), byte(0x54), byte(0xbb), byte(0x16), + byte(0x63), 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, + 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, + 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, + 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75, + 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, + 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf, + 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8, + 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, + 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73, + 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb, + 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, + 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08, + 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a, + 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, + 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf, + 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16, ] ) // FIPS-197 Figure 14. Inverse S-box substitution values in hexadecimal format. const ( -// sbox1 = [256]byte{ SBox1 = [ - byte(0x52), byte(0x09), byte(0x6a), byte(0xd5), byte(0x30), byte(0x36), byte(0xa5), byte(0x38), byte(0xbf), byte(0x40), byte(0xa3), byte(0x9e), byte(0x81), byte(0xf3), byte(0xd7), byte(0xfb), - byte(0x7c), byte(0xe3), byte(0x39), byte(0x82), byte(0x9b), byte(0x2f), byte(0xff), byte(0x87), byte(0x34), byte(0x8e), byte(0x43), byte(0x44), byte(0xc4), byte(0xde), byte(0xe9), byte(0xcb), - byte(0x54), byte(0x7b), byte(0x94), byte(0x32), byte(0xa6), byte(0xc2), byte(0x23), byte(0x3d), byte(0xee), byte(0x4c), byte(0x95), byte(0x0b), byte(0x42), byte(0xfa), byte(0xc3), byte(0x4e), - byte(0x08), byte(0x2e), byte(0xa1), byte(0x66), byte(0x28), byte(0xd9), byte(0x24), byte(0xb2), byte(0x76), byte(0x5b), byte(0xa2), byte(0x49), byte(0x6d), byte(0x8b), byte(0xd1), byte(0x25), - byte(0x72), byte(0xf8), byte(0xf6), byte(0x64), byte(0x86), byte(0x68), byte(0x98), byte(0x16), byte(0xd4), byte(0xa4), byte(0x5c), byte(0xcc), byte(0x5d), byte(0x65), byte(0xb6), byte(0x92), - byte(0x6c), byte(0x70), byte(0x48), byte(0x50), byte(0xfd), byte(0xed), byte(0xb9), byte(0xda), byte(0x5e), byte(0x15), byte(0x46), byte(0x57), byte(0xa7), byte(0x8d), byte(0x9d), byte(0x84), - byte(0x90), byte(0xd8), byte(0xab), byte(0x00), byte(0x8c), byte(0xbc), byte(0xd3), byte(0x0a), byte(0xf7), byte(0xe4), byte(0x58), byte(0x05), byte(0xb8), byte(0xb3), byte(0x45), byte(0x06), - byte(0xd0), byte(0x2c), byte(0x1e), byte(0x8f), byte(0xca), byte(0x3f), byte(0x0f), byte(0x02), byte(0xc1), byte(0xaf), byte(0xbd), byte(0x03), byte(0x01), byte(0x13), byte(0x8a), byte(0x6b), - byte(0x3a), byte(0x91), byte(0x11), byte(0x41), byte(0x4f), byte(0x67), byte(0xdc), byte(0xea), byte(0x97), byte(0xf2), byte(0xcf), byte(0xce), byte(0xf0), byte(0xb4), byte(0xe6), byte(0x73), - byte(0x96), byte(0xac), byte(0x74), byte(0x22), byte(0xe7), byte(0xad), byte(0x35), byte(0x85), byte(0xe2), byte(0xf9), byte(0x37), byte(0xe8), byte(0x1c), byte(0x75), byte(0xdf), byte(0x6e), - byte(0x47), byte(0xf1), byte(0x1a), byte(0x71), byte(0x1d), byte(0x29), byte(0xc5), byte(0x89), byte(0x6f), byte(0xb7), byte(0x62), byte(0x0e), byte(0xaa), byte(0x18), byte(0xbe), byte(0x1b), - byte(0xfc), byte(0x56), byte(0x3e), byte(0x4b), byte(0xc6), byte(0xd2), byte(0x79), byte(0x20), byte(0x9a), byte(0xdb), byte(0xc0), byte(0xfe), byte(0x78), byte(0xcd), byte(0x5a), byte(0xf4), - byte(0x1f), byte(0xdd), byte(0xa8), byte(0x33), byte(0x88), byte(0x07), byte(0xc7), byte(0x31), byte(0xb1), byte(0x12), byte(0x10), byte(0x59), byte(0x27), byte(0x80), byte(0xec), byte(0x5f), - byte(0x60), byte(0x51), byte(0x7f), byte(0xa9), byte(0x19), byte(0xb5), byte(0x4a), byte(0x0d), byte(0x2d), byte(0xe5), byte(0x7a), byte(0x9f), byte(0x93), byte(0xc9), byte(0x9c), byte(0xef), - byte(0xa0), byte(0xe0), byte(0x3b), byte(0x4d), byte(0xae), byte(0x2a), byte(0xf5), byte(0xb0), byte(0xc8), byte(0xeb), byte(0xbb), byte(0x3c), byte(0x83), byte(0x53), byte(0x99), byte(0x61), - byte(0x17), byte(0x2b), byte(0x04), byte(0x7e), byte(0xba), byte(0x77), byte(0xd6), byte(0x26), byte(0xe1), byte(0x69), byte(0x14), byte(0x63), byte(0x55), byte(0x21), byte(0x0c), byte(0x7d), + byte(0x52), 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb, + 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, + 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e, + 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25, + 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, + 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84, + 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06, + 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, + 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73, + 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e, + 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, + 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4, + 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f, + 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, + 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61, + 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d, ] ) // Lookup tables for encryption. // These can be recomputed by adapting the tests in aes_test.go. -// var te0 = [256]uint32{ const ( Te0 = [ 0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d, 0xfff2f20d, 0xd66b6bbd, 0xde6f6fb1, 0x91c5c554,