diff options
| author |   Matthew Smith <mgsmith@netgate.com> | 2022-08-09 22:19:38 +0000 |
|---|---|---|
| committer | Matthew Smith <mgsmith@netgate.com> | 2022-08-19 14:13:36 +0000 |
| commit | 6f1eb484c85cfdb091cbef18252a02b3310b9aae (patch) | |
| tree | 5e2d31421dea41d774615aafe8cf96eedd67485a /src/plugins | |
| parent | 47c1b1c6338c2d46173f337cf69a4b0d7f27845e (diff) | |
ipsec: enable UDP encap for IPv6 ESP tun protect
Type: improvement
If an SA protecting an IPv6 tunnel interface has UDP encapsulation
enabled, the code in esp_encrypt_inline() inserts a UDP header but does
not set the next protocol or the UDP payload length, so the peer that
receives the packet drops it. Set the next protocol field and the UDP
payload length correctly.
The port(s) for UDP encapsulation of IPsec was not registered for IPv6.
Add this registration for IPv6 SAs when UDP encapsulation is enabled.
Add punt handling for IPv6 IKE on NAT-T port.
Add registration of linux-cp for the new punt reason.
Add unit tests of IPv6 ESP w/ UDP encapsulation on tun protect
Signed-off-by: Matthew Smith <mgsmith@netgate.com>
Change-Id: Ibb28e423ab8c7bcea2c1964782a788a0f4da5268
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/ikev2/ikev2.c | 6 | ||||
| -rw-r--r-- | src/plugins/linux-cp/lcp_interface.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/ikev2/ikev2.c b/src/plugins/ikev2/ikev2.c index c1b7efdc98e..32331ffa6e4 100644 --- a/src/plugins/ikev2/ikev2.c +++ b/src/plugins/ikev2/ikev2.c @@ -3857,7 +3857,8 @@ ikev2_set_local_key (vlib_main_t * vm, u8 * file) static vnet_api_error_t ikev2_register_udp_port (ikev2_profile_t *p, u16 port) { - ipsec_register_udp_port (port); + ipsec_register_udp_port (port, 0 /* is_ip4 */); + ipsec_register_udp_port (port, 1 /* is_ip4 */); p->ipsec_over_udp_port = port; return 0; } @@ -3868,7 +3869,8 @@ ikev2_unregister_udp_port (ikev2_profile_t *p) if (p->ipsec_over_udp_port == IPSEC_UDP_PORT_NONE) return; - ipsec_unregister_udp_port (p->ipsec_over_udp_port); + ipsec_unregister_udp_port (p->ipsec_over_udp_port, 0 /* is_ip4 */); + ipsec_unregister_udp_port (p->ipsec_over_udp_port, 1 /* is_ip4 */); p->ipsec_over_udp_port = IPSEC_UDP_PORT_NONE; } diff --git a/src/plugins/linux-cp/lcp_interface.c b/src/plugins/linux-cp/lcp_interface.c index 82675903ec6..4ca7c0ca631 100644 --- a/src/plugins/linux-cp/lcp_interface.c +++ b/src/plugins/linux-cp/lcp_interface.c @@ -1192,6 +1192,8 @@ lcp_interface_init (vlib_main_t *vm) /* punt IKE */ vlib_punt_register (punt_hdl, ipsec_punt_reason[IPSEC_PUNT_IP4_SPI_UDP_0], "linux-cp-punt"); + vlib_punt_register (punt_hdl, ipsec_punt_reason[IPSEC_PUNT_IP6_SPI_UDP_0], + "linux-cp-punt"); /* punt all unknown ports */ udp_punt_unknown (vm, 0, 1); |