From 31b6eb417b7aa6bb1e1f1fb9704bffbc5b63258c Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 13 Nov 2019 13:06:40 +0200 Subject: [PATCH] tests: Update SAE H2E test case to match SSWU parameter z change Update the test vector based on 11-19-1817-02-000m-hash-to-curve-changes.docx Signed-off-by: Jouni Malinen --- src/common/common_module_tests.c | 116 +++++++++++++++---------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/src/common/common_module_tests.c b/src/common/common_module_tests.c index fb0cf43e3..7694c96b4 100644 --- a/src/common/common_module_tests.c +++ b/src/common/common_module_tests.c @@ -341,71 +341,71 @@ static int sae_tests(void) struct wpabuf *buf = NULL; struct crypto_bignum *mask = NULL; const u8 pwe_19_x[32] = { - 0x19, 0xd3, 0x37, 0xc9, 0x30, 0x79, 0x2b, 0x47, - 0x2b, 0x14, 0x5f, 0xc1, 0x5b, 0x98, 0x64, 0x0a, - 0x0e, 0x7d, 0x3b, 0xb0, 0x7d, 0xc0, 0xad, 0xee, - 0x6f, 0xc9, 0xdf, 0x75, 0xde, 0xc2, 0xd6, 0x94 + 0xc9, 0x30, 0x49, 0xb9, 0xe6, 0x40, 0x00, 0xf8, + 0x48, 0x20, 0x16, 0x49, 0xe9, 0x99, 0xf2, 0xb5, + 0xc2, 0x2d, 0xea, 0x69, 0xb5, 0x63, 0x2c, 0x9d, + 0xf4, 0xd6, 0x33, 0xb8, 0xaa, 0x1f, 0x6c, 0x1e }; const u8 pwe_19_y[32] = { - 0xb7, 0x8a, 0x02, 0x39, 0x20, 0x29, 0xe7, 0xf4, - 0x52, 0x41, 0x3d, 0x35, 0x8c, 0x88, 0xd9, 0x16, - 0xc8, 0x90, 0xba, 0x40, 0xd9, 0x93, 0xe3, 0x2d, - 0xd0, 0x0f, 0xfb, 0x58, 0xee, 0x62, 0x74, 0x98 + 0x73, 0x63, 0x4e, 0x94, 0xb5, 0x3d, 0x82, 0xe7, + 0x38, 0x3a, 0x8d, 0x25, 0x81, 0x99, 0xd9, 0xdc, + 0x1a, 0x5e, 0xe8, 0x26, 0x9d, 0x06, 0x03, 0x82, + 0xcc, 0xbf, 0x33, 0xe6, 0x14, 0xff, 0x59, 0xa0 }; const u8 pwe_15[384] = { - 0x59, 0x00, 0x9a, 0x32, 0xbb, 0x37, 0x84, 0x60, - 0x27, 0xeb, 0x70, 0x20, 0x57, 0x34, 0xf1, 0xb4, - 0xde, 0x1b, 0x48, 0xfc, 0x0e, 0xa5, 0xb8, 0x65, - 0xb1, 0xa0, 0xd4, 0xb9, 0x42, 0x1d, 0x6d, 0xdf, - 0x8b, 0x86, 0xeb, 0x4a, 0x2c, 0x2e, 0x38, 0x06, - 0x52, 0xae, 0x67, 0x39, 0xed, 0x7d, 0x0c, 0xd0, - 0xea, 0x30, 0x6e, 0x50, 0xe7, 0xb1, 0x8d, 0x91, - 0xf0, 0x05, 0x1f, 0x16, 0xf5, 0x45, 0xa7, 0x37, - 0x21, 0x0d, 0x8a, 0x69, 0x9a, 0xd1, 0xf1, 0x8c, - 0x2b, 0xbb, 0xd8, 0x21, 0xa2, 0x8f, 0xcc, 0xd1, - 0x35, 0x98, 0x66, 0xf3, 0x3c, 0x03, 0xba, 0x70, - 0x72, 0x4e, 0xe4, 0x23, 0xb5, 0x2e, 0x96, 0x5f, - 0xdd, 0xd1, 0xae, 0x71, 0xb1, 0xc1, 0x4b, 0x69, - 0x4e, 0x60, 0x0a, 0x08, 0x02, 0xa1, 0x6e, 0x80, - 0x68, 0x0a, 0xe7, 0x97, 0x9f, 0x5b, 0xbf, 0xa8, - 0x77, 0xda, 0x5b, 0x26, 0x13, 0x0a, 0xab, 0x92, - 0x79, 0x87, 0xa3, 0x85, 0x78, 0x74, 0xae, 0xae, - 0x01, 0xf0, 0x31, 0x8a, 0xc3, 0x96, 0xce, 0xaa, - 0x57, 0xbf, 0xb3, 0x57, 0xce, 0x2d, 0x2d, 0x36, - 0xda, 0x02, 0x5b, 0x12, 0xeb, 0xff, 0x13, 0x00, - 0x9e, 0xf7, 0xae, 0xe0, 0x47, 0xa4, 0x5d, 0x0a, - 0x88, 0x65, 0xbc, 0x66, 0x23, 0x3e, 0xf2, 0xf1, - 0xa0, 0x64, 0x5c, 0x6b, 0xdc, 0x81, 0xe9, 0x3c, - 0x46, 0x4f, 0x83, 0xcf, 0x9f, 0x55, 0x33, 0x8f, - 0xaa, 0x60, 0x4b, 0xd7, 0x21, 0x73, 0x6b, 0xdb, - 0x26, 0xad, 0x2f, 0xb7, 0xe2, 0x42, 0x56, 0x33, - 0xdb, 0xd6, 0xb2, 0x3a, 0x7d, 0x75, 0x87, 0xda, - 0x86, 0xc4, 0xe9, 0x41, 0x8d, 0x63, 0x19, 0x8e, - 0x8b, 0x17, 0x95, 0xfe, 0x2b, 0x96, 0xa0, 0x38, - 0xf1, 0xe2, 0x1d, 0x42, 0xa9, 0xe3, 0x8a, 0xa1, - 0x61, 0x62, 0x10, 0xf8, 0xb3, 0xb2, 0x2c, 0x7b, - 0xdf, 0xba, 0x74, 0xb2, 0x5b, 0xf6, 0xa9, 0xae, - 0x1d, 0x21, 0x0d, 0xc0, 0x48, 0x20, 0xfc, 0x28, - 0xf6, 0x22, 0xd2, 0xf6, 0x9c, 0x71, 0x3f, 0x9f, - 0x32, 0xd6, 0xbb, 0x9b, 0xd3, 0x87, 0x25, 0xcf, - 0x62, 0xd1, 0x68, 0xba, 0x55, 0x3b, 0x74, 0x2b, - 0x1d, 0x5a, 0xe4, 0x94, 0x59, 0x3b, 0x13, 0x21, - 0x15, 0x87, 0x3b, 0x09, 0x0e, 0xcf, 0x35, 0x60, - 0x04, 0xa8, 0xde, 0xa1, 0x09, 0xca, 0xb8, 0x35, - 0x1e, 0x16, 0x61, 0xed, 0xa1, 0x1f, 0x8c, 0x92, - 0x83, 0xa5, 0x27, 0x92, 0xf2, 0x80, 0xc3, 0xcb, - 0xdd, 0x3c, 0x0c, 0xf5, 0x8d, 0x69, 0xb3, 0xe4, - 0xd5, 0x49, 0x4d, 0x62, 0xcb, 0xb8, 0xe3, 0x9f, - 0x89, 0xb5, 0x57, 0xff, 0xef, 0x12, 0x37, 0x05, - 0xb6, 0x35, 0xe5, 0xc6, 0xd9, 0x23, 0xe2, 0xeb, - 0xe4, 0x0d, 0x1a, 0x30, 0x8f, 0x73, 0x70, 0x3a, - 0xef, 0x5a, 0xd1, 0x8c, 0x18, 0x34, 0x1e, 0xf0, - 0xb9, 0x08, 0x57, 0xab, 0xcb, 0x5c, 0x87, 0x10 + 0x69, 0x68, 0x73, 0x65, 0x8f, 0x65, 0x31, 0x42, + 0x9f, 0x97, 0x39, 0x6f, 0xb8, 0x5f, 0x89, 0xe1, + 0xfc, 0xd2, 0xf6, 0x92, 0x19, 0xa9, 0x0e, 0x82, + 0x2f, 0xf7, 0xf4, 0xbc, 0x0b, 0xd8, 0xa7, 0x9f, + 0xf0, 0x80, 0x35, 0x31, 0x6f, 0xca, 0xe1, 0xa5, + 0x39, 0x77, 0xdc, 0x11, 0x2b, 0x0b, 0xfe, 0x2e, + 0x6f, 0x65, 0x6d, 0xc7, 0xd4, 0xa4, 0x5b, 0x08, + 0x1f, 0xd9, 0xbb, 0xe2, 0x22, 0x85, 0x31, 0x81, + 0x79, 0x70, 0xbe, 0xa1, 0x66, 0x58, 0x4a, 0x09, + 0x3c, 0x57, 0x34, 0x3c, 0x9d, 0x57, 0x8f, 0x42, + 0x58, 0xd0, 0x39, 0x81, 0xdb, 0x8f, 0x79, 0xa2, + 0x1b, 0x01, 0xcd, 0x27, 0xc9, 0xae, 0xcf, 0xcb, + 0x9c, 0xdb, 0x1f, 0x84, 0xb8, 0x88, 0x4e, 0x8f, + 0x50, 0x66, 0xb4, 0x29, 0x83, 0x1e, 0xb9, 0x89, + 0x0c, 0xa5, 0x47, 0x21, 0xba, 0x10, 0xd5, 0xaa, + 0x1a, 0x80, 0xce, 0xf1, 0x4c, 0xad, 0x16, 0xda, + 0x57, 0xb2, 0x41, 0x8a, 0xbe, 0x4b, 0x8c, 0xb0, + 0xb2, 0xeb, 0xf7, 0xa8, 0x0e, 0x3e, 0xcf, 0x22, + 0x8f, 0xd8, 0xb6, 0xdb, 0x79, 0x9c, 0x9b, 0x80, + 0xaf, 0xd7, 0x14, 0xad, 0x51, 0x82, 0xf4, 0x64, + 0xb6, 0x3f, 0x4c, 0x6c, 0xe5, 0x3f, 0xaa, 0x6f, + 0xbf, 0x3d, 0xc2, 0x3f, 0x77, 0xfd, 0xcb, 0xe1, + 0x9c, 0xe3, 0x1e, 0x8a, 0x0e, 0x97, 0xe2, 0x2b, + 0xe2, 0xdd, 0x37, 0x39, 0x88, 0xc2, 0x8e, 0xbe, + 0xfa, 0xac, 0x3d, 0x5b, 0x62, 0x2e, 0x1e, 0x74, + 0xa0, 0x9a, 0xf8, 0xed, 0xfa, 0xe1, 0xce, 0x9c, + 0xab, 0xbb, 0xdc, 0x36, 0xb1, 0x28, 0x46, 0x3c, + 0x7e, 0xa8, 0xbd, 0xb9, 0x36, 0x4c, 0x26, 0x75, + 0xe0, 0x17, 0x73, 0x1f, 0xe0, 0xfe, 0xf6, 0x49, + 0xfa, 0xa0, 0x45, 0xf4, 0x44, 0x05, 0x20, 0x27, + 0x25, 0xc2, 0x99, 0xde, 0x27, 0x8b, 0x70, 0xdc, + 0x54, 0x60, 0x90, 0x02, 0x1e, 0x29, 0x97, 0x9a, + 0xc4, 0xe7, 0xb6, 0xf5, 0x8b, 0xae, 0x7c, 0x34, + 0xaa, 0xef, 0x9b, 0xc6, 0x30, 0xf2, 0x80, 0x8d, + 0x80, 0x78, 0xc2, 0x55, 0x63, 0xa0, 0xa1, 0x38, + 0x70, 0xfb, 0xf4, 0x74, 0x8d, 0xcd, 0x87, 0x90, + 0xb4, 0x54, 0xc3, 0x75, 0xdf, 0x10, 0xc5, 0xb6, + 0xb2, 0x08, 0x59, 0x61, 0xe6, 0x68, 0xa5, 0x82, + 0xf8, 0x8f, 0x47, 0x30, 0x43, 0xb4, 0xdc, 0x31, + 0xfc, 0xbc, 0x69, 0xe7, 0xb4, 0x94, 0xb0, 0x6a, + 0x60, 0x59, 0x80, 0x2e, 0xd3, 0xa4, 0xe8, 0x97, + 0xa2, 0xa3, 0xc9, 0x08, 0x4b, 0x27, 0x6c, 0xc1, + 0x37, 0xe8, 0xfc, 0x5c, 0xe2, 0x54, 0x30, 0x3e, + 0xf8, 0xfe, 0xa2, 0xfc, 0xbb, 0xbd, 0x88, 0x6c, + 0x92, 0xa3, 0x2a, 0x40, 0x7a, 0x2c, 0x22, 0x38, + 0x8c, 0x86, 0x86, 0xfe, 0xb9, 0xd4, 0x6b, 0xd6, + 0x47, 0x88, 0xa7, 0xf6, 0x8e, 0x0f, 0x14, 0xad, + 0x1e, 0xac, 0xcf, 0x33, 0x01, 0x99, 0xc1, 0x62 }; int pt_groups[] = { 19, 20, 21, 25, 26, 28, 29, 30, 15, 0 }; struct sae_pt *pt_info, *pt; - u8 addr1b[ETH_ALEN] = { 0x3b, 0x36, 0xc2, 0x8b, 0x83, 0x03 }; - u8 addr2b[ETH_ALEN] = { 0x58, 0x36, 0xc0, 0x64, 0x2d, 0x31 }; + const u8 addr1b[ETH_ALEN] = { 0x00, 0x09, 0x5b, 0x66, 0xec, 0x1e }; + const u8 addr2b[ETH_ALEN] = { 0x00, 0x0b, 0x6b, 0xd9, 0x02, 0x46 }; os_memset(&sae, 0, sizeof(sae)); buf = wpabuf_alloc(1000);