diff --git a/cmdline/museair.c b/cmdline/museair.c index fb7bfe98..1c67fdee 100644 --- a/cmdline/museair.c +++ b/cmdline/museair.c @@ -4,7 +4,7 @@ /* * Derivative work of MuseAir v1 in the "Long" (len > 32), "b128", and "bfast" configurations. * - * This implementation also accepts a length of 32, unlike the original MuseAir, + * This implementation also accepts a length <= 32, unlike the original MuseAir, * which switches to the short version for this length. * * https://github.com/eternal-io/museair @@ -60,14 +60,21 @@ static void MuseAirLoong(const void* bytes, size_t len, const uint8_t* seed, uin { const uint8_t* p = bytes; size_t q = len; + uint8_t buf[32]; + + if (unlikely(q < 32)) { + memset(buf, 0, 32); + if (q > 0) + memcpy(buf, p, q); + p = buf; + q = 32; + } uint64_t i, j, k; uint64_t lo0, lo1, lo2, lo3, lo4, lo5 = MUSEAIR_CONSTANT[6]; uint64_t hi0, hi1, hi2, hi3, hi4, hi5 = MUSEAIR_CONSTANT[6]; uint64_t state[6] = { MUSEAIR_CONSTANT[0], MUSEAIR_CONSTANT[1], MUSEAIR_CONSTANT[2], MUSEAIR_CONSTANT[3], MUSEAIR_CONSTANT[4], MUSEAIR_CONSTANT[5] }; - assert(len >= 32); - uint64_t seed_a = util_read64(seed); uint64_t seed_b = util_read64(seed + 8); diff --git a/cmdline/museairtest.c b/cmdline/museairtest.c index 5d7df11b..f24652db 100644 --- a/cmdline/museairtest.c +++ b/cmdline/museairtest.c @@ -1,3 +1,35 @@ +{ "", 0, { 0xd5, 0xa1, 0x99, 0xe9, 0xbd, 0xb7, 0x0d, 0x34, 0x2b, 0x86, 0x32, 0x3d, 0x15, 0xd8, 0x4e, 0x29 }, { 0x11, 0x2a, 0x08, 0x13, 0x49, 0xf4, 0x97, 0xb3, 0x8e, 0xbc, 0x58, 0x97, 0x7b, 0x08, 0xd2, 0x19 } }, +{ "\xe3", 1, { 0x46, 0xe2, 0x76, 0xe1, 0x70, 0xd7, 0x3f, 0xfe, 0xb9, 0x3f, 0x55, 0x73, 0xde, 0x95, 0x55, 0x40 }, { 0x1c, 0x2b, 0x64, 0x71, 0x23, 0x0d, 0xf3, 0xc1, 0xed, 0xa0, 0x96, 0x46, 0xe8, 0xb4, 0x7b, 0x67 } }, +{ "\xd1\xd2", 2, { 0x18, 0x0e, 0x30, 0xb2, 0x06, 0x76, 0xaa, 0x7c, 0x36, 0x86, 0x44, 0x9a, 0x19, 0x9a, 0xe7, 0xa0 }, { 0xcc, 0x9d, 0x96, 0x4d, 0xeb, 0x76, 0xdc, 0x41, 0x80, 0xf9, 0xb2, 0xa0, 0x36, 0x18, 0x05, 0x8a } }, +{ "\xbe\x2f\x07", 3, { 0x24, 0xdb, 0x20, 0x0d, 0x10, 0x76, 0x85, 0xf6, 0x7f, 0x5d, 0xc2, 0x33, 0x29, 0x57, 0xd3, 0x8f }, { 0x7c, 0x84, 0x4f, 0xf5, 0x91, 0x48, 0x1f, 0x36, 0x1d, 0x4f, 0xfc, 0x01, 0xd6, 0x6c, 0xfa, 0x4d } }, +{ "\x23\x82\xe5\xb5", 4, { 0x0d, 0x10, 0x9a, 0xdc, 0x97, 0x42, 0xbc, 0x59, 0x15, 0x5f, 0x9a, 0xeb, 0xa4, 0x64, 0xb4, 0x99 }, { 0xe2, 0x68, 0xe8, 0x9a, 0x9e, 0xb2, 0x85, 0x6b, 0x0a, 0x94, 0xb7, 0xe9, 0xc0, 0x44, 0x20, 0xae } }, +{ "\xef\x3b\x20\x34\xb8", 5, { 0xf0, 0xf2, 0xa1, 0x2c, 0x73, 0x60, 0x95, 0xfd, 0xcf, 0x2e, 0xff, 0x64, 0x8f, 0x94, 0xeb, 0x63 }, { 0xc3, 0x82, 0xb0, 0xde, 0x1c, 0x6a, 0x31, 0xf5, 0xb2, 0x25, 0x57, 0x9c, 0x2f, 0xbd, 0xbf, 0x29 } }, +{ "\x6f\xe5\x6d\x24\xed\xf4", 6, { 0xb3, 0xb7, 0x71, 0x7e, 0x9d, 0x5b, 0xf8, 0x0d, 0x22, 0x1d, 0xf6, 0xda, 0x70, 0xe1, 0x17, 0xef }, { 0x8e, 0x53, 0xaf, 0xa6, 0x8f, 0x51, 0x33, 0xb6, 0x18, 0x3d, 0xd6, 0xfa, 0x3b, 0xae, 0x92, 0x77 } }, +{ "\xa7\xd7\x0b\xf6\xfd\xfc\x7d", 7, { 0x7f, 0xb3, 0x19, 0xb0, 0xa0, 0xad, 0x0b, 0x73, 0xe5, 0x1e, 0x93, 0x07, 0xc3, 0xa8, 0x08, 0x97 }, { 0x70, 0x4c, 0x5a, 0x0a, 0xc8, 0x30, 0x46, 0x0c, 0xb5, 0x9f, 0xe0, 0xb8, 0xd8, 0xfc, 0x77, 0xa6 } }, +{ "\x9d\xe7\x33\xa8\x5b\xf0\x5b\x30", 8, { 0xf2, 0x5d, 0x64, 0x20, 0x97, 0x9d, 0x3d, 0xa2, 0x2f, 0x49, 0xd1, 0x5e, 0x42, 0x12, 0xc8, 0x63 }, { 0x66, 0xe3, 0xef, 0x3f, 0xb0, 0xd4, 0xf1, 0x29, 0xe9, 0x21, 0xd4, 0xff, 0x13, 0xdb, 0xf2, 0xfe } }, +{ "\xea\xf8\xb7\xf1\x4c\x75\xaf\x2f\xd8", 9, { 0xf3, 0xd8, 0x27, 0xca, 0xb7, 0xa8, 0xdb, 0xa0, 0x4f, 0xf8, 0x6b, 0x32, 0xfa, 0x2a, 0x41, 0x7a }, { 0xbf, 0xe7, 0x24, 0x62, 0xd6, 0x4e, 0x7d, 0x55, 0x31, 0x94, 0xac, 0x16, 0x6a, 0x78, 0x0c, 0x4e } }, +{ "\xef\x6e\x14\xab\x69\x1d\xe8\x6d\xa3\x5c", 10, { 0x83, 0xd8, 0xe4, 0x94, 0xc6, 0x2c, 0x3a, 0x54, 0x3d, 0xca, 0x9a, 0x61, 0x83, 0x7f, 0xc6, 0x60 }, { 0x98, 0x02, 0x3c, 0x79, 0xf2, 0x22, 0x87, 0xb0, 0xa4, 0x23, 0xbd, 0x01, 0x35, 0x37, 0xbe, 0xd0 } }, +{ "\xe8\x6e\x94\x62\x52\x14\x4e\x9d\x2e\x38\x78", 11, { 0xad, 0x06, 0x8f, 0xe0, 0x55, 0x57, 0x46, 0xe2, 0x8b, 0x23, 0xeb, 0xdd, 0x06, 0xd6, 0x6d, 0x70 }, { 0xc1, 0x63, 0xd4, 0xef, 0x80, 0x48, 0x10, 0x91, 0x39, 0x3f, 0xfe, 0x97, 0xd0, 0x6f, 0xf1, 0x2d } }, +{ "\x60\xa4\x93\xca\x74\x91\x1c\xcd\xb1\xf8\x8a\x3b", 12, { 0x53, 0xe6, 0x96, 0x38, 0x6a, 0xec, 0x8c, 0x70, 0x29, 0x81, 0xff, 0x2c, 0x83, 0x1e, 0x6d, 0x06 }, { 0x43, 0x94, 0x1b, 0x4c, 0xb0, 0x2f, 0xef, 0x9c, 0xe5, 0x58, 0xf6, 0x5e, 0x3e, 0xc6, 0xe7, 0x9a } }, +{ "\x33\x12\xe8\x59\xcf\xd9\xa4\xf2\xc6\xf3\x27\xd2\x72", 13, { 0x33, 0x59, 0x0e, 0x44, 0x69, 0x4e, 0x1c, 0x4b, 0x4e, 0x09, 0xfa, 0x4d, 0x33, 0x6d, 0xae, 0xa3 }, { 0x6f, 0xe4, 0x6a, 0xd9, 0x9c, 0xed, 0x5d, 0x3a, 0x33, 0xcc, 0xdb, 0x29, 0x2d, 0x7d, 0x83, 0x6c } }, +{ "\x1c\x89\xb8\x7e\xa6\x76\xe7\x4d\xb6\x3b\x33\xbe\xd0\x7f", 14, { 0x5d, 0xd7, 0x14, 0x29, 0x6d, 0xf6, 0x0a, 0x8d, 0xd3, 0x8e, 0x15, 0x77, 0x22, 0x9b, 0x0e, 0xe8 }, { 0xa8, 0x6a, 0x6d, 0xc6, 0x62, 0x3d, 0x60, 0x55, 0xd7, 0x90, 0x7c, 0xcd, 0x1b, 0xf1, 0xff, 0xa5 } }, +{ "\x72\x7f\xe1\x95\x46\xdf\x41\xf9\xcb\x18\xe1\x5b\xcb\x67\x2b", 15, { 0x3b, 0xec, 0x81, 0xf8, 0x88, 0x0d, 0x77, 0x89, 0x45, 0xe8, 0xda, 0x00, 0xfe, 0xcd, 0xb8, 0x02 }, { 0x71, 0xb6, 0x2a, 0x39, 0xf1, 0x28, 0x06, 0x21, 0x65, 0x4c, 0xa3, 0xa1, 0x88, 0x09, 0xba, 0x2c } }, +{ "\xe5\x6f\x94\xec\xe7\x06\x4e\x31\x75\x8f\x5a\x0b\x9c\xce\x1e\xe2", 16, { 0xe5, 0xa1, 0xd2, 0xf3, 0xd8, 0xfa, 0xd5, 0x83, 0xb3, 0xa9, 0x91, 0xfc, 0x07, 0xce, 0x54, 0xbc }, { 0xa0, 0x4e, 0xe8, 0x0a, 0x9d, 0x41, 0xcf, 0x76, 0x59, 0x9b, 0xc6, 0x95, 0x0c, 0x7f, 0xb8, 0xfe } }, +{ "\x4e\x2e\xc9\x2f\x1e\x57\xb4\xa5\xee\xc8\xb3\x90\x3d\xb9\x2e\x40\xc8", 17, { 0x8e, 0x6a, 0x58, 0x81, 0x0e, 0xf0, 0x19, 0x17, 0x7c, 0x88, 0x13, 0xbc, 0x09, 0x65, 0x72, 0x60 }, { 0xd1, 0xc4, 0x69, 0xc1, 0xdf, 0xe8, 0xed, 0xf5, 0xd7, 0x9f, 0xe5, 0x79, 0x3b, 0xf1, 0x9a, 0x3c } }, +{ "\x3d\x45\xb8\xfc\xbf\x9c\xf2\x60\xae\x19\xdc\xa1\xfe\x9d\xe7\xb9\x23\x11", 18, { 0x1b, 0x14, 0xb1, 0x31, 0x79, 0x7c, 0xf7, 0x65, 0x9a, 0x18, 0x03, 0x8a, 0xba, 0x6a, 0xdd, 0x4d }, { 0xb8, 0x2e, 0xb7, 0xaf, 0x29, 0x3a, 0x76, 0x93, 0xa8, 0x71, 0x8c, 0x7c, 0x33, 0xbb, 0x0b, 0x70 } }, +{ "\x0a\x7b\xec\x48\x6b\x4e\x35\xb3\x64\xe8\xaa\x27\x24\x2d\xa5\xd1\xe9\x20\xef", 19, { 0x6c, 0x2f, 0x4e, 0x45, 0xe0, 0x40, 0xa1, 0x37, 0x85, 0xf3, 0x8c, 0x62, 0x79, 0x4b, 0xed, 0xb6 }, { 0xc8, 0x1f, 0xe3, 0x60, 0x0a, 0x0f, 0xaf, 0xb5, 0xf8, 0x54, 0x03, 0xe5, 0x64, 0x27, 0xa8, 0x2d } }, +{ "\x67\x68\xa6\x60\x12\x91\xd8\x74\x53\x54\xe8\x50\x2d\xfc\x1c\x4d\xe1\x72\xc7\x17", 20, { 0x99, 0x6b, 0xfa, 0x7c, 0x79, 0x45, 0x60, 0xa7, 0xc9, 0xb2, 0x4c, 0xe4, 0x90, 0xe1, 0x10, 0x03 }, { 0x54, 0xba, 0x6b, 0xfb, 0x22, 0x93, 0x2e, 0x36, 0xa8, 0xa1, 0x8d, 0x4c, 0x57, 0xba, 0xaf, 0x57 } }, +{ "\x44\x61\xb6\x22\x99\x93\x4c\x89\x4d\x0f\x0a\xff\xfa\x38\x72\xf4\xd5\x66\x4b\x35\x54", 21, { 0xa3, 0x7a, 0x26, 0x23, 0x4b, 0xfd, 0x4e, 0x86, 0xfc, 0xf5, 0xe6, 0x68, 0xcf, 0xb3, 0x1c, 0x60 }, { 0x3a, 0xb8, 0x39, 0x67, 0x8c, 0x6c, 0x44, 0x6b, 0xf3, 0x0c, 0x43, 0x7f, 0x4c, 0xe1, 0xb4, 0x44 } }, +{ "\x48\x4c\x5b\x7d\x22\x0d\x31\xed\xb8\xbb\xd5\x8f\xe8\xa6\xd9\x0e\xe4\xfe\xeb\x89\x74\x53", 22, { 0x58, 0xc5, 0xed, 0x92, 0x73, 0xc8, 0xb7, 0xc1, 0x77, 0xa3, 0x25, 0xf8, 0xbf, 0x2f, 0x41, 0xc9 }, { 0xf4, 0x59, 0x2b, 0x16, 0x2b, 0x1e, 0x29, 0xc1, 0x24, 0x15, 0x91, 0xde, 0x95, 0x30, 0x42, 0x02 } }, +{ "\xb0\xe0\x94\x82\xa6\xad\xef\xb1\x95\x54\x5d\xf6\x6f\x61\x89\xc2\x0f\xd0\x9f\x80\x75\x99\x55", 23, { 0x22, 0x95, 0x05, 0x51, 0x82, 0x1d, 0x31, 0x65, 0x93, 0xb0, 0xe0, 0x64, 0x5b, 0x6c, 0x01, 0x49 }, { 0xcf, 0x4e, 0x8d, 0x28, 0xd3, 0x18, 0xbd, 0x4c, 0x3a, 0xa5, 0x1a, 0x64, 0x1b, 0xdc, 0xe9, 0x35 } }, +{ "\x8c\x05\x22\xe4\x44\x39\x53\xbe\x89\x75\x1d\x0c\x00\x64\x58\x15\xea\xe3\x80\x70\xa1\x14\x9d\x29", 24, { 0x2e, 0x4a, 0xce, 0x47, 0xdd, 0xe2, 0x02, 0xf4, 0x5a, 0x46, 0xf5, 0xd9, 0xb6, 0x84, 0x93, 0x5f }, { 0x76, 0x9c, 0xfa, 0x92, 0x75, 0xba, 0xe7, 0x34, 0x90, 0x6a, 0x7b, 0x5a, 0x19, 0x13, 0x08, 0xf4 } }, +{ "\xd8\x88\x54\xe5\x5b\x6e\xd6\xb2\xb6\xdb\x03\xcd\x79\xc8\x8b\x5d\x4e\x86\xd4\x83\x36\x07\x6f\x81\x6d", 25, { 0x0d, 0xbc, 0x10, 0xb9, 0x83, 0x66, 0xe1, 0xc9, 0x29, 0x63, 0x7a, 0xf5, 0xf4, 0xd6, 0xb9, 0x47 }, { 0x79, 0x55, 0x0d, 0x10, 0x29, 0xce, 0x91, 0x4f, 0xe3, 0xb4, 0x08, 0x4e, 0x22, 0xa8, 0x69, 0x03 } }, +{ "\xe3\xb3\xd3\x96\xb7\x0d\x4e\xc6\xb2\xf6\xbc\x45\xf3\x17\xd9\xec\xd2\x2d\x99\x96\x28\xd3\x56\x30\xe8\x75", 26, { 0x26, 0xc7, 0xb8, 0xe3, 0x5d, 0xdc, 0x3d, 0x1d, 0xde, 0x7b, 0x47, 0x81, 0xa6, 0x5f, 0x2a, 0x8f }, { 0x2c, 0x0b, 0xcc, 0x82, 0x0d, 0x1a, 0xa8, 0xb9, 0x0c, 0x7b, 0x64, 0x50, 0xba, 0xbc, 0xc0, 0x5a } }, +{ "\xc0\x35\xaf\x43\x0a\x9a\x1a\xdd\x02\x9c\x4f\xa1\x07\xb1\x6f\x05\x3c\x28\x23\x8f\xb6\x5f\xe3\x07\x9b\x02\x83", 27, { 0x2f, 0x4b, 0x49, 0xce, 0x6e, 0x36, 0x98, 0xba, 0x6e, 0x4f, 0x87, 0xf4, 0x5d, 0xd1, 0x62, 0x63 }, { 0xb5, 0x1d, 0x39, 0x8b, 0x25, 0x4a, 0x51, 0x59, 0x3f, 0xb4, 0xbd, 0x9a, 0xa2, 0x3f, 0xfa, 0x28 } }, +{ "\x7a\xc0\x35\xbe\x6f\xdd\xa2\xc7\x7c\x90\x2b\xa1\xb9\xff\xd9\xed\xf7\xe5\x98\xc0\x97\x18\x71\xe4\x06\xc8\xd0\x9d", 28, { 0x79, 0x39, 0xf1, 0xcf, 0x02, 0x4c, 0xd8, 0x11, 0xf8, 0xc0, 0x05, 0x73, 0x3f, 0x97, 0x5e, 0xf8 }, { 0x72, 0xaf, 0x38, 0xae, 0xce, 0x64, 0x62, 0xb5, 0x91, 0x5c, 0x77, 0xb1, 0x87, 0xf3, 0xaf, 0x34 } }, +{ "\x62\xb1\xb8\x39\x22\x02\xc5\xad\x8e\xce\x39\xf6\x36\x2a\xb5\xbe\x26\x87\xd1\xce\x85\xa6\x5d\x68\x00\x38\x87\x47\xb9", 29, { 0x3d, 0x64, 0xce, 0x53, 0xf5, 0x83, 0x5b, 0xb5, 0x8b, 0x49, 0x64, 0xe2, 0xcc, 0xbe, 0x42, 0xe1 }, { 0x88, 0xe1, 0x54, 0x91, 0xf3, 0xf6, 0x8a, 0xa2, 0x0a, 0x03, 0x82, 0x5a, 0xcf, 0xea, 0x9c, 0x08 } }, +{ "\x9a\x5d\x7a\xa1\x0f\x8a\x54\xec\x5c\xa0\xd2\xce\xca\x4d\x60\xd6\x3b\xb3\x53\xe5\xce\xab\xdc\x7c\x1b\x61\x9a\x03\x77\xbe", 30, { 0xa8, 0x89, 0x66, 0xa7, 0x72, 0xf1, 0x26, 0x44, 0x3b, 0x6c, 0x69, 0x68, 0x79, 0x3c, 0x74, 0xdc }, { 0x48, 0xe7, 0x1e, 0xea, 0xca, 0x9b, 0xca, 0xc9, 0x2d, 0x92, 0xf1, 0x7d, 0x76, 0x6b, 0x30, 0x2b } }, +{ "\xb0\xfd\x68\x8d\xc0\xda\x78\x0d\x2d\x69\xca\xd2\x73\x19\xbf\x32\xa2\xae\xe7\x23\xc9\x50\xdc\x30\x63\x67\xcb\x0c\x1f\xf8\x27", 31, { 0x9b, 0x5f, 0x89, 0x20, 0xe2, 0xc3, 0x39, 0x2d, 0xeb, 0xa7, 0x09, 0xda, 0x81, 0x00, 0xac, 0x12 }, { 0x09, 0xba, 0xee, 0xe7, 0x88, 0x51, 0xe6, 0xdc, 0x94, 0xe1, 0xa3, 0x6f, 0x5f, 0x91, 0x52, 0xea } }, { "\x31\x39\x3d\xa3\x03\x3b\x45\xfd\x03\xa0\x50\x4a\x61\x4b\xdc\xe6\xa3\xd9\x9f\xfd\x6d\xc0\x34\x84\x7c\x7e\x4f\x71\x5d\x26\x93\x81", 32, { 0xe5, 0x86, 0xcf, 0xde, 0xae, 0x12, 0xaf, 0xbc, 0xbc, 0x32, 0x4e, 0xdb, 0xe9, 0x06, 0xdb, 0xce }, { 0x03, 0x81, 0xe3, 0x3c, 0xd6, 0x8a, 0x06, 0x19, 0xfd, 0x15, 0xcc, 0x2c, 0xe5, 0x91, 0x62, 0x16 } }, { "\x01\x44\xba\x0f\xbf\xbc\xa8\x56\xdb\xa1\x87\x2e\x2c\xe1\xe4\xd1\x1d\x05\x44\xec\xc0\x7d\x52\x63\x34\xa1\xee\xa4\xb4\xc2\xeb\x1f\xf5", 33, { 0x8c, 0x2c, 0x9b, 0xdb, 0xea, 0xc8, 0x61, 0x64, 0x63, 0x3b, 0x33, 0xfd, 0x24, 0xbf, 0x56, 0x76 }, { 0xd7, 0x03, 0xf8, 0xf7, 0xed, 0x8d, 0x5e, 0x99, 0xe2, 0x89, 0x8a, 0xff, 0xac, 0xe3, 0x2b, 0xcc } }, { "\xea\x46\xc4\xee\x77\xc6\xa4\xdf\x18\xc7\xf2\x8c\xe3\x85\x3b\xef\xf7\x08\xf6\xe5\x05\xb5\xe5\x2a\x3d\xe3\x57\x50\xa3\x0c\x6a\x54\x0c\x7a", 34, { 0x2c, 0x52, 0x25, 0x13, 0x7b, 0x89, 0x00, 0x29, 0x4a, 0x29, 0x10, 0x4c, 0xc5, 0x6b, 0x89, 0x6b }, { 0x9d, 0x11, 0x62, 0x95, 0x2e, 0x60, 0x1d, 0x2f, 0x1c, 0xb9, 0xf4, 0xe0, 0xe5, 0xeb, 0x3b, 0x81 } },