Skip to content

Conversation

pchaigno
Copy link
Member

Two small bits of unrelated refactoring around the key loading (with new unit test) and the XFRM state creation. There should be no functional changes.

@pchaigno pchaigno added kind/cleanup This includes no functional changes. area/encryption Impacts encryption support such as IPSec, WireGuard, or kTLS. release-note/misc This PR makes changes that have no direct user impact. needs-backport/1.12 labels Nov 23, 2023
@pchaigno pchaigno requested a review from rgo3 November 24, 2023 10:00
@pchaigno pchaigno marked this pull request as ready for review November 24, 2023 10:00
@pchaigno pchaigno requested a review from a team as a code owner November 24, 2023 10:00
@pchaigno pchaigno requested a review from gentoo-root November 24, 2023 10:00
Copy link
Contributor

@rgo3 rgo3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just non-blocking nits.

Copy link
Contributor

@gentoo-root gentoo-root left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with Robin's nits.

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Nov 24, 2023
The SPI parsing logic is fairly complex so let's move it to its own
function and write a unit test for that.

Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com>
ipSecJoinState is never called without ipSecNewState and vice versa. So
let's just merge both to have all XFRM state initialization in the same
place.

Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com>
@pchaigno pchaigno force-pushed the small-ipsec-refactoring branch from a07aaba to 7770ec4 Compare November 27, 2023 12:40
@pchaigno pchaigno enabled auto-merge November 27, 2023 12:40
@pchaigno
Copy link
Member Author

/test

@pchaigno pchaigno removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Nov 27, 2023
@pchaigno pchaigno added this pull request to the merge queue Nov 27, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Nov 27, 2023
Merged via the queue into cilium:main with commit ba3fa89 Nov 27, 2023
@pchaigno pchaigno deleted the small-ipsec-refactoring branch November 27, 2023 13:53
@joamaki joamaki mentioned this pull request Nov 29, 2023
4 tasks
@joamaki joamaki mentioned this pull request Nov 29, 2023
4 tasks
@joamaki joamaki mentioned this pull request Nov 29, 2023
14 tasks
@joamaki joamaki added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 labels Nov 29, 2023
@github-actions github-actions bot added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. backport-pending/1.12 labels Dec 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/encryption Impacts encryption support such as IPSec, WireGuard, or kTLS. backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. kind/cleanup This includes no functional changes. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
Status: Released
Status: Released
Status: Released
Development

Successfully merging this pull request may close these issues.

4 participants