Content-Type: multipart/mixed; boundary="===============4099640066173119245==" MIME-Version: 1.0 From: Andrew Zaborowski Subject: [PATCH 3/3] unit: Add a test for building M8 encrypted settings Date: Thu, 09 Jan 2020 20:40:19 +0100 Message-ID: <20200109194019.8228-3-andrew.zaborowski@intel.com> In-Reply-To: <20200109194019.8228-1-andrew.zaborowski@intel.com> List-Id: To: iwd@lists.01.org --===============4099640066173119245== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable There's are two changes to the example raw data in m8_encrypted_settings, one is to change the Network Index value to 1 and the other is to drop the Network Key Index attribute: Network Index R Deprecated =E2=80=93 use fixed value 1 for backwards compatibility. Network Key O Deprecated. Only included by WSC 1.0 Index devices. Ignored by WSC 2.0 or newer devices. --- unit/test-wsc.c | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/unit/test-wsc.c b/unit/test-wsc.c index 01420d47..983570e2 100644 --- a/unit/test-wsc.c +++ b/unit/test-wsc.c @@ -1736,17 +1736,17 @@ static void wsc_test_build_m8(const void *data) } = static const unsigned char m8_encrypted_settings[] =3D { - 0x10, 0x0e, 0x00, 0x6f, 0x10, 0x26, 0x00, 0x01, 0x00, 0x10, 0x45, 0x00, + 0x10, 0x0e, 0x00, 0x6a, 0x10, 0x26, 0x00, 0x01, 0x01, 0x10, 0x45, 0x00, 0x07, 0x54, 0x65, 0x73, 0x74, 0x57, 0x50, 0x41, 0x10, 0x03, 0x00, 0x02, - 0x00, 0x20, 0x10, 0x0f, 0x00, 0x02, 0x00, 0x08, 0x10, 0x28, 0x00, 0x01, - 0x00, 0x10, 0x27, 0x00, 0x40, 0x34, 0x36, 0x30, 0x34, 0x44, 0x30, 0x31, - 0x46, 0x46, 0x44, 0x42, 0x30, 0x42, 0x32, 0x39, 0x32, 0x45, 0x33, 0x37, - 0x37, 0x33, 0x32, 0x44, 0x44, 0x34, 0x45, 0x31, 0x31, 0x43, 0x32, 0x34, - 0x30, 0x31, 0x31, 0x35, 0x34, 0x32, 0x38, 0x39, 0x41, 0x30, 0x39, 0x41, - 0x33, 0x33, 0x41, 0x44, 0x37, 0x30, 0x34, 0x31, 0x37, 0x37, 0x41, 0x42, - 0x30, 0x44, 0x31, 0x42, 0x37, 0x35, 0x38, 0x44, 0x30, 0x10, 0x20, 0x00, - 0x06, 0xa0, 0xa8, 0xcd, 0x1c, 0x7e, 0xc9, 0x10, 0x1e, 0x00, 0x08, 0xe8, - 0x3b, 0x3b, 0xe7, 0x9e, 0x72, 0x06, 0x46, + 0x00, 0x20, 0x10, 0x0f, 0x00, 0x02, 0x00, 0x08, 0x10, 0x27, 0x00, 0x40, + 0x34, 0x36, 0x30, 0x34, 0x44, 0x30, 0x31, 0x46, 0x46, 0x44, 0x42, 0x30, + 0x42, 0x32, 0x39, 0x32, 0x45, 0x33, 0x37, 0x37, 0x33, 0x32, 0x44, 0x44, + 0x34, 0x45, 0x31, 0x31, 0x43, 0x32, 0x34, 0x30, 0x31, 0x31, 0x35, 0x34, + 0x32, 0x38, 0x39, 0x41, 0x30, 0x39, 0x41, 0x33, 0x33, 0x41, 0x44, 0x37, + 0x30, 0x34, 0x31, 0x37, 0x37, 0x41, 0x42, 0x30, 0x44, 0x31, 0x42, 0x37, + 0x35, 0x38, 0x44, 0x30, 0x10, 0x20, 0x00, 0x06, 0xa0, 0xa8, 0xcd, 0x1c, + 0x7e, 0xc9, 0x10, 0x1e, 0x00, 0x08, 0xe8, 0x3b, 0x3b, 0xe7, 0x9e, 0x72, + 0x06, 0x46, }; = struct wsc_credential creds_1[1] =3D { @@ -1831,6 +1831,22 @@ static void wsc_test_parse_m8_encrypted_settings(con= st void *data) assert(!memcmp(expected->authenticator, m8es.authenticator, 8)); } = +static void wsc_test_build_m8_encrypted_settings(const void *data) +{ + const struct m8_encrypted_settings_data *test =3D data; + uint8_t *out; + size_t out_len; + + out =3D wsc_build_m8_encrypted_settings(&test->expected, test->creds, + test->n_creds, &out_len); + assert(out); + + assert(out_len =3D=3D test->len); + assert(!memcmp(test->pdu, out, test->len)); + + l_free(out); +} + static const unsigned char eap_wsc_done[] =3D { 0x01, 0x00, 0x00, 0x4a, 0x02, 0xab, 0x00, 0x4a, 0xfe, 0x00, 0x37, 0x2a, 0x00, 0x00, 0x00, 0x01, 0x05, 0x00, 0x10, 0x4a, 0x00, 0x01, 0x10, 0x10, @@ -2330,6 +2346,9 @@ int main(int argc, char *argv[]) l_test_add("/wsc/parse/m8 encrypted settings 1", wsc_test_parse_m8_encrypted_settings, &m8_encrypted_settings_data_1); + l_test_add("/wsc/build/m8 encrypted settings 1", + wsc_test_build_m8_encrypted_settings, + &m8_encrypted_settings_data_1); = l_test_add("/wsc/parse/wsc_done 1", wsc_test_parse_wsc_done, &wsc_done_data_1); -- = 2.20.1 --===============4099640066173119245==--