diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-05-20 10:49:21 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-06-17 18:48:03 +0200 |
| commit | cdbf9428890a324b4cbd8bdbe0f1cfe669870a15 (patch) | |
| tree | f3208c336cef7978d0f7485def462937862da54b /src/libcharon/tests/suites | |
| parent | b79beba5182f5e05d495a7660695dc8f24ba70d0 (diff) | |
| download | strongswan-cdbf9428890a324b4cbd8bdbe0f1cfe669870a15.tar.bz2 strongswan-cdbf9428890a324b4cbd8bdbe0f1cfe669870a15.tar.xz | |
ikev2: Use CHILD_REKEYED for replaced CHILD_SAs after rekeying
This allows handling collisions better, in particular with deletions.
Diffstat (limited to 'src/libcharon/tests/suites')
| -rw-r--r-- | src/libcharon/tests/suites/test_child_rekey.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libcharon/tests/suites/test_child_rekey.c b/src/libcharon/tests/suites/test_child_rekey.c index 2cf2b3fd0..2ed1f89d5 100644 --- a/src/libcharon/tests/suites/test_child_rekey.c +++ b/src/libcharon/tests/suites/test_child_rekey.c @@ -60,8 +60,7 @@ START_TEST(test_regular) assert_hook_called(child_rekey); assert_notify(IN, REKEY_SA); exchange_test_helper->process_message(exchange_test_helper, b, NULL); - /* FIXME: keeping this in CHILD_REKEYING is not ideal */ - assert_child_sa_state(b, spi_b, CHILD_REKEYING); + assert_child_sa_state(b, spi_b, CHILD_REKEYED); assert_child_sa_state(b, 4, CHILD_INSTALLED); assert_hook(); @@ -145,14 +144,14 @@ START_TEST(test_collision) exchange_test_helper->nonce_first_byte = data[_i].nonces[2]; assert_hook_rekey(child_rekey, 2, 5); exchange_test_helper->process_message(exchange_test_helper, b, NULL); - assert_child_sa_state(b, 2, CHILD_REKEYING); + assert_child_sa_state(b, 2, CHILD_REKEYED); assert_child_sa_state(b, 5, CHILD_INSTALLED); assert_hook(); /* <-- CREATE_CHILD_SA { N(REKEY_SA), SA, Ni, [KEi,] TSi, TSr } */ exchange_test_helper->nonce_first_byte = data[_i].nonces[3]; assert_hook_rekey(child_rekey, 1, 6); exchange_test_helper->process_message(exchange_test_helper, a, NULL); - assert_child_sa_state(a, 1, CHILD_REKEYING); + assert_child_sa_state(a, 1, CHILD_REKEYED); assert_child_sa_state(a, 6, CHILD_INSTALLED); assert_hook(); @@ -169,7 +168,7 @@ START_TEST(test_collision) exchange_test_helper->process_message(exchange_test_helper, a, NULL); } assert_child_sa_state(a, data[_i].spi_del_a, CHILD_DELETING); - assert_child_sa_state(a, data[_i].spi_del_b, CHILD_REKEYING); + assert_child_sa_state(a, data[_i].spi_del_b, CHILD_REKEYED); assert_child_sa_state(a, data[_i].spi_a, CHILD_INSTALLED); /* CREATE_CHILD_SA { SA, Nr, [KEr,] TSi, TSr } --> */ if (data[_i].spi_del_b == 2) @@ -183,7 +182,7 @@ START_TEST(test_collision) exchange_test_helper->process_message(exchange_test_helper, b, NULL); } assert_child_sa_state(b, data[_i].spi_del_b, CHILD_DELETING); - assert_child_sa_state(b, data[_i].spi_del_a, CHILD_REKEYING); + assert_child_sa_state(b, data[_i].spi_del_a, CHILD_REKEYED); assert_child_sa_state(b, data[_i].spi_b, CHILD_INSTALLED); /* we don't expect this hook to get called anymore */ |