diff --git a/geo.cpp b/geo.cpp index 7d054ea..ed818e3 100644 --- a/geo.cpp +++ b/geo.cpp @@ -53,16 +53,26 @@ class bit_extract { unsigned r = 0; unsigned count_bits = 0; while (bits >= bits_in_byte) { - r |= *p++ << count_bits; + // The region we're extracting extends to the end of the byte + // we're scanning; extract what's remaining, and add it to + // the result (after shiting it into the correct position) + r |= *p++ << (bits - bits_in_byte); count_bits += bits_in_byte; bits -= bits_in_byte; bits_in_byte = 8; } if (bits > 0) { - unsigned mask = (1 << bits) - 1; - r += (*p & mask) << count_bits; - *p >>= bits; + // The region we're extracting ends in the middle of this byte + // Set the mask to cover that region; add those to the result + // (after shiting it to the correct position) + unsigned mask = ((1 << bits) - 1) << (bits_in_byte - bits); + r += (*p & mask) >> (bits_in_byte - bits); + bits_in_byte -= bits; + + // And remove those bits from the byte (so it doesn't interfer + // with the next field we extract) + *p &= ~mask; } return r; } diff --git a/stl.cpp b/stl.cpp index 7a5a893..dac3ffa 100644 --- a/stl.cpp +++ b/stl.cpp @@ -1,4 +1,5 @@ #include +#include #include "api.h" // diff --git a/testvector.h b/testvector.h index 21b2707..f2af7bd 100644 --- a/testvector.h +++ b/testvector.h @@ -6,12 +6,12 @@ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x1b, 0x59, 0x6e, 0xa4, 0x93, 0xac, 0x9f, 0x74, 0x8c, 0x00, 0x82, 0x7b, 0x0c, 0x8b, 0xce, 0xbd, }, - { 0xc6, 0xb5, 0x6c, 0xc5, 0x46, 0x66, 0x3d, 0x20, - 0xfd, 0xd8, 0x3a, 0xf9, 0x20, 0x62, 0x32, 0x16, }, - { 0x50, 0xe6, 0x11, 0x1b, 0x92, 0xb9, 0x2a, 0x39, - 0x80, 0xd5, 0x9d, 0x69, 0x56, 0x9c, 0xff, 0xa3, - 0x83, 0x88, 0x06, 0x7c, 0x8d, 0x70, 0xd6, 0xc1, - 0x85, 0x2e, 0x19, 0x6e, 0xf4, 0xed, 0x26, 0x89, }, + { 0xc8, 0x21, 0x29, 0x81, 0x9c, 0xf0, 0x53, 0xb7, + 0xd4, 0xc8, 0x52, 0x57, 0x04, 0x10, 0x72, 0xa0, }, + { 0xdc, 0x1c, 0xcb, 0x85, 0xcb, 0xe0, 0x19, 0xde, + 0xf0, 0xdc, 0x10, 0x8c, 0x4d, 0x09, 0x93, 0x61, + 0xea, 0x24, 0x12, 0x72, 0x6c, 0x89, 0x7e, 0x96, + 0xda, 0xc8, 0xe8, 0x43, 0xc0, 0x1e, 0x82, 0x74, }, }, { "shake_128f_simple", @@ -19,12 +19,12 @@ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0xa9, 0x0e, 0x47, 0x15, 0xb9, 0xa9, 0x25, 0xc3, 0x32, 0x80, 0x17, 0x67, 0xfd, 0x78, 0x63, 0x71, }, - { 0x9e, 0x59, 0x80, 0xe2, 0x0c, 0x0c, 0x1f, 0xc0, - 0x2c, 0x7c, 0xf9, 0x47, 0xe8, 0xb6, 0x61, 0xb1, }, - { 0x13, 0x5e, 0x4b, 0xce, 0x56, 0x48, 0x4c, 0x13, - 0x9a, 0xbc, 0x40, 0x60, 0x8f, 0xba, 0x00, 0x94, - 0xb2, 0xb2, 0x7d, 0x6a, 0x5b, 0xe6, 0xc7, 0x4f, - 0x40, 0x7f, 0x60, 0x8a, 0xf5, 0xb1, 0x06, 0xd4, }, + { 0xb5, 0xba, 0x72, 0xd3, 0xa0, 0xba, 0xc2, 0x2d, + 0xf0, 0xbd, 0xe6, 0xbc, 0xfa, 0x9e, 0x41, 0xa1, }, + { 0xd3, 0xbf, 0x28, 0x46, 0xc8, 0x99, 0x46, 0x84, + 0x37, 0x6f, 0x59, 0x56, 0x99, 0x0b, 0x91, 0xb0, + 0x75, 0x87, 0x63, 0x8a, 0x70, 0xd1, 0x1c, 0x24, + 0x1d, 0x3c, 0xda, 0xdf, 0x7a, 0x2c, 0xbf, 0x5c, }, }, { "shake_192f_robust", @@ -34,13 +34,13 @@ 0x91, 0x92, 0x23, 0x80, 0x12, 0x48, 0xff, 0x42, 0x0b, 0xb3, 0x26, 0x28, 0xa7, 0x92, 0x0e, 0xcc, 0x73, 0x10, 0x26, 0xe0, 0xf7, 0x09, 0x6d, 0xbd, }, - { 0x00, 0x34, 0xf8, 0x23, 0xf1, 0x3f, 0xde, 0x06, - 0x5c, 0x2a, 0x61, 0x7d, 0x15, 0x50, 0xd6, 0x7f, - 0x05, 0x56, 0x6f, 0xa5, 0x71, 0xc2, 0x25, 0xb7, }, - { 0x09, 0xf0, 0x3a, 0x1d, 0x49, 0xd9, 0xb7, 0x40, - 0xf5, 0xd9, 0xbb, 0x2d, 0xab, 0xcc, 0x50, 0xf0, - 0xe8, 0xe4, 0x87, 0x7c, 0x7d, 0xfe, 0xcf, 0xc0, - 0x44, 0xf7, 0x54, 0x0c, 0xd9, 0x3c, 0x5c, 0x05, }, + { 0xdf, 0x33, 0xe3, 0x09, 0xca, 0xc6, 0xa4, 0x9a, + 0x12, 0xcb, 0xef, 0x9b, 0x51, 0x4d, 0xa2, 0x3d, + 0xa3, 0x86, 0x2e, 0x71, 0x85, 0xb3, 0xd8, 0x82, }, + { 0x13, 0xbe, 0xf8, 0x78, 0xf3, 0xeb, 0x13, 0x3d, + 0x8f, 0x89, 0x60, 0x1c, 0x05, 0xa6, 0x71, 0x2b, + 0x2b, 0xd5, 0xde, 0xe9, 0x82, 0xbb, 0xa1, 0x5f, + 0x92, 0x91, 0xa7, 0x8d, 0x69, 0xe2, 0x6d, 0x33, }, }, { "shake_192f_simple", @@ -50,13 +50,13 @@ 0x3f, 0x01, 0xb0, 0x6b, 0xeb, 0xed, 0x02, 0x0a, 0x45, 0x96, 0x96, 0x86, 0x8d, 0x11, 0x5f, 0xe8, 0x50, 0x7d, 0xed, 0x8d, 0xc0, 0x8e, 0x82, 0x5d, }, - { 0x88, 0x41, 0x23, 0x4e, 0x70, 0xc3, 0x1b, 0x44, - 0x27, 0x36, 0xfd, 0x5a, 0x9b, 0x6c, 0x2b, 0x7b, - 0x01, 0x30, 0x73, 0xf6, 0x83, 0x9e, 0x7b, 0xb6, }, - { 0x6f, 0x5b, 0x6d, 0x9f, 0x6c, 0x11, 0x1a, 0x10, - 0x6e, 0xa6, 0x1a, 0x71, 0x37, 0xa2, 0x35, 0xf8, - 0xac, 0x54, 0x76, 0x22, 0x11, 0x99, 0x0c, 0x3f, - 0x35, 0x02, 0xda, 0x17, 0x74, 0x5b, 0x4b, 0xf5, }, + { 0x7e, 0x9d, 0x4f, 0xc3, 0x27, 0x15, 0x4e, 0x25, + 0x91, 0x45, 0x81, 0xe9, 0xdd, 0x39, 0x0e, 0xa4, + 0x36, 0xa2, 0x93, 0x46, 0xf9, 0x2d, 0x73, 0x54, }, + { 0x3f, 0x39, 0xee, 0x50, 0xb0, 0xcc, 0x61, 0xea, + 0xf4, 0xc3, 0x5f, 0xc4, 0xa8, 0x76, 0x01, 0x1e, + 0x5e, 0xa4, 0x15, 0xb0, 0xd7, 0x22, 0xf2, 0xb0, + 0x30, 0xf6, 0x64, 0xc6, 0xa7, 0x8a, 0x07, 0x4c, }, }, { "shake_256f_robust", @@ -68,14 +68,14 @@ 0xb8, 0x38, 0x19, 0x99, 0x22, 0x40, 0xf9, 0xeb, 0x70, 0x53, 0xe9, 0x06, 0x64, 0x54, 0x02, 0x18, 0xdd, 0xcb, 0x50, 0x66, 0x73, 0x93, 0x26, 0xfa, }, - { 0xfc, 0x8d, 0x27, 0xed, 0x0d, 0x2a, 0x7e, 0xc5, - 0xb9, 0x7d, 0xd5, 0x2f, 0x86, 0x72, 0x7f, 0x69, - 0x70, 0xa3, 0x1e, 0xc4, 0x21, 0x7e, 0xd5, 0x37, - 0x49, 0x9e, 0x76, 0x10, 0xce, 0xca, 0x4d, 0x21, }, - { 0x7f, 0x3e, 0xee, 0x87, 0x49, 0x9b, 0xa6, 0x24, - 0xe6, 0x74, 0x00, 0x56, 0x67, 0x70, 0xe0, 0x9e, - 0x2b, 0xbe, 0xc5, 0xd5, 0xb3, 0xeb, 0x87, 0x61, - 0xc1, 0x23, 0xf9, 0x87, 0xbd, 0xed, 0x3e, 0x28, }, + { 0xb6, 0xa7, 0x8f, 0xa1, 0x5a, 0xfe, 0xbd, 0xfd, + 0xc6, 0xfc, 0xf8, 0xad, 0xde, 0x3b, 0x08, 0xc1, + 0x08, 0xe8, 0xac, 0x49, 0x7d, 0xf2, 0xa4, 0xa4, + 0x8b, 0xd8, 0x61, 0x85, 0x94, 0xc9, 0x03, 0x43, }, + { 0x12, 0xd7, 0x5c, 0xb6, 0x0a, 0x95, 0xdc, 0xe0, + 0x9e, 0x13, 0x1b, 0x17, 0x34, 0xf9, 0xa9, 0xa0, + 0xf7, 0x03, 0xa4, 0x54, 0x0c, 0x2c, 0x6e, 0x02, + 0xd7, 0xc0, 0xec, 0xff, 0xae, 0xfa, 0x74, 0x8e, }, }, { "shake_256f_simple", @@ -87,14 +87,14 @@ 0x5b, 0xbf, 0x91, 0x61, 0xfd, 0xef, 0xa2, 0x1b, 0xd0, 0xfe, 0x0b, 0xfe, 0x19, 0x15, 0x7a, 0x57, 0x11, 0xa8, 0xde, 0x8a, 0x8f, 0x68, 0x78, 0xe6, }, - { 0x5e, 0xe7, 0x92, 0x0f, 0x5e, 0xbc, 0x5c, 0xbb, - 0x0c, 0xa6, 0xd0, 0x66, 0x80, 0x42, 0x66, 0xc8, - 0x9d, 0x30, 0x14, 0xbc, 0xe1, 0x09, 0x56, 0x0d, - 0x3e, 0xe6, 0x55, 0xf2, 0x1d, 0x80, 0x94, 0x01, }, - { 0x53, 0xd6, 0x3d, 0xda, 0x8e, 0x88, 0xc6, 0x40, - 0x8c, 0xc0, 0x13, 0x0e, 0xc1, 0xab, 0x3c, 0x98, - 0x0c, 0x26, 0x0d, 0x90, 0x24, 0x4e, 0x92, 0x56, - 0x50, 0x20, 0xbc, 0x67, 0x7d, 0xdd, 0xd6, 0x7a, }, + { 0x17, 0xda, 0xe2, 0xc3, 0xce, 0x09, 0x3c, 0x19, + 0x08, 0xe3, 0x85, 0x71, 0x9e, 0xbb, 0xfa, 0x26, + 0xb8, 0x3d, 0x45, 0x06, 0x39, 0x80, 0xc2, 0x1c, + 0xf2, 0xf1, 0xcb, 0xb8, 0x72, 0x6c, 0x70, 0x59, }, + { 0xcc, 0xbf, 0xec, 0x36, 0x80, 0x6e, 0x06, 0xdc, + 0xd3, 0x04, 0x68, 0x6e, 0xfc, 0x10, 0xba, 0x9d, + 0xae, 0xca, 0xed, 0xab, 0xf9, 0x38, 0x33, 0xe3, + 0x85, 0xbf, 0xc1, 0xd5, 0x2b, 0xc3, 0xc5, 0x14, }, }, { "shake_128s_robust", @@ -102,12 +102,12 @@ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0xda, 0x79, 0xbd, 0xe3, 0xca, 0xe0, 0xf6, 0x63, 0xec, 0x5c, 0x82, 0x48, 0xeb, 0xad, 0x07, 0xf2, }, - { 0x85, 0xf3, 0x54, 0x32, 0xad, 0xe4, 0xae, 0x56, - 0x85, 0x0e, 0x9e, 0xe0, 0xaf, 0x6e, 0x70, 0x40, }, - { 0xb4, 0xb2, 0xc4, 0x1c, 0x97, 0xb3, 0x37, 0x5f, - 0xf6, 0xd9, 0xc8, 0xf5, 0x31, 0xf5, 0xa8, 0xbc, - 0x1e, 0x3f, 0x6b, 0x89, 0x67, 0x8e, 0x55, 0xb5, - 0x05, 0xce, 0xd9, 0x55, 0x3d, 0x1e, 0xb5, 0x3f, }, + { 0x8b, 0xa2, 0xdd, 0x82, 0x0f, 0x6f, 0x03, 0x13, + 0xa9, 0x5e, 0x5a, 0xc5, 0xe4, 0xc1, 0x32, 0x91, }, + { 0x16, 0x40, 0xee, 0x16, 0x2b, 0xcd, 0x05, 0x83, + 0xac, 0xac, 0x48, 0xc4, 0xb1, 0xb7, 0xbc, 0xf0, + 0x28, 0x99, 0xfa, 0xc4, 0xcb, 0x2e, 0xcf, 0x56, + 0x94, 0x19, 0xf3, 0x47, 0x19, 0x7f, 0x09, 0x7a, }, }, { "shake_128s_simple", @@ -115,12 +115,12 @@ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x89, 0xfd, 0x81, 0xfd, 0xbb, 0x5b, 0x94, 0x12, 0x9b, 0x14, 0x76, 0x1b, 0xdc, 0x6b, 0xf6, 0x82, }, - { 0x1d, 0xc2, 0x1e, 0xee, 0xcb, 0x54, 0xd3, 0xda, - 0x90, 0xb8, 0x26, 0x41, 0x35, 0xb2, 0x2d, 0xda, }, - { 0x1c, 0x2a, 0x10, 0xe7, 0x74, 0xe5, 0xdd, 0x44, - 0x8a, 0x19, 0xbf, 0xd8, 0x1f, 0xeb, 0x35, 0xe7, - 0x10, 0x8b, 0x19, 0x92, 0xf7, 0x04, 0x4c, 0x35, - 0x28, 0x7e, 0xd7, 0x3c, 0xce, 0xf3, 0xb2, 0x5e, }, + { 0xb4, 0x84, 0x27, 0x62, 0x09, 0x05, 0xd4, 0x15, + 0x14, 0xcb, 0x45, 0xf1, 0xe5, 0x8f, 0x20, 0xc0, }, + { 0x1f, 0x64, 0xc4, 0x09, 0x5b, 0x4a, 0x56, 0xed, + 0xa2, 0x7b, 0xf5, 0x85, 0x09, 0x37, 0x57, 0x7e, + 0x56, 0x0d, 0xc6, 0x48, 0x53, 0x9c, 0x73, 0xad, + 0x53, 0x91, 0xda, 0x29, 0x1c, 0xb0, 0x07, 0x27, }, }, { "shake_192s_robust", @@ -130,13 +130,13 @@ 0x15, 0x6a, 0x6f, 0x30, 0x10, 0x0d, 0x61, 0xe7, 0xc1, 0x23, 0xea, 0x11, 0x46, 0x03, 0x05, 0x38, 0x6e, 0xd7, 0x4f, 0x7d, 0x26, 0x90, 0x2f, 0xec, }, - { 0xb5, 0x1f, 0xd7, 0x07, 0xbd, 0x28, 0x95, 0xb4, - 0x84, 0x97, 0x32, 0x3d, 0xf6, 0x3e, 0xd6, 0x4f, - 0xda, 0x13, 0x2c, 0xf2, 0x0f, 0xc6, 0x30, 0x99, }, - { 0x13, 0x34, 0x5d, 0x6f, 0x87, 0xe3, 0x77, 0x61, - 0x53, 0x36, 0x7c, 0x4e, 0x0d, 0xe9, 0x85, 0xb8, - 0x17, 0x3a, 0x75, 0xc8, 0xd1, 0x49, 0x6f, 0x25, - 0x65, 0x6e, 0x63, 0x72, 0x48, 0xba, 0x0f, 0xf7, }, + { 0xfa, 0xcb, 0x94, 0x31, 0xe1, 0xc4, 0xb0, 0xb7, + 0x5a, 0x3f, 0xd6, 0xaf, 0x7f, 0x5d, 0x38, 0xdd, + 0xb1, 0x63, 0x5f, 0x3d, 0x20, 0xc1, 0x29, 0x0b, }, + { 0xc2, 0xc9, 0xd9, 0x3a, 0xff, 0x63, 0x95, 0xd9, + 0x18, 0x8c, 0xf5, 0xbe, 0xc6, 0xbe, 0xf1, 0xe3, + 0x42, 0x71, 0x48, 0x87, 0xdd, 0xcb, 0xfc, 0xba, + 0x95, 0xa6, 0x2d, 0xb4, 0x24, 0xb9, 0xaa, 0xcd, }, }, { "shake_192s_simple", @@ -146,13 +146,13 @@ 0xeb, 0x24, 0x7f, 0x95, 0x5d, 0x8e, 0xca, 0x24, 0xa5, 0x86, 0x05, 0x36, 0xc5, 0x6b, 0x2c, 0x4d, 0x1e, 0x8d, 0x8e, 0x83, 0x5e, 0xb2, 0x7d, 0x2d, }, - { 0x88, 0xc0, 0x68, 0x73, 0x46, 0xda, 0xe0, 0xc3, - 0x3d, 0x12, 0x45, 0x65, 0x49, 0x62, 0xaf, 0x2f, - 0x45, 0x57, 0x1a, 0x51, 0x0c, 0x7a, 0x32, 0xc4, }, - { 0x62, 0xe8, 0x56, 0xa3, 0x50, 0x1d, 0xec, 0x02, - 0x43, 0xe2, 0x4e, 0xdd, 0x6b, 0x9b, 0xe0, 0x6b, - 0x50, 0x5f, 0x47, 0x24, 0x2d, 0xe6, 0x15, 0x16, - 0x2c, 0xf7, 0x34, 0xa7, 0xaa, 0xf0, 0xc4, 0xb5, }, + { 0xb4, 0x75, 0xc8, 0xc4, 0x80, 0xdb, 0x53, 0x84, + 0x20, 0xd0, 0xf2, 0xba, 0x02, 0xf4, 0xe9, 0x43, + 0x27, 0x10, 0x90, 0x7a, 0x1d, 0x1c, 0x82, 0x6b, }, + { 0xcd, 0x7d, 0x16, 0x1a, 0x91, 0xfc, 0xc4, 0x96, + 0x4c, 0x08, 0xc7, 0x42, 0xcd, 0x4b, 0x6a, 0xbd, + 0xbf, 0x81, 0x38, 0xc7, 0x7e, 0x6f, 0x3c, 0x8e, + 0x75, 0xa3, 0x87, 0x39, 0x4a, 0x77, 0x92, 0xeb, }, }, { "shake_256s_robust", @@ -164,14 +164,14 @@ 0x72, 0xca, 0x3b, 0x27, 0x0b, 0x4e, 0x23, 0x99, 0x21, 0x18, 0x69, 0x3a, 0x31, 0x1b, 0xd6, 0xd9, 0x4b, 0xa8, 0xc7, 0xa2, 0xbb, 0x1e, 0xf1, 0x2b, }, - { 0x73, 0xd1, 0xa9, 0x67, 0x47, 0x73, 0x87, 0x80, - 0x2e, 0xd0, 0x02, 0x2c, 0xba, 0x0c, 0xf2, 0x74, - 0x35, 0x7a, 0x52, 0xf9, 0x16, 0x8b, 0x64, 0x4f, - 0xd1, 0x20, 0xeb, 0xfc, 0x8c, 0xb8, 0xa6, 0x73, }, - { 0x05, 0x5e, 0xaf, 0x79, 0x55, 0x3a, 0x57, 0x7c, - 0x1e, 0x75, 0xae, 0xcd, 0x85, 0x62, 0x4b, 0xe2, - 0x4b, 0x1c, 0xc5, 0x1d, 0x12, 0xcc, 0x5e, 0x15, - 0xff, 0x2c, 0xd2, 0xe3, 0x11, 0xc9, 0x04, 0x5b, }, + { 0xbf, 0x44, 0x11, 0x48, 0x97, 0x13, 0x98, 0x00, + 0x5e, 0xba, 0x57, 0x97, 0x5a, 0x48, 0xa4, 0x0a, + 0x24, 0xf7, 0x1f, 0xd5, 0x6d, 0xd9, 0x63, 0xa9, + 0x82, 0xb7, 0x4a, 0x7d, 0xd0, 0xad, 0x61, 0x71, }, + { 0xbe, 0x80, 0x06, 0x4f, 0x16, 0xde, 0x41, 0x32, + 0x00, 0x0c, 0xd2, 0x24, 0xad, 0x6e, 0xb0, 0xc4, + 0x4f, 0xff, 0x2d, 0xfc, 0x17, 0x81, 0xf3, 0x99, + 0xeb, 0xf4, 0x47, 0x26, 0x34, 0xa3, 0x1c, 0xaf, }, }, { "shake_256s_simple", @@ -183,14 +183,14 @@ 0x69, 0xfd, 0x48, 0x4b, 0x9e, 0x97, 0x7e, 0xb7, 0x7a, 0x4f, 0x23, 0x35, 0x50, 0x75, 0x7e, 0x02, 0x5c, 0xf1, 0x80, 0xed, 0xe7, 0xe8, 0x83, 0x9f, }, - { 0x43, 0xb0, 0x57, 0x64, 0x5c, 0xaf, 0xa9, 0xe2, - 0x90, 0x49, 0xf6, 0xc8, 0x76, 0x25, 0xb9, 0xb9, - 0x9d, 0x49, 0x53, 0x67, 0xff, 0x5d, 0xc0, 0x4d, - 0x5e, 0x94, 0x05, 0xc3, 0x86, 0xc3, 0xc8, 0x59, }, - { 0x54, 0x44, 0xa9, 0x87, 0x61, 0x6c, 0x1b, 0xd3, - 0xde, 0x27, 0x2a, 0xe0, 0x93, 0xb3, 0x3f, 0x5b, - 0x00, 0xb3, 0x58, 0x8c, 0x47, 0x70, 0x05, 0x07, - 0xd9, 0xf8, 0x84, 0x25, 0x51, 0xeb, 0xd3, 0x4b, }, + { 0x78, 0xb0, 0x24, 0x53, 0x14, 0x57, 0xb6, 0x08, + 0x5c, 0x01, 0x0c, 0x36, 0x28, 0x2b, 0x11, 0x38, + 0xde, 0x9b, 0xb4, 0x11, 0xce, 0x1e, 0x37, 0x65, + 0x99, 0x44, 0x41, 0x90, 0xed, 0x4d, 0x9f, 0xae, }, + { 0x5e, 0x4b, 0xd0, 0xc4, 0x62, 0x4f, 0x35, 0x31, + 0x44, 0xfd, 0xe4, 0x9a, 0x98, 0xab, 0xa8, 0xba, + 0x86, 0x00, 0xc5, 0x66, 0xc8, 0x61, 0x82, 0x15, + 0xa1, 0x1b, 0x41, 0x71, 0xec, 0x2c, 0x7f, 0xb9, }, }, { "sha2_128f_robust", @@ -198,12 +198,12 @@ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0xbc, 0x4a, 0x4a, 0x6c, 0xc7, 0xa1, 0x10, 0x64, 0x9a, 0x95, 0x96, 0xc2, 0x15, 0xc6, 0x69, 0x5c, }, - { 0xe5, 0xa0, 0x41, 0xe5, 0x2b, 0x14, 0x02, 0x35, - 0x14, 0xe2, 0xe8, 0x46, 0xd6, 0x13, 0x70, 0x07, }, - { 0x4d, 0x44, 0x95, 0x80, 0x6f, 0x23, 0x7e, 0xe9, - 0x83, 0x2b, 0x41, 0x95, 0xc7, 0x51, 0xd1, 0xc5, - 0xcf, 0x7b, 0xb1, 0x05, 0x39, 0xcb, 0xf0, 0xab, - 0x2b, 0x6a, 0xaf, 0x9d, 0x8d, 0x50, 0xa6, 0xaf, }, + { 0xbd, 0x01, 0x86, 0x19, 0x2a, 0xeb, 0x5e, 0x0f, + 0x10, 0x9e, 0x44, 0xa7, 0xa2, 0x58, 0x80, 0x18, }, + { 0x4b, 0xd3, 0xb7, 0x72, 0x97, 0x1b, 0x18, 0x2b, + 0x00, 0xbd, 0xd6, 0xca, 0x88, 0x18, 0xa8, 0x25, + 0x57, 0x43, 0xd2, 0x52, 0xa3, 0x79, 0x21, 0xe5, + 0x9d, 0x0c, 0x54, 0xdd, 0xc7, 0x38, 0xe6, 0xb0, }, }, { "sha2_128f_simple", @@ -211,12 +211,12 @@ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x3b, 0x56, 0xe8, 0x16, 0x84, 0x7f, 0x00, 0x03, 0x86, 0xae, 0xec, 0x2e, 0x2b, 0xb9, 0xe1, 0xb5, }, - { 0x8a, 0xfe, 0x14, 0x2a, 0x4d, 0x6e, 0x61, 0xb7, - 0x09, 0x8b, 0x97, 0xe0, 0x49, 0xa4, 0x47, 0x02, }, - { 0x3a, 0x8d, 0x69, 0x64, 0x69, 0x52, 0xee, 0xfa, - 0xec, 0x08, 0xcc, 0x86, 0x06, 0x5c, 0xfa, 0xa7, - 0xed, 0x56, 0x58, 0x5d, 0xd1, 0x85, 0xad, 0x41, - 0x7d, 0x1d, 0xed, 0xa5, 0x0f, 0x1b, 0xdc, 0xb4, }, + { 0x9e, 0x9c, 0x88, 0x01, 0xbb, 0x10, 0x31, 0x83, + 0xbf, 0xd6, 0x2a, 0xc9, 0xed, 0x12, 0x65, 0x1f, }, + { 0x64, 0x18, 0x40, 0xfb, 0xae, 0x50, 0x52, 0x29, + 0x31, 0xc6, 0x79, 0xcb, 0xc2, 0x71, 0xc5, 0x92, + 0x2c, 0x54, 0xef, 0xd0, 0xab, 0xd8, 0x0a, 0xa3, + 0xe1, 0x1e, 0xd4, 0xea, 0x4f, 0x4e, 0x10, 0x8a, }, }, { "sha2_192f_robust", @@ -226,13 +226,13 @@ 0xd8, 0x15, 0x52, 0x60, 0x46, 0xc4, 0x38, 0xb7, 0x53, 0x85, 0x86, 0xcb, 0x0d, 0x96, 0x4a, 0xd4, 0xf3, 0x94, 0xbe, 0x6d, 0x06, 0xfd, 0xb9, 0x23, }, - { 0xaa, 0x96, 0x0b, 0x27, 0xae, 0x51, 0x9c, 0x71, - 0x82, 0xdf, 0x63, 0xe7, 0x38, 0xb6, 0x81, 0xb9, - 0xb6, 0xf7, 0x0a, 0x6b, 0xd8, 0x81, 0x0a, 0xfb, }, - { 0xa0, 0xb4, 0xa0, 0xce, 0x70, 0x0d, 0x8d, 0xe5, - 0x79, 0x8e, 0x2e, 0x2e, 0xe9, 0x3c, 0x2a, 0x25, - 0xd2, 0x23, 0xc6, 0xea, 0x41, 0xa6, 0xc4, 0x7e, - 0x56, 0x8c, 0xb0, 0xb4, 0xb3, 0x50, 0x55, 0x7c, }, + { 0x33, 0x78, 0xd0, 0xa2, 0x3a, 0x04, 0x11, 0x62, + 0xb1, 0xc7, 0x58, 0x76, 0x31, 0x6b, 0xba, 0x5a, + 0xde, 0x6c, 0x07, 0xb1, 0x0b, 0xc4, 0x17, 0xbc, }, + { 0x4a, 0x91, 0x4a, 0x40, 0x3f, 0x4d, 0x1e, 0x0f, + 0xf3, 0x32, 0xa6, 0x3b, 0x5a, 0x3f, 0x2b, 0x7f, + 0xa3, 0x8c, 0x82, 0x6b, 0xb3, 0xfe, 0xa9, 0x86, + 0xb3, 0x64, 0x16, 0x5a, 0xa5, 0xdd, 0x40, 0xa2, }, }, { "sha2_192f_simple", @@ -242,13 +242,13 @@ 0x92, 0x36, 0xcc, 0xeb, 0xbb, 0x3a, 0x90, 0xac, 0x24, 0x52, 0xdd, 0x89, 0xde, 0x49, 0xda, 0xb1, 0x34, 0x0e, 0xc0, 0x24, 0x19, 0xa2, 0x87, 0x0e, }, - { 0x7b, 0x28, 0x3f, 0xd1, 0x69, 0x03, 0xd6, 0xdf, - 0x1e, 0xd4, 0x38, 0x89, 0x1a, 0x29, 0x0f, 0x78, - 0xe9, 0xf1, 0xf3, 0x52, 0xd2, 0x9b, 0xdd, 0xdf, }, - { 0x64, 0x50, 0x02, 0x3d, 0xfa, 0x11, 0x3b, 0x6c, - 0xc8, 0x0c, 0xa1, 0x34, 0x03, 0x52, 0xaf, 0x5b, - 0xd9, 0x74, 0x9a, 0xe3, 0x56, 0x68, 0x5b, 0x25, - 0x03, 0x61, 0x50, 0xc0, 0x09, 0xb5, 0x1a, 0x0d, }, + { 0xc5, 0x01, 0x20, 0x9f, 0x23, 0xca, 0x9a, 0x8b, + 0xdb, 0x6e, 0xc7, 0xb1, 0x4c, 0x86, 0x7b, 0xca, + 0x22, 0xba, 0x8f, 0x42, 0xe6, 0x44, 0x91, 0xef, }, + { 0x19, 0x84, 0xea, 0xce, 0xe6, 0x26, 0x04, 0xf7, + 0x0e, 0xa0, 0xd9, 0x81, 0x60, 0x25, 0x68, 0x9b, + 0x50, 0x93, 0x08, 0x5c, 0x45, 0xab, 0x91, 0x7e, + 0x49, 0x84, 0xb1, 0x79, 0xc6, 0x86, 0xdd, 0x5c, }, }, { "sha2_256f_robust", @@ -260,14 +260,14 @@ 0x1b, 0x68, 0x4b, 0x1d, 0x61, 0xfe, 0xf9, 0xea, 0x2b, 0x6c, 0xe4, 0x01, 0x8d, 0x26, 0x51, 0xd2, 0x2f, 0x5f, 0x28, 0x06, 0x15, 0xc5, 0xa3, 0x5d, }, - { 0x05, 0xe3, 0xa8, 0x6b, 0xaf, 0xce, 0xd7, 0xc5, - 0xe7, 0xdf, 0x5a, 0x94, 0xbf, 0xc1, 0x1f, 0x3d, - 0x19, 0xb6, 0x4e, 0x27, 0x5f, 0x4e, 0x4f, 0xb3, - 0x57, 0x5c, 0xb6, 0x31, 0xa4, 0xa1, 0x0f, 0x81, }, - { 0xee, 0x43, 0x54, 0xdf, 0x91, 0x36, 0x32, 0x2a, - 0x80, 0xf2, 0xd1, 0xa5, 0x88, 0x35, 0x93, 0xb6, - 0x9e, 0x23, 0x99, 0x85, 0x67, 0x63, 0xf0, 0x12, - 0x1b, 0x48, 0xde, 0xf4, 0xaa, 0x9f, 0x1a, 0xfb, }, + { 0x2e, 0x45, 0xf2, 0xf7, 0x85, 0x55, 0xd8, 0x8e, + 0x0d, 0x16, 0xda, 0x89, 0x3e, 0x83, 0x5b, 0xc7, + 0xb1, 0x3c, 0x71, 0xc2, 0x5e, 0x32, 0x83, 0x9d, + 0x81, 0x0a, 0x1f, 0x02, 0x1a, 0xcf, 0x56, 0x79, }, + { 0xdf, 0x0a, 0xa7, 0xf8, 0x36, 0x29, 0x15, 0x44, + 0xd4, 0xf2, 0xf6, 0x60, 0xe0, 0xc4, 0x55, 0x66, + 0x83, 0xaa, 0x2a, 0xc1, 0x64, 0xc7, 0xd5, 0xc4, + 0x8a, 0x93, 0x3e, 0xc8, 0xf3, 0x13, 0x02, 0x94, }, }, { "sha2_256f_simple", @@ -279,14 +279,14 @@ 0x06, 0x37, 0x52, 0x68, 0x4d, 0xf7, 0x7c, 0x8b, 0x58, 0xc2, 0x25, 0xdc, 0x6b, 0x49, 0x12, 0x08, 0x91, 0x6b, 0x65, 0x4e, 0xa1, 0x39, 0x31, 0x76, }, - { 0x58, 0xd8, 0x06, 0x84, 0xe2, 0xf9, 0x9c, 0x28, - 0x3e, 0xc4, 0x96, 0x32, 0x90, 0x99, 0x98, 0x31, - 0x15, 0x5c, 0x77, 0xa6, 0x0b, 0x43, 0x86, 0x21, - 0x3e, 0xff, 0x35, 0x27, 0xf2, 0x19, 0x8d, 0xaf, }, - { 0xab, 0xd0, 0xe7, 0x42, 0xb2, 0xbc, 0x4e, 0xe0, - 0xb9, 0x41, 0xca, 0x81, 0x28, 0x4b, 0x7e, 0x05, - 0xc3, 0xd4, 0x7c, 0xff, 0x60, 0x0e, 0x2c, 0x10, - 0x66, 0x3f, 0x05, 0x4d, 0xe7, 0x92, 0xee, 0x0f, }, + { 0xc7, 0xf2, 0x92, 0x7f, 0x02, 0xf4, 0x81, 0x00, + 0x4f, 0x0d, 0xbd, 0x05, 0x66, 0xea, 0x27, 0x2c, + 0xde, 0x2c, 0x28, 0x54, 0xb5, 0x95, 0xe3, 0xb3, + 0xd3, 0xc1, 0xa2, 0x23, 0x50, 0xc3, 0x94, 0xaa, }, + { 0x98, 0x0f, 0x05, 0x57, 0x1c, 0xd0, 0x23, 0xdd, + 0xcf, 0x05, 0xec, 0xb9, 0xcf, 0x98, 0x77, 0xed, + 0xe8, 0x8a, 0x37, 0x70, 0x8d, 0xac, 0xee, 0x20, + 0x0f, 0xda, 0x65, 0xd4, 0x4b, 0x3b, 0xe1, 0xba, }, }, { "sha2_128s_robust", @@ -294,12 +294,12 @@ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x7f, 0xd2, 0xf7, 0x44, 0x05, 0x88, 0x29, 0x15, 0x06, 0x81, 0xfc, 0xa2, 0xce, 0xba, 0x6c, 0x92, }, - { 0xa5, 0xcc, 0x0d, 0xf9, 0xf0, 0xc9, 0x53, 0xf7, - 0xf1, 0x7e, 0x8d, 0x3e, 0xcb, 0xeb, 0x24, 0xf1, }, - { 0x60, 0xaa, 0x12, 0xcb, 0x0b, 0x88, 0x36, 0x45, - 0xf4, 0x48, 0x82, 0x12, 0x2d, 0x13, 0x79, 0x20, - 0x88, 0x9f, 0xa8, 0x00, 0x66, 0x50, 0x71, 0x77, - 0x51, 0xef, 0xf5, 0x20, 0x26, 0x39, 0x3c, 0x62, }, + { 0xb7, 0xfc, 0x1b, 0x5c, 0x24, 0x44, 0xdf, 0xa2, + 0xbe, 0xe9, 0x4b, 0xa8, 0x7b, 0xaf, 0x03, 0x47, }, + { 0x70, 0x51, 0x4d, 0xef, 0x36, 0x66, 0xb1, 0x13, + 0x36, 0xf9, 0x60, 0xaa, 0x03, 0x71, 0xd9, 0x4d, + 0x05, 0xb7, 0x23, 0x0f, 0x83, 0x99, 0xfd, 0x98, + 0x6b, 0xb1, 0x83, 0xae, 0xa1, 0x0c, 0xfd, 0x53, }, }, { "sha2_128s_simple", @@ -307,12 +307,12 @@ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x99, 0x0c, 0xe6, 0x29, 0x87, 0x92, 0xb1, 0x28, 0x84, 0x6a, 0x8e, 0x4a, 0x3a, 0x68, 0x95, 0x4c, }, - { 0x4d, 0xed, 0x53, 0x6f, 0x9d, 0x58, 0x50, 0x49, - 0x6b, 0x59, 0xb0, 0xef, 0x59, 0x5f, 0x79, 0xe0, }, - { 0x4b, 0xd4, 0x81, 0xee, 0xc0, 0x14, 0x83, 0x46, - 0x7c, 0x00, 0xcc, 0xf6, 0x38, 0xe3, 0x2e, 0xd5, - 0xe6, 0x7c, 0x5b, 0xdb, 0x0e, 0x02, 0xed, 0x02, - 0x92, 0xe4, 0xbc, 0xa5, 0xc1, 0xf8, 0x4a, 0x04, }, + { 0x2f, 0x5d, 0x11, 0x78, 0xbc, 0x8f, 0xab, 0x78, + 0x44, 0xa1, 0x3c, 0x25, 0x86, 0x8e, 0xef, 0x7d, }, + { 0x21, 0xf1, 0x08, 0x0f, 0x46, 0x99, 0xab, 0x6d, + 0xbf, 0x77, 0xa1, 0x3d, 0x39, 0x42, 0xa7, 0x0a, + 0x4b, 0xea, 0xe7, 0x4c, 0xb4, 0xac, 0xe7, 0x54, + 0x30, 0xc7, 0x38, 0x3e, 0x0a, 0xdb, 0x2f, 0xa1, }, }, { "sha2_192s_robust", @@ -322,13 +322,13 @@ 0x39, 0xa1, 0x80, 0x22, 0x23, 0x17, 0xdc, 0x21, 0xec, 0x82, 0x27, 0xb3, 0xe4, 0xbf, 0x9a, 0x7b, 0xf2, 0xe5, 0x36, 0x15, 0xae, 0xf1, 0x90, 0x6d, }, - { 0xa1, 0x01, 0x46, 0xcd, 0x28, 0x4d, 0x4a, 0x2a, - 0xa0, 0x92, 0x89, 0x57, 0xa3, 0x33, 0x8a, 0xe5, - 0x1e, 0x95, 0x1c, 0xbd, 0x66, 0x97, 0x7e, 0xe4, }, - { 0x8b, 0xf3, 0x56, 0xca, 0x6e, 0xc5, 0x86, 0xb9, - 0xd2, 0x4d, 0x37, 0x04, 0x09, 0x43, 0x8c, 0xf3, - 0x71, 0x3e, 0xd6, 0x57, 0x5d, 0xd0, 0x9a, 0xe7, - 0x99, 0x79, 0x95, 0x2d, 0xfd, 0x60, 0x1b, 0xdf, }, + { 0x08, 0x98, 0xc1, 0x87, 0x36, 0xed, 0x8e, 0x1a, + 0x2a, 0x85, 0x0d, 0xeb, 0x7a, 0xb3, 0x74, 0xe1, + 0xff, 0x03, 0xf1, 0x9b, 0x19, 0x64, 0x01, 0x53, }, + { 0xfc, 0xfb, 0x0a, 0x3d, 0x1d, 0xc8, 0xb9, 0x89, + 0xc1, 0xad, 0x07, 0xee, 0xf8, 0xbd, 0xc1, 0xce, + 0x77, 0x85, 0xdd, 0x24, 0xdd, 0xf7, 0x56, 0x39, + 0xfd, 0xb5, 0x02, 0x52, 0xae, 0x89, 0xae, 0xe7, }, }, { "sha2_192s_simple", @@ -338,13 +338,13 @@ 0xb6, 0xf2, 0x82, 0xce, 0x11, 0x6f, 0xf5, 0x9b, 0xce, 0x2d, 0x9f, 0xc4, 0xa6, 0x7c, 0x60, 0x31, 0xda, 0xbd, 0xce, 0x32, 0x6c, 0x34, 0xf5, 0x41, }, - { 0x4d, 0xa1, 0x9f, 0x37, 0xe4, 0x93, 0x65, 0xf3, - 0x70, 0x99, 0xa5, 0x0f, 0x8e, 0x6f, 0xdd, 0xa6, - 0xde, 0xc1, 0x2d, 0xff, 0x2b, 0x48, 0x10, 0x04, }, - { 0xa7, 0xc2, 0x09, 0x8d, 0x69, 0xcb, 0x02, 0x79, - 0x63, 0xa4, 0xcc, 0x0a, 0xe4, 0x54, 0x07, 0x80, - 0x0d, 0xb8, 0xff, 0x83, 0xd1, 0x2d, 0x7e, 0x86, - 0x3d, 0xa6, 0x3e, 0x00, 0x54, 0x2c, 0xbf, 0x92, }, + { 0x85, 0x0b, 0xe3, 0xce, 0x58, 0x62, 0xa4, 0x65, + 0x7f, 0x0e, 0xf2, 0x34, 0xc9, 0x1a, 0x47, 0x2b, + 0xf4, 0x30, 0x2c, 0x11, 0xfe, 0x4f, 0x3b, 0x5b, }, + { 0x58, 0xbb, 0x30, 0x0e, 0xa2, 0xed, 0xdc, 0x9f, + 0x4d, 0x37, 0x91, 0x93, 0x1c, 0xac, 0x6b, 0x91, + 0xc1, 0x76, 0x2e, 0x65, 0x13, 0x1e, 0x5a, 0x66, + 0x1c, 0x02, 0xb8, 0x1a, 0xdc, 0xef, 0x0b, 0xa3, }, }, { "sha2_256s_robust", @@ -356,14 +356,14 @@ 0xfa, 0x4a, 0x75, 0x60, 0x00, 0x30, 0x16, 0xb8, 0xef, 0x84, 0x2d, 0x1c, 0xae, 0xf5, 0x91, 0x52, 0x1e, 0xdc, 0x19, 0xd3, 0xf6, 0x97, 0xae, 0x72, }, - { 0xa9, 0xae, 0xe0, 0x23, 0xfa, 0x2a, 0xa8, 0x31, - 0xad, 0xc0, 0x61, 0x7a, 0xb5, 0x02, 0xe8, 0x0b, - 0x04, 0x35, 0x34, 0x81, 0x4b, 0x95, 0xe1, 0xb0, - 0x89, 0xbf, 0xc2, 0xd8, 0xa1, 0x1c, 0x17, 0xe8, }, - { 0x93, 0x9f, 0xa1, 0x60, 0x6e, 0x1f, 0xff, 0xcd, - 0x98, 0x0b, 0x7b, 0x2f, 0x66, 0xce, 0x42, 0xe5, - 0xff, 0xb2, 0xc7, 0xc7, 0x83, 0x42, 0x9d, 0x11, - 0x32, 0x0f, 0x7a, 0x59, 0xf5, 0xa6, 0x67, 0xa4, }, + { 0x9f, 0xa9, 0x49, 0xfc, 0xc6, 0xa0, 0xbc, 0x94, + 0x1e, 0x8c, 0x0b, 0x4d, 0x3e, 0xb7, 0xb9, 0xbb, + 0x3a, 0xa5, 0xfd, 0x0b, 0x5c, 0xe0, 0x5f, 0x25, + 0x8a, 0xee, 0x0d, 0xe3, 0x66, 0x4e, 0xb6, 0x35, }, + { 0x81, 0xd8, 0x01, 0xf9, 0x08, 0xfc, 0x77, 0x38, + 0x19, 0x0e, 0x8b, 0xe2, 0x88, 0xce, 0xd5, 0xf4, + 0xe1, 0xb8, 0x48, 0xac, 0xaf, 0x6d, 0x82, 0xc3, + 0x78, 0x8c, 0x32, 0x39, 0x11, 0x62, 0x70, 0xc4, }, }, { "sha2_256s_simple", @@ -375,14 +375,14 @@ 0xbc, 0x0f, 0x06, 0xf9, 0xf4, 0xf4, 0x4b, 0xe7, 0x1a, 0x5a, 0x65, 0xee, 0x9d, 0xca, 0x55, 0x75, 0xcf, 0x4a, 0x7b, 0x6d, 0x4a, 0x87, 0xd6, 0xe2, }, - { 0x4a, 0xde, 0x74, 0x26, 0x86, 0x04, 0xec, 0xc1, - 0x12, 0xea, 0xab, 0xe4, 0x0e, 0x40, 0x87, 0x93, - 0x08, 0xfa, 0x0b, 0xa2, 0x76, 0xe5, 0x27, 0xcb, - 0x46, 0x8e, 0xcb, 0x15, 0x8f, 0x34, 0x71, 0x29, }, - { 0xe3, 0xf1, 0xc0, 0xe7, 0xea, 0x8e, 0xdf, 0xf7, - 0x8b, 0xce, 0xc7, 0xfb, 0x63, 0x3f, 0xa3, 0xf0, - 0x40, 0x01, 0xa3, 0x35, 0xae, 0x79, 0xe5, 0xc9, - 0x01, 0xb3, 0x66, 0x34, 0x59, 0xaf, 0xfe, 0x5f, }, + { 0xe7, 0x41, 0x78, 0x0e, 0xbd, 0x09, 0xfb, 0xaa, + 0x9b, 0x04, 0xfd, 0xba, 0xd8, 0xf1, 0x56, 0x19, + 0x6f, 0xa8, 0xa4, 0xe6, 0xea, 0x51, 0x4c, 0x19, + 0xbe, 0x01, 0x6a, 0x30, 0xe1, 0x02, 0x38, 0x2a, }, + { 0x36, 0x1b, 0x08, 0x57, 0x16, 0xab, 0x0e, 0x93, + 0x0f, 0x89, 0xd3, 0x7e, 0x8c, 0x0a, 0x01, 0x4d, + 0x74, 0x71, 0x45, 0xd0, 0x7a, 0x7e, 0x18, 0x25, + 0xff, 0xc6, 0x7d, 0x80, 0xc6, 0x29, 0xcf, 0x26, }, }, { "haraka_128f_robust", @@ -390,12 +390,12 @@ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0xb7, 0x93, 0x99, 0x51, 0xe8, 0xbd, 0xfe, 0xaf, 0xd0, 0x5c, 0xc2, 0x40, 0x15, 0x30, 0x44, 0x39, }, - { 0xda, 0x9a, 0xbd, 0x22, 0x52, 0x25, 0x82, 0xc7, - 0x85, 0x9a, 0x56, 0xf0, 0x84, 0x02, 0x75, 0xa1, }, - { 0x63, 0x14, 0x0c, 0x22, 0x13, 0xc9, 0xda, 0x27, - 0x9c, 0xdd, 0xf4, 0xb0, 0x6e, 0x33, 0x93, 0xc8, - 0x62, 0x5e, 0x38, 0x1f, 0xd8, 0x38, 0xbe, 0xde, - 0x1d, 0xa2, 0xca, 0x21, 0x65, 0x7e, 0x94, 0x94, }, + { 0xa1, 0x70, 0xb5, 0x92, 0x69, 0x7b, 0x72, 0x33, + 0x26, 0x27, 0xf8, 0x84, 0x2d, 0x30, 0xd6, 0x6e, }, + { 0xbc, 0x1b, 0x22, 0x80, 0xd7, 0x6e, 0x6c, 0x70, + 0xb9, 0x7e, 0x97, 0x82, 0xdd, 0x07, 0x8f, 0x26, + 0x14, 0x3f, 0xf1, 0x7c, 0x6e, 0x57, 0x60, 0xc6, + 0xa1, 0x89, 0xf6, 0x95, 0x2a, 0xb1, 0x3a, 0x06, }, }, { "haraka_128f_simple", @@ -403,12 +403,12 @@ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0xee, 0x37, 0x8d, 0xa1, 0xb1, 0x9d, 0x40, 0x17, 0x3e, 0x79, 0x84, 0x09, 0xff, 0x31, 0x38, 0x48, }, - { 0xae, 0x93, 0x33, 0x22, 0x85, 0x14, 0x6a, 0x83, - 0x13, 0x8f, 0x15, 0x48, 0xa3, 0x16, 0x3f, 0x99, }, - { 0x9a, 0xc0, 0xbe, 0xe8, 0x88, 0xee, 0xd0, 0x54, - 0xc1, 0x15, 0x5b, 0x15, 0xdd, 0xea, 0x52, 0xa4, - 0xd8, 0x57, 0xd8, 0x5f, 0xd9, 0x65, 0x85, 0x30, - 0x8b, 0xe2, 0xad, 0x7a, 0xfb, 0xed, 0x97, 0xe4, }, + { 0x88, 0xed, 0x2e, 0x10, 0xc6, 0xfe, 0x07, 0x96, + 0xc7, 0xf0, 0x51, 0x4a, 0xe1, 0x9d, 0xf5, 0x50, }, + { 0x80, 0xbe, 0x08, 0xe9, 0x95, 0x77, 0x67, 0x26, + 0xeb, 0x44, 0x27, 0x9a, 0x77, 0x23, 0xa4, 0xdd, + 0xcf, 0x53, 0xab, 0xeb, 0xec, 0xe1, 0xc2, 0x1e, + 0x7d, 0xd4, 0x82, 0x14, 0xdc, 0xb6, 0x36, 0x94, }, }, { "haraka_192f_robust", @@ -418,13 +418,13 @@ 0x79, 0xed, 0x28, 0x2f, 0x02, 0xaa, 0xed, 0x09, 0xdc, 0x47, 0xe4, 0xb4, 0xf3, 0xe6, 0x7f, 0x19, 0xfc, 0xe8, 0xa4, 0x3a, 0x52, 0x35, 0x9d, 0x5a, }, - { 0xf6, 0x49, 0xad, 0x50, 0xed, 0xfc, 0xe2, 0xec, - 0x63, 0xc0, 0xb4, 0x4a, 0xde, 0xd6, 0x6e, 0x33, - 0xff, 0x07, 0x68, 0xab, 0x6a, 0x75, 0x74, 0x0c, }, - { 0xd5, 0x22, 0x97, 0x17, 0x3c, 0x7d, 0xcf, 0x11, - 0x15, 0x35, 0xe6, 0xa0, 0x15, 0xe5, 0x8b, 0x8b, - 0x3e, 0x6d, 0x35, 0x1a, 0xd0, 0xd4, 0xf7, 0x2f, - 0x98, 0x70, 0x17, 0xd0, 0xbb, 0xe9, 0x59, 0x72, }, + { 0x82, 0xde, 0xae, 0xfd, 0xba, 0xb5, 0x81, 0x99, + 0x38, 0x9e, 0xfa, 0xaa, 0x1a, 0x5e, 0x7d, 0x37, + 0x3b, 0x7e, 0x99, 0x8c, 0xcf, 0x2d, 0x59, 0x7a, }, + { 0x7a, 0x1b, 0x07, 0x11, 0xf7, 0xbc, 0x9e, 0x1d, + 0x78, 0x93, 0x33, 0x77, 0xb1, 0x77, 0x2d, 0x7d, + 0x31, 0x7c, 0x2b, 0xd4, 0x61, 0x58, 0x36, 0xfb, + 0x73, 0x14, 0xf5, 0xcb, 0xee, 0x73, 0x23, 0x23, }, }, { "haraka_192f_simple", @@ -434,13 +434,13 @@ 0x0c, 0x30, 0x92, 0xaa, 0xaa, 0x3a, 0x3f, 0x22, 0x63, 0x75, 0x7d, 0x0c, 0x82, 0xe3, 0x12, 0x9d, 0x1a, 0xe7, 0xa0, 0x23, 0xea, 0xd5, 0x15, 0x5f, }, - { 0x8a, 0xb0, 0x27, 0x8c, 0x8b, 0xdd, 0x73, 0x0f, - 0x8f, 0xda, 0x1f, 0x12, 0x96, 0xba, 0x57, 0x22, - 0xa2, 0xd0, 0xa8, 0xf7, 0x1e, 0xf5, 0x1f, 0xfd, }, - { 0xa7, 0x47, 0x13, 0x66, 0xe3, 0x28, 0x9a, 0x36, - 0x18, 0x8c, 0x03, 0xca, 0x18, 0xa7, 0x80, 0x5e, - 0xd3, 0x22, 0xc7, 0x79, 0x7a, 0x2c, 0x69, 0x1e, - 0x9c, 0x8e, 0x49, 0xdc, 0x54, 0x5f, 0xf4, 0x3e, }, + { 0xf8, 0xe2, 0xfc, 0x0b, 0xaf, 0x3e, 0xe2, 0x91, + 0x4e, 0x5c, 0x0a, 0xe3, 0x76, 0x36, 0xf7, 0xf7, + 0x15, 0xaf, 0xa8, 0xb5, 0x85, 0x7a, 0xec, 0x60, }, + { 0x0f, 0x6c, 0xe8, 0x20, 0xbc, 0x13, 0xc1, 0x59, + 0x16, 0xf3, 0x9b, 0x99, 0xe2, 0xca, 0x45, 0xc7, + 0xb4, 0x56, 0xa9, 0x52, 0x93, 0xf6, 0x3c, 0x1c, + 0xda, 0x48, 0xbd, 0x06, 0xff, 0x56, 0xe9, 0xd4, }, }, { "haraka_256f_robust", @@ -452,14 +452,14 @@ 0xc5, 0x1a, 0x06, 0xb7, 0x36, 0x27, 0x96, 0x11, 0x9a, 0x1e, 0x3d, 0xb7, 0xd6, 0x7f, 0x6e, 0x23, 0x65, 0x46, 0x64, 0xf9, 0x09, 0x2a, 0xfd, 0xbb, }, - { 0xfb, 0x75, 0xde, 0xb7, 0x55, 0xb7, 0x30, 0xd7, - 0x41, 0x19, 0xd8, 0x8e, 0x81, 0x0b, 0xe0, 0x24, - 0x61, 0xaa, 0xb3, 0x94, 0x66, 0x34, 0x83, 0xbd, - 0x01, 0x37, 0xad, 0x7f, 0x26, 0x29, 0x74, 0x46, }, - { 0x17, 0x9d, 0x07, 0xd8, 0xde, 0xcd, 0x47, 0x11, - 0x47, 0x27, 0xa7, 0x2b, 0xf6, 0x2d, 0xb6, 0x50, - 0xf4, 0x99, 0xb1, 0x82, 0x52, 0x23, 0x1d, 0x06, - 0xe4, 0x39, 0xa7, 0xdf, 0x49, 0x93, 0x68, 0xbc, }, + { 0x1c, 0xd2, 0x4e, 0x32, 0xe1, 0x25, 0x81, 0xe7, + 0x9d, 0xfb, 0xde, 0x10, 0xdd, 0x22, 0x53, 0xe4, + 0x62, 0x87, 0x27, 0x30, 0x7c, 0x03, 0xae, 0x9a, + 0x81, 0x6d, 0x02, 0x45, 0x7a, 0xd0, 0x88, 0xea, }, + { 0x51, 0xd4, 0x8e, 0xe3, 0xc2, 0x7c, 0xa5, 0x34, + 0x81, 0xd5, 0xee, 0x1c, 0x74, 0x4a, 0xcb, 0x29, + 0x5c, 0x7a, 0x39, 0xe8, 0x63, 0x50, 0x1d, 0x3f, + 0xa8, 0xa0, 0x5b, 0x1b, 0xb2, 0x2b, 0x3d, 0xaf, }, }, { "haraka_256f_simple", @@ -471,14 +471,14 @@ 0xd6, 0x9f, 0xce, 0x26, 0x25, 0x91, 0xf0, 0x4e, 0xc0, 0xc7, 0xda, 0x44, 0x35, 0x38, 0xcc, 0x2a, 0x09, 0xa0, 0x71, 0x00, 0xa9, 0x1b, 0x7a, 0x31, }, - { 0x8d, 0x9f, 0xea, 0x45, 0x03, 0x58, 0x31, 0x36, - 0x1d, 0x7d, 0x30, 0x2c, 0x73, 0xd9, 0x50, 0x6a, - 0xdf, 0xe1, 0x06, 0x4c, 0xe3, 0xe8, 0xc2, 0x2b, - 0x49, 0x86, 0x2a, 0x32, 0x7c, 0xc4, 0xe3, 0x2a, }, - { 0xc8, 0x8a, 0x85, 0x51, 0x7c, 0xff, 0x58, 0xb8, - 0xe3, 0xe8, 0xe6, 0x2d, 0x0e, 0x16, 0x48, 0xe3, - 0x53, 0xdf, 0x90, 0x3c, 0x9d, 0xc9, 0xde, 0xfb, - 0x96, 0xde, 0xf4, 0xea, 0x8d, 0x31, 0xb6, 0xcd, }, + { 0x7c, 0xb8, 0xc8, 0xf3, 0xc1, 0x2e, 0x6a, 0xb0, + 0xfc, 0x99, 0xcc, 0x4b, 0x4e, 0xe3, 0x0e, 0xde, + 0x70, 0x98, 0x1e, 0x3e, 0xb9, 0xb8, 0x65, 0x89, + 0x06, 0x87, 0x36, 0x25, 0x34, 0xd2, 0x50, 0x22, }, + { 0xf8, 0x66, 0x07, 0x88, 0x69, 0xbd, 0x61, 0x1e, + 0x04, 0x1e, 0xba, 0xca, 0xb5, 0x9a, 0xe0, 0x9a, + 0x0c, 0x80, 0x95, 0x28, 0x16, 0x30, 0xba, 0x6c, + 0x93, 0x71, 0x69, 0x37, 0x8c, 0xa0, 0xd9, 0xaf, }, }, { "haraka_128s_robust", @@ -486,12 +486,12 @@ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0xfc, 0xbe, 0x48, 0x31, 0xdb, 0xb0, 0x4e, 0x35, 0x3f, 0xbf, 0xa8, 0x38, 0xc3, 0x0e, 0xb7, 0x0e, }, - { 0x63, 0x9b, 0xb5, 0xee, 0x93, 0x29, 0x41, 0x1c, - 0x89, 0x41, 0x72, 0x76, 0xf9, 0xc5, 0x32, 0x68, }, - { 0x59, 0x8b, 0xb3, 0xd3, 0x77, 0xaa, 0xff, 0xe0, - 0x78, 0x07, 0xef, 0x01, 0x22, 0x38, 0x1d, 0x23, - 0x06, 0xa5, 0x9f, 0x88, 0x5f, 0x41, 0x35, 0x2f, - 0x5f, 0xc0, 0x25, 0x40, 0x3f, 0x29, 0x04, 0x70, }, + { 0xbb, 0x62, 0x9a, 0x4a, 0xb3, 0xeb, 0xb1, 0x68, + 0xb0, 0x98, 0x94, 0x78, 0xd4, 0xef, 0x76, 0x4d, }, + { 0x81, 0x09, 0x74, 0x73, 0xef, 0x29, 0xdc, 0x98, + 0x68, 0x82, 0x07, 0xa2, 0xd1, 0x9d, 0x35, 0xbd, + 0xa2, 0x75, 0xd8, 0x9b, 0x30, 0xe2, 0x7e, 0x50, + 0xa3, 0xa8, 0x33, 0xfd, 0x69, 0x83, 0x2a, 0x09, }, }, { "haraka_128s_simple", @@ -499,12 +499,12 @@ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x93, 0x6b, 0xa0, 0x49, 0xc7, 0x5c, 0x04, 0x02, 0x14, 0x0d, 0x33, 0x92, 0x22, 0x46, 0x33, 0x5e, }, - { 0x77, 0x19, 0xf8, 0x02, 0xd3, 0xfc, 0xdd, 0xdc, - 0xe4, 0x99, 0x4a, 0x10, 0x86, 0x2f, 0x06, 0x69, }, - { 0x27, 0x1c, 0x76, 0xbd, 0x7c, 0xf0, 0xbc, 0xd5, - 0xe6, 0xdc, 0xa5, 0x3b, 0xfc, 0xdc, 0x08, 0xa1, - 0x9f, 0xf6, 0x11, 0x6a, 0xed, 0x56, 0x30, 0xf0, - 0xdb, 0xd9, 0x5e, 0x31, 0xbc, 0x85, 0x5e, 0x50, }, + { 0xb5, 0x6b, 0x1e, 0x32, 0x91, 0x40, 0x51, 0xe8, + 0x13, 0x47, 0x4f, 0x07, 0xb5, 0xe7, 0x0e, 0xf8, }, + { 0x91, 0xb2, 0x6b, 0xf7, 0x62, 0x4d, 0x28, 0xc3, + 0x27, 0x07, 0x42, 0x47, 0x52, 0xdf, 0xb8, 0x22, + 0xa4, 0x30, 0x63, 0x32, 0x5c, 0x05, 0xc3, 0xb5, + 0xbe, 0xb1, 0x0d, 0x28, 0x0f, 0xaa, 0x71, 0x1f, }, }, { "haraka_192s_robust", @@ -514,13 +514,13 @@ 0xb5, 0x31, 0x4a, 0x4f, 0xd5, 0x1f, 0x0d, 0x21, 0xb2, 0x50, 0xf5, 0x1d, 0xf8, 0x73, 0xe9, 0x24, 0x9a, 0x2e, 0xcc, 0x13, 0x78, 0xca, 0xa6, 0xda, }, - { 0x3d, 0xf2, 0xa5, 0x02, 0x88, 0x71, 0x4e, 0xaf, - 0x45, 0x3f, 0xe0, 0xec, 0xd6, 0x8c, 0x8b, 0xfe, - 0x74, 0xb3, 0x61, 0x9a, 0xbb, 0x0d, 0x8d, 0xa5, }, - { 0x7f, 0xf9, 0xe4, 0x90, 0xd8, 0x99, 0x7a, 0x83, - 0xaf, 0xa4, 0xcb, 0x83, 0x02, 0xfb, 0x18, 0x74, - 0xe9, 0xdb, 0x62, 0x61, 0x1f, 0xa4, 0x56, 0xc9, - 0xf6, 0xaa, 0x90, 0x4a, 0x00, 0x72, 0xd8, 0x08, }, + { 0x57, 0x33, 0x72, 0x55, 0x1c, 0xf4, 0x2d, 0x65, + 0xc0, 0x2a, 0xed, 0x7f, 0x2d, 0x3e, 0x28, 0x77, + 0x28, 0x44, 0x7a, 0x04, 0xeb, 0xfb, 0xf4, 0x76, }, + { 0x5e, 0x2a, 0xeb, 0xc1, 0x6c, 0x52, 0x28, 0x08, + 0xa6, 0x2a, 0x72, 0xe1, 0x5c, 0xb4, 0x6c, 0x29, + 0x63, 0xcf, 0x51, 0xaa, 0xf1, 0xba, 0x45, 0x27, + 0x59, 0xea, 0x1e, 0x46, 0x2e, 0xd2, 0xa1, 0xd2, }, }, { "haraka_192s_simple", @@ -530,13 +530,13 @@ 0x66, 0xfe, 0x20, 0xe8, 0xf6, 0xaf, 0x30, 0x71, 0xaa, 0x75, 0x3e, 0x48, 0xd6, 0xa2, 0x88, 0x68, 0xb1, 0xb4, 0x6d, 0x2d, 0xe2, 0xa5, 0xfa, 0x52, }, - { 0x5f, 0xb1, 0x71, 0xa6, 0x8a, 0x07, 0xb3, 0xa9, - 0x12, 0x5b, 0x7f, 0x82, 0x8b, 0x82, 0x8f, 0x3f, - 0x34, 0x9e, 0x13, 0xf9, 0xfe, 0xe8, 0x75, 0x91, }, - { 0x44, 0xae, 0x7c, 0x4a, 0xd8, 0x5c, 0xe4, 0x19, - 0xd6, 0x15, 0xd8, 0x3c, 0xe0, 0x07, 0xb0, 0xad, - 0x07, 0x12, 0x4b, 0xbf, 0xc2, 0x08, 0x06, 0x5d, - 0x08, 0x0b, 0x1d, 0x47, 0xca, 0x4e, 0x31, 0xcb, }, + { 0xd6, 0xfa, 0xb1, 0x8c, 0x44, 0xb6, 0x2a, 0xc5, + 0x92, 0x7a, 0xb9, 0x3b, 0xf2, 0xf5, 0xdb, 0x8d, + 0xde, 0x38, 0xef, 0xa8, 0xaa, 0x1b, 0x96, 0x86, }, + { 0xe6, 0x22, 0xe5, 0xac, 0xe0, 0xd0, 0x98, 0xc3, + 0xe5, 0xbd, 0x42, 0x7a, 0x45, 0xc3, 0x56, 0x6f, + 0x4b, 0xcb, 0x76, 0x6d, 0x23, 0xeb, 0xc3, 0x7c, + 0x18, 0x5b, 0xe7, 0x16, 0x8a, 0xc9, 0x6f, 0xc8, }, }, { "haraka_256s_robust", @@ -548,14 +548,14 @@ 0x3c, 0x31, 0x1e, 0x3a, 0x6b, 0xf2, 0x90, 0x16, 0x94, 0x31, 0xcb, 0xf7, 0xc6, 0x0b, 0xec, 0x14, 0xe9, 0x19, 0x97, 0x0a, 0xcd, 0xc9, 0x93, 0x02, }, - { 0xbb, 0x30, 0xa6, 0xbf, 0x0e, 0xb3, 0x63, 0xe6, - 0x1f, 0xb3, 0xf2, 0x65, 0x45, 0x42, 0x7c, 0x3b, - 0x84, 0x5c, 0xce, 0xb2, 0xcc, 0x72, 0xd3, 0xda, - 0xb0, 0xe7, 0x2a, 0x44, 0x74, 0xb4, 0xe9, 0x8d, }, - { 0xbf, 0x85, 0x29, 0x49, 0x1f, 0x07, 0x68, 0xbd, - 0x6d, 0xc7, 0xa4, 0xb9, 0x58, 0x2d, 0xf8, 0x01, - 0x88, 0xd5, 0xae, 0x39, 0xb0, 0x23, 0xe8, 0x31, - 0xa0, 0xb5, 0x1f, 0x79, 0x74, 0x1b, 0x11, 0x75, }, + { 0xc3, 0x5a, 0x07, 0x91, 0xce, 0x1d, 0x00, 0xb6, + 0xd8, 0xa5, 0xb3, 0xf1, 0x6b, 0xdc, 0x75, 0xbf, + 0x75, 0x2b, 0xd8, 0x6e, 0x26, 0x95, 0x83, 0x87, + 0x5f, 0xcf, 0x38, 0x97, 0xf8, 0x05, 0xa7, 0x10, }, + { 0x00, 0xec, 0xca, 0xea, 0x24, 0x86, 0x81, 0x22, + 0xe7, 0xa3, 0x13, 0x79, 0xad, 0xbb, 0x36, 0x4a, + 0x52, 0x11, 0x22, 0x48, 0xd2, 0x0b, 0x58, 0x39, + 0x11, 0xc9, 0xec, 0xca, 0x3f, 0x55, 0x9c, 0x08, }, }, { "haraka_256s_simple", @@ -567,12 +567,12 @@ 0x9b, 0xc7, 0xba, 0x40, 0x20, 0x79, 0x00, 0x27, 0x37, 0x53, 0xca, 0x02, 0x53, 0x95, 0xa5, 0x29, 0x46, 0x45, 0x0c, 0x57, 0x0e, 0xc4, 0x37, 0xd6, }, - { 0x55, 0x90, 0x4c, 0xb5, 0x94, 0x8e, 0x13, 0x86, - 0x59, 0xdc, 0x75, 0x53, 0x2e, 0xb2, 0xdb, 0xbd, - 0x33, 0x82, 0xd1, 0x74, 0x1b, 0x2d, 0x5c, 0x61, - 0x3f, 0x74, 0x46, 0x1b, 0x1c, 0x3f, 0x3e, 0x45, }, - { 0xaf, 0xc4, 0x6d, 0x50, 0xf2, 0x5b, 0x89, 0x10, - 0x43, 0x78, 0x0a, 0xf2, 0x31, 0x8b, 0xbf, 0xe0, - 0x94, 0xd9, 0xd6, 0x9b, 0x00, 0xec, 0x1a, 0x8d, - 0x92, 0xa7, 0x37, 0x9f, 0x6d, 0xd9, 0x30, 0x50, }, + { 0x3a, 0xfa, 0xd0, 0x11, 0xcf, 0x93, 0xbb, 0xc7, + 0xc6, 0x5b, 0xc1, 0x8d, 0x7c, 0x76, 0xf5, 0x91, + 0xab, 0x08, 0x3b, 0x11, 0xaa, 0xdc, 0xa9, 0xe0, + 0x0e, 0x78, 0x20, 0xd1, 0xa6, 0x09, 0x57, 0x45, }, + { 0x56, 0x39, 0x98, 0xdb, 0xa7, 0x52, 0xc7, 0xda, + 0x8b, 0x8d, 0x7a, 0x04, 0xa6, 0x9b, 0xc2, 0xf4, + 0x8c, 0x3a, 0xa4, 0xf5, 0xa3, 0xc0, 0xda, 0xe8, + 0x45, 0x4a, 0x20, 0xb7, 0xcf, 0x4d, 0x14, 0x94, }, },