unit-tests: Make IKE and ESP proposals configurable

2 files changed, 13 insertions, 13 deletions

diff --git a/src/libcharon/tests/suites/test_child_delete.c b/src/libcharon/tests/suites/test_child_delete.c
index 1b44798c8..51b3f059d 100644
--- a/src/libcharon/tests/suites/test_child_delete.c
+++ b/src/libcharon/tests/suites/test_child_delete.c
@@ -31,12 +31,12 @@ START_TEST(test_regular)
 	if (_i)
 	{	/* responder deletes the CHILD_SA (SPI 2) */
 		exchange_test_helper->establish_sa(exchange_test_helper,
-										   &b, &a);
+										   &b, &a, NULL);
 	}
 	else
 	{	/* initiator deletes the CHILD_SA (SPI 1) */
 		exchange_test_helper->establish_sa(exchange_test_helper,
-										   &a, &b);
+										   &a, &b, NULL);
 	}
 	assert_hook_not_called(child_updown);
 	call_ikesa(a, delete_child_sa, PROTO_ESP, _i+1, FALSE);
@@ -71,7 +71,7 @@ START_TEST(test_collision)
 	ike_sa_t *a, *b;
 
 	exchange_test_helper->establish_sa(exchange_test_helper,
-									   &a, &b);
+									   &a, &b, NULL);
 	/* both peers delete the CHILD_SA concurrently */
 	assert_hook_not_called(child_updown);
 	call_ikesa(a, delete_child_sa, PROTO_ESP, 1, FALSE);
@@ -137,7 +137,7 @@ START_TEST(test_collision_drop)
 	message_t *msg;
 
 	exchange_test_helper->establish_sa(exchange_test_helper,
-									   &a, &b);
+									   &a, &b, NULL);
 	/* both peers delete the CHILD_SA concurrently */
 	assert_hook_not_called(child_updown);
 	call_ikesa(a, delete_child_sa, PROTO_ESP, 1, FALSE);
diff --git a/src/libcharon/tests/suites/test_child_rekey.c b/src/libcharon/tests/suites/test_child_rekey.c
index 4fd480756..7355a8c2a 100644
--- a/src/libcharon/tests/suites/test_child_rekey.c
+++ b/src/libcharon/tests/suites/test_child_rekey.c
@@ -45,12 +45,12 @@ START_TEST(test_regular)
 	if (_i)
 	{	/* responder rekeys the CHILD_SA (SPI 2) */
 		exchange_test_helper->establish_sa(exchange_test_helper,
-										   &b, &a);
+										   &b, &a, NULL);
 	}
 	else
 	{	/* initiator rekeys the CHILD_SA (SPI 1) */
 		exchange_test_helper->establish_sa(exchange_test_helper,
-										   &a, &b);
+										   &a, &b, NULL);
 	}
 	initiate_rekey(a, spi_a);
 
@@ -105,7 +105,7 @@ START_TEST(test_collision)
 	ike_sa_t *a, *b;
 
 	exchange_test_helper->establish_sa(exchange_test_helper,
-									   &a, &b);
+									   &a, &b, NULL);
 
 	/* When rekeyings collide we get two CHILD_SAs with a total of four nonces.
 	 * The CHILD_SA with the lowest nonce SHOULD be deleted by the peer that
@@ -235,12 +235,12 @@ START_TEST(test_collision_delete)
 	if (_i)
 	{	/* responder rekeys the CHILD_SA (SPI 2) */
 		exchange_test_helper->establish_sa(exchange_test_helper,
-										   &b, &a);
+										   &b, &a, NULL);
 	}
 	else
 	{	/* initiator rekeys the CHILD_SA (SPI 1) */
 		exchange_test_helper->establish_sa(exchange_test_helper,
-										   &a, &b);
+										   &a, &b, NULL);
 	}
 	initiate_rekey(a, spi_a);
 	call_ikesa(b, delete_child_sa, PROTO_ESP, spi_b, FALSE);
@@ -322,12 +322,12 @@ START_TEST(test_collision_delete_drop_delete)
 	if (_i)
 	{	/* responder rekeys the CHILD_SA (SPI 2) */
 		exchange_test_helper->establish_sa(exchange_test_helper,
-										   &b, &a);
+										   &b, &a, NULL);
 	}
 	else
 	{	/* initiator rekeys the CHILD_SA (SPI 1) */
 		exchange_test_helper->establish_sa(exchange_test_helper,
-										   &a, &b);
+										   &a, &b, NULL);
 	}
 	initiate_rekey(a, spi_a);
 	call_ikesa(b, delete_child_sa, PROTO_ESP, spi_b, FALSE);
@@ -407,12 +407,12 @@ END_TEST
 	if (_i)
 	{	/* responder rekeys the CHILD_SA (SPI 2) */
 		exchange_test_helper->establish_sa(exchange_test_helper,
-										   &b, &a);
+										   &b, &a, NULL);
 	}
 	else
 	{	/* initiator rekeys the CHILD_SA (SPI 1) */
 		exchange_test_helper->establish_sa(exchange_test_helper,
-										   &a, &b);
+										   &a, &b, NULL);
 	}
 	initiate_rekey(a, spi_a);
 	call_ikesa(b, delete_child_sa, PROTO_ESP, spi_b, FALSE);