ike-sa: Add option to force the destruction of an IKE_SA after initiating a delete

This commit is contained in:
Tobias Brunner
2018-05-22 10:06:07 +02:00
parent c58434aeff
commit a79d510354
11 changed files with 50 additions and 39 deletions
@@ -290,7 +290,7 @@ START_TEST(test_collision_ike_delete)
}
call_ikesa(a, delete_child_sa, PROTO_ESP, spi_a, FALSE);
assert_child_sa_state(a, spi_a, CHILD_DELETING);
call_ikesa(b, delete);
call_ikesa(b, delete, FALSE);
assert_ike_sa_state(b, IKE_DELETING);
/* RFC 7296, 2.25.2 does not explicitly state what the behavior SHOULD be if
@@ -1906,7 +1906,7 @@ START_TEST(test_collision_ike_delete)
&a, &b, NULL);
}
initiate_rekey(a, spi_a);
call_ikesa(b, delete);
call_ikesa(b, delete, FALSE);
assert_ike_sa_state(b, IKE_DELETING);
/* this should never get called as there is no successful rekeying on
+3 -3
View File
@@ -40,7 +40,7 @@ START_TEST(test_regular)
}
assert_hook_not_called(ike_updown);
assert_hook_not_called(child_updown);
call_ikesa(a, delete);
call_ikesa(a, delete, FALSE);
assert_ike_sa_state(a, IKE_DELETING);
assert_hook();
assert_hook();
@@ -81,9 +81,9 @@ START_TEST(test_collision)
assert_hook_not_called(ike_updown);
assert_hook_not_called(child_updown);
call_ikesa(a, delete);
call_ikesa(a, delete, FALSE);
assert_ike_sa_state(a, IKE_DELETING);
call_ikesa(b, delete);
call_ikesa(b, delete, FALSE);
assert_ike_sa_state(b, IKE_DELETING);
assert_hook();
assert_hook();
+2 -2
View File
@@ -1319,7 +1319,7 @@ START_TEST(test_collision_delete)
assert_hook_not_called(ike_rekey);
initiate_rekey(a);
call_ikesa(b, delete);
call_ikesa(b, delete, FALSE);
assert_ike_sa_state(b, IKE_DELETING);
/* RFC 7296, 2.25.2: If a peer receives a request to rekey an IKE SA that
@@ -1401,7 +1401,7 @@ START_TEST(test_collision_delete_drop_delete)
assert_hook_not_called(ike_rekey);
initiate_rekey(a);
call_ikesa(b, delete);
call_ikesa(b, delete, FALSE);
assert_ike_sa_state(b, IKE_DELETING);
/* RFC 7296, 2.25.2: If a peer receives a request to rekey an IKE SA that