From 52a293eadf6705caf787e93a1be712e621428d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Fri, 12 Apr 2019 14:37:53 +0200 Subject: [PATCH] GMAC Split Test --- lib/src/gkcrypt.c | 4 +++ test/gkcrypt.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/lib/src/gkcrypt.c b/lib/src/gkcrypt.c index d55af2b..15135a0 100644 --- a/lib/src/gkcrypt.c +++ b/lib/src/gkcrypt.c @@ -189,6 +189,10 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_gkcrypt_gmac(ChiakiGKCrypt *gkcrypt, size_t uint8_t *gmac_key = gkcrypt->key_gmac_current; uint8_t gmac_key_tmp[CHIAKI_GKCRYPT_BLOCK_SIZE]; uint64_t key_index = key_pos / CHIAKI_GKCRYPT_GMAC_KEY_REFRESH_KEY_POS; + if(key_index != (key_pos + buf_size - 1) / CHIAKI_GKCRYPT_GMAC_KEY_REFRESH_KEY_POS) + { + CHIAKI_LOGD(gkcrypt->log, "SPLIT! %u != %u\n", key_index, (key_pos + buf_size - 1) / CHIAKI_GKCRYPT_GMAC_KEY_REFRESH_KEY_POS); + } // TODO: what to do if (key_pos / CHIAKI_GKCRYPT_GMAC_KEY_REFRESH_KEY_POS) != ((key_pos + buf_size) / CHIAKI_GKCRYPT_GMAC_KEY_REFRESH_KEY_POS)? if(key_index > gkcrypt->key_gmac_index_current) { diff --git a/test/gkcrypt.c b/test/gkcrypt.c index 604a7e0..495de9a 100644 --- a/test/gkcrypt.c +++ b/test/gkcrypt.c @@ -216,6 +216,70 @@ static MunitResult test_gen_gmac_key(const MunitParameter params[], void *user) } +static MunitResult test_gmac_split(const MunitParameter params[], void *user) +{ + static const uint8_t gkcrypt_key[] = { 0x35, 0x95, 0x81, 0x87, 0xeb, 0xcb, 0x63, 0x54, 0x90, 0x00, 0xd7, 0xd5, 0xbd, 0xf4, 0xc5, 0xf4 }; + static const uint8_t gkcrypt_iv[] = { 0xb8, 0xde, 0xfc, 0xa4, 0x48, 0xf0, 0x4c, 0x3f, 0xd5, 0x94, 0x0e, 0x1c, 0x04, 0x64, 0x63, 0xb1 }; + + static const uint8_t buf[] = { 0x2, 0x0, 0x1e, 0x0, 0x9, 0x0, 0x20, 0x8, 0x1, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, + 0xf0, 0x2, 0x4e, 0x0, 0x2c, 0x6f, 0x3b, 0x6c, 0x2e, 0x4a, 0x27, 0x9c, 0x50, 0x34, 0x84, 0xea, + 0x37, 0xc7, 0x76, 0xab, 0x92, 0x30, 0x43, 0x61, 0xc7, 0x1d, 0xcb, 0xc4, 0x35, 0x94, 0xcc, 0x44, + 0xe2, 0xfa, 0x89, 0x86, 0x47, 0x5e, 0xc2, 0x1, 0x39, 0x4c, 0x9f, 0x67, 0xb3, 0x6e, 0x35, 0x44, + 0x97, 0xf4, 0x28, 0xe2, 0x51, 0x12, 0xda, 0xf5, 0x2c, 0x43, 0x1c, 0x49, 0x46, 0x2c, 0x53, 0xe3, + 0xe9, 0x76, 0x61, 0x87, 0x2b, 0x7a, 0xe3, 0x2f, 0xbb, 0x9f, 0x4d, 0x66, 0x8a, 0x31, 0xbc, 0x64, + 0x9d, 0x6, 0xd, 0x4a, 0xdd, 0x42, 0x21, 0x73, 0x3c, 0x97, 0x21, 0x84, 0x53, 0x65, 0x53, 0x7a, + 0xf4, 0x57, 0x77, 0x61, 0xae, 0xc, 0x7a, 0x42, 0x90, 0xfc, 0x6b, 0xbb, 0x38, 0x6e, 0x52, 0xb6, + 0xe5, 0x26, 0xf, 0xd2, 0x2a, 0xf1, 0x56, 0x50, 0xdd, 0x65, 0x14, 0x9e, 0xe3, 0xb5, 0x70, 0x67, + 0x55, 0x47, 0xcd, 0x8e, 0xc1, 0xba, 0xf6, 0x72, 0xb1, 0xb4, 0x11, 0x1b, 0x25, 0xd4, 0x3d, 0x19, + 0xb5, 0xf5, 0xdd, 0x2f, 0xef, 0xd6, 0xd1, 0xaf, 0xb4, 0xdc, 0x93, 0xe5, 0x3c, 0xc3, 0xa4, 0x64, + 0xb3, 0xad, 0xd3, 0xfc, 0x23, 0x84, 0x86, 0xf7, 0xf9, 0x10, 0xdf, 0x15, 0x6e, 0xc, 0x6e, 0x43, + 0x9a, 0x63, 0x3b, 0xb5, 0x38, 0x5, 0xf9, 0x4a, 0x68, 0x4a, 0xfb, 0x95, 0x94, 0x9d, 0x31, 0xfd, + 0x84, 0x31, 0x43, 0x85, 0xd, 0x8e, 0xbb, 0x66, 0xca, 0x4d, 0x3b, 0xa, 0x75, 0xe5, 0xeb, 0xde, + 0xd5, 0xf8, 0x82, 0x85, 0xb2, 0xcc, 0xdb, 0x70, 0x9e, 0xa9, 0xe2, 0xb0, 0xac, 0x76, 0x1, 0x28, + 0xea, 0x10, 0x39, 0xb7, 0x47, 0x78, 0x82, 0xc9, 0xa4, 0x24, 0x16, 0xc3, 0xe5, 0x16, 0x2, 0x46, + 0x92, 0x7, 0xdb, 0x3a, 0xb0, 0xd0, 0xdd, 0xc0, 0x15, 0xdc, 0x5, 0xc7, 0x61, 0xe5, 0x7d, 0x82, + 0xd0, 0x4c, 0x17, 0x44, 0xb4, 0xfa, 0x28, 0xd8, 0x94, 0xc1, 0xf4, 0xd0, 0xb3, 0x50, 0x6a, 0x25, + 0x81, 0x98, 0x7b, 0x49, 0x67, 0xa2, 0x19, 0xb2, 0x41, 0xe5, 0xd2, 0xdf, 0x9a, 0x4f, 0xc9, 0x60, + 0xff, 0xb2, 0x91, 0xe8, 0x5f, 0x77, 0x67, 0xff, 0xc0, 0xa1, 0x76, 0x57, 0xeb, 0x61, 0x34, 0x57, + 0x80, 0x75, 0xdb, 0x3, 0xc5, 0x53, 0xf5, 0xb3, 0xa8, 0x61, 0xdf, 0xf, 0xb6, 0xe6, 0xc4, 0x39, + 0xa0, 0xcd, 0xe9, 0xa6, 0x32, 0xb8, 0xba, 0x46, 0x9c, 0x43, 0x16, 0x49, 0x65, 0x9d, 0x71, 0x87, + 0xf3, 0x37, 0xe5, 0xe0, 0xc6, 0xdf, 0x5e, 0x4c, 0xc5, 0x20, 0x9b, 0x16, 0xed, 0x13, 0x2d, 0x63, + 0x79, 0x2b, 0xd0, 0x51, 0x44, 0x0, 0x44, 0x8c, 0x7c, 0x2c, 0xc6, 0x82, 0x20, 0xca, 0xca, 0x1f, + 0x7f, 0xea, 0x71, 0xb7, 0x84, 0x5b, 0x8c, 0x94, 0x5b, 0x92, 0xb6, 0xef, 0xbe, 0x5f, 0x8, 0x3d, + 0x5, 0xb2, 0xfb, 0xcb, 0x5a, 0x1, 0xd4, 0x16, 0x71, 0x8d, 0x9e, 0xf5, 0x8d, 0xae, 0x80, 0x40, + 0x90, 0xfe, 0xef, 0x5d, 0xa4, 0x74, 0xf3, 0xe3, 0x4a, 0x9a, 0x67, 0x8b, 0xa6, 0xb5, 0x59, 0x18, + 0x61, 0x4f, 0x42, 0x5f, 0x2b, 0x74, 0x39, 0xa8, 0x30, 0x5d, 0x8d, 0xf1, 0xad, 0x25, 0x4f, 0x41, + 0xca, 0x27, 0xda, 0x7, 0x75, 0x49, 0x46, 0xd7, 0x81, 0xaa, 0x27, 0x61, 0x56, 0x9c, 0x29, 0x40, + 0x90, 0x22, 0xa, 0xcd, 0x3a, 0x7b, 0xb4, 0x85, 0x96, 0x7, 0x80, 0x13, 0x12, 0x3f, 0x25, 0x27, + 0xa0, 0xf6, 0x26, 0xbd, 0xd1, 0xb0, 0x95, 0xbd, 0x26, 0xba, 0x49, 0xa6, 0x81, 0x7, 0x31, 0xd3, + 0xe1, 0x25, 0xda, 0xab, 0x71, 0xb9, 0x65, 0x1d, 0x13, 0xab, 0x82, 0x52, 0x95, 0xb3, 0x62, 0xa6, + 0x48, 0x48, 0xb8, 0xd8, 0x55, 0x26, 0x98, 0xa1, 0xc9, 0x57, 0x66, 0x1c, 0xac, 0xb1, 0xc7, 0x5f, + 0xfa, 0x44, 0xc6, 0xd8, 0x19, 0x1, 0x8d, 0x41, 0x1f, 0xc7, 0xf, 0x89, 0x1d, 0xef, 0x34, 0x9a, + 0x68, 0x77, 0x8c }; + + static const size_t key_pos = 0xadf0; + + static const uint8_t gmac_expected[] = { 0xd6, 0x6a, 0x07, 0xb7 }; + + ChiakiGKCrypt gkcrypt; + memset(&gkcrypt, 0, sizeof(gkcrypt)); + + memcpy(gkcrypt.key_gmac_current, gkcrypt_key, sizeof(gkcrypt.key_gmac_current)); + memcpy(gkcrypt.iv, gkcrypt_iv, sizeof(gkcrypt.iv)); + gkcrypt.key_buf = NULL; + gkcrypt.key_buf_size = 0; + gkcrypt.key_gmac_index_current = 0; + + uint8_t gmac[CHIAKI_GKCRYPT_GMAC_SIZE]; + ChiakiErrorCode err = chiaki_gkcrypt_gmac(&gkcrypt, key_pos, buf, sizeof(buf), gmac); + if(err != CHIAKI_ERR_SUCCESS) + return MUNIT_ERROR; + + munit_assert_memory_equal(sizeof(gmac), gmac, gmac_expected); + + return MUNIT_OK; +} + MunitTest tests_gkcrypt[] = { { @@ -258,5 +322,13 @@ MunitTest tests_gkcrypt[] = { MUNIT_TEST_OPTION_NONE, NULL }, + { + "/gmac_split", + test_gmac_split, + NULL, + NULL, + MUNIT_TEST_OPTION_NONE, + NULL + }, { NULL, NULL, NULL, NULL, MUNIT_TEST_OPTION_NONE, NULL } }; \ No newline at end of file