From c122a99fbc946faa5ee3a26caa2d1966f9b7c2a1 Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Mon, 23 Aug 2021 16:23:29 -0700 Subject: [PATCH 4/4] unit: update test-sae with API change --- Makefile.am | 3 ++- unit/test-sae.c | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index e6d2fc91..8b0df2aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -521,7 +521,8 @@ unit_test_sae_SOURCES = unit/test-sae.c \ src/handshake.h src/handshake.c \ src/erp.h src/erp.c \ src/util.h src/util.c \ - src/mpdu.h src/mpdu.c + src/mpdu.h src/mpdu.c \ + src/scan.h unit_test_sae_LDADD = $(ell_ldadd) unit_test_sae_LDFLAGS = -Wl,-wrap,l_ecc_supported_ike_groups diff --git a/unit/test-sae.c b/unit/test-sae.c index d9ec6b31..00819eb2 100644 --- a/unit/test-sae.c +++ b/unit/test-sae.c @@ -171,7 +171,7 @@ static struct auth_proto *test_initialize(struct test_data *td) memset(td->test_clogging_token, 0xde, 32); - ap = sae_sm_new(hs, test_tx_auth_func, test_tx_assoc_func, td); + ap = sae_sm_new(hs, NULL, test_tx_auth_func, test_tx_assoc_func, td); td->commit_success = false; auth_proto_start(ap); @@ -423,8 +423,8 @@ static void test_bad_confirm(const void *arg) handshake_state_set_passphrase(hs2, passphrase); handshake_state_set_authenticator(hs2, true); - ap1 = sae_sm_new(hs1, end_to_end_tx_func, test_tx_assoc_func, td1); - ap2 = sae_sm_new(hs2, end_to_end_tx_func, test_tx_assoc_func, td2); + ap1 = sae_sm_new(hs1, NULL, end_to_end_tx_func, test_tx_assoc_func, td1); + ap2 = sae_sm_new(hs2, NULL, end_to_end_tx_func, test_tx_assoc_func, td2); /* both peers send out commit */ ap1->start(ap1); @@ -498,8 +498,8 @@ static void test_confirm_after_accept(const void *arg) handshake_state_set_passphrase(hs2, passphrase); handshake_state_set_authenticator(hs2, true); - ap1 = sae_sm_new(hs1, end_to_end_tx_func, test_tx_assoc_func, td1); - ap2 = sae_sm_new(hs2, end_to_end_tx_func, test_tx_assoc_func, td2); + ap1 = sae_sm_new(hs1, NULL, end_to_end_tx_func, test_tx_assoc_func, td1); + ap2 = sae_sm_new(hs2, NULL, end_to_end_tx_func, test_tx_assoc_func, td2); /* both peers send out commit */ auth_proto_start(ap1); @@ -583,8 +583,8 @@ static void test_end_to_end(const void *arg) handshake_state_set_passphrase(hs2, passphrase); handshake_state_set_authenticator(hs2, true); - ap1 = sae_sm_new(hs1, end_to_end_tx_func, test_tx_assoc_func, td1); - ap2 = sae_sm_new(hs2, end_to_end_tx_func, test_tx_assoc_func, td2); + ap1 = sae_sm_new(hs1, NULL, end_to_end_tx_func, test_tx_assoc_func, td1); + ap2 = sae_sm_new(hs2, NULL, end_to_end_tx_func, test_tx_assoc_func, td2); /* both peers send out commit */ auth_proto_start(ap1); -- 2.31.1