charon-tkm: Adapt to interface changes to support multiple key exchanges

Also includes ESA flags.

Co-authored-by: Tobias Brunner <[email protected]>
This commit is contained in:
Stefan Berghofer
2024-09-19 14:39:13 +02:00
committed by Tobias Brunner
co-authored by Tobias Brunner
parent 301abbeaff
commit 7975a0cfa4
29 changed files with 341 additions and 196 deletions
@@ -1,7 +1,7 @@
# /etc/strongswan.conf - strongSwan configuration file
charon-tkm {
dh_mapping {
ke_mapping {
15 = 1
16 = 2
}
@@ -1,7 +1,7 @@
# /etc/strongswan.conf - strongSwan configuration file
charon-tkm {
dh_mapping {
ke_mapping {
15 = 1
16 = 2
}
@@ -1,7 +1,7 @@
# /etc/strongswan.conf - strongSwan configuration file
charon-tkm {
dh_mapping {
ke_mapping {
15 = 1
16 = 2
}
@@ -1,7 +1,7 @@
# /etc/strongswan.conf - strongSwan configuration file
charon-tkm {
dh_mapping {
ke_mapping {
15 = 1
16 = 2
}
@@ -1,7 +1,7 @@
# /etc/strongswan.conf - strongSwan configuration file
charon-tkm {
dh_mapping {
ke_mapping {
15 = 1
16 = 2
}
@@ -1,7 +1,7 @@
# /etc/strongswan.conf - strongSwan configuration file
charon-tkm {
dh_mapping {
ke_mapping {
15 = 1
16 = 2
}
@@ -1,7 +1,7 @@
# /etc/strongswan.conf - strongSwan configuration file
charon-tkm {
dh_mapping {
ke_mapping {
15 = 1
16 = 2
}
@@ -17,7 +17,7 @@ moon::cat /tmp/tkm.log::Linked CC context 1 with CA certificate 1::YES
moon::cat /tmp/tkm.log::Certificate chain of CC context 1 is valid::YES
moon::cat /tmp/tkm.log::Authentication of ISA context 1 successful::YES
moon::cat /tmp/tkm.log::Creating first new ESA context with ID 1 (Isa 1, Sp 1, Ea 1, Initiator TRUE, spi_loc.*, spi_rem.*)::YES
moon::cat /tmp/tkm.log::Creating ESA context with ID 2 (Isa 1, Sp 1, Ea 1, Dh_Id 1, Nc_Loc_Id 1, Initiator TRUE, spi_loc.*, spi_rem.*)::YES
moon::cat /tmp/tkm.log::Creating ESA context with ID 2 (Isa 1, Sp 1, Ea 1, Ke_Id 1 #1 / 1, Nc_Loc_Id 1, Initiator TRUE, spi_loc.*, spi_rem.*)::YES
moon::cat /tmp/tkm.log::Adding ESA \[ 1, 192.168.0.1 <-> 192.168.0.2, SPI_in.*, SPI_out.*, soft 4, hard 60 \]::2
moon::cat /tmp/tkm.log::Resetting ESA context 1::YES
moon::cat /tmp/tkm.log::Deleting ESA \[ 1, 192.168.0.1 <=> 192.168.0.2, SPI_in.*, SPI_out.* \]::YES
@@ -3,7 +3,7 @@
charon-tkm {
# remove rekeyed inbound SA a bit quicker for the test scenario
delete_rekeyed_delay = 2
dh_mapping {
ke_mapping {
15 = 1
16 = 2
}
@@ -15,7 +15,7 @@ moon::cat /tmp/tkm.log::Linked CC context 1 with CA certificate 1::YES
moon::cat /tmp/tkm.log::Certificate chain of CC context 1 is valid::YES
moon::cat /tmp/tkm.log::Authentication of ISA context 1 successful::YES
moon::cat /tmp/tkm.log::Creating first new ESA context with ID 1 (Isa 1, Sp 1, Ea 1, Initiator TRUE, spi_loc.*, spi_rem.*)::YES
moon::cat /tmp/tkm.log::Creating ESA context with ID 2 (Isa 1, Sp 1, Ea 1, Dh_Id 1, Nc_Loc_Id 1, Initiator FALSE, spi_loc.*, spi_rem.*)::YES
moon::cat /tmp/tkm.log::Creating ESA context with ID 2 (Isa 1, Sp 1, Ea 1, Ke_Id 1 #1 / 1, Nc_Loc_Id 1, Initiator FALSE, spi_loc.*, spi_rem.*)::YES
moon::cat /tmp/tkm.log::Adding ESA \[ 1, 192.168.0.1 <-> 192.168.0.2, SPI_in.*, SPI_out.*, soft 30, hard 60 \]::2
moon::cat /tmp/tkm.log::Resetting ESA context 1::YES
moon::cat /tmp/tkm.log::Deleting ESA \[ 1, 192.168.0.1 <=> 192.168.0.2, SPI_in.*, SPI_out.* \]::YES
@@ -3,7 +3,7 @@
charon-tkm {
# remove rekeyed inbound SA a bit quicker for the test scenario
delete_rekeyed_delay = 2
dh_mapping {
ke_mapping {
15 = 1
16 = 2
}