Skip to content

Add ms_tls13kdf buildtag for FIPS builds#8092

Merged
michel-laterman merged 6 commits into
elastic:mainfrom
michel-laterman:add-ms_tls13kdf
May 10, 2025
Merged

Add ms_tls13kdf buildtag for FIPS builds#8092
michel-laterman merged 6 commits into
elastic:mainfrom
michel-laterman:add-ms_tls13kdf

Conversation

@michel-laterman
Copy link
Copy Markdown
Contributor

What does this PR do?

Add the ms_tls13kdf build tag to FIPS builds.

Why is it important?

microsoft/go TLSv1.3 kdf support (microsoft/go#1662) requires the ms_tls13kdf build tag.

@michel-laterman michel-laterman requested a review from a team as a code owner May 6, 2025 15:39
@michel-laterman michel-laterman added technical debt backport-8.19 Automated backport to the 8.19 branch labels May 6, 2025
@michel-laterman michel-laterman added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels May 6, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@pchila
Copy link
Copy Markdown
Member

pchila commented May 6, 2025

Shouldn't the tag ms_tls13kdf be used for building the elastic-agent binary ? I don't think I saw that in the diff

nicholasberlin
nicholasberlin previously approved these changes May 6, 2025
Copy link
Copy Markdown

@nicholasberlin nicholasberlin left a comment

Choose a reason for hiding this comment

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

LGTM FWIW

Copy link
Copy Markdown
Contributor

@ycombinator ycombinator left a comment

Choose a reason for hiding this comment

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

Should we also check for ms_tls13kdf around here?

require.Contains(t, setting.Value, "requirefips")

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 8, 2025

@elastic-sonarqube
Copy link
Copy Markdown

@michel-laterman michel-laterman merged commit c2ecbaf into elastic:main May 10, 2025
9 of 12 checks passed
@michel-laterman michel-laterman deleted the add-ms_tls13kdf branch May 10, 2025 01:41
mergify Bot pushed a commit that referenced this pull request May 10, 2025
Add ms_tls13kdf buildtag for FIPS builds

(cherry picked from commit c2ecbaf)
michel-laterman added a commit that referenced this pull request May 12, 2025
Add ms_tls13kdf buildtag for FIPS builds

(cherry picked from commit c2ecbaf)

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
@cmacknz
Copy link
Copy Markdown
Member

cmacknz commented May 26, 2025

This new tag has no effect on the generation of the FIPS notice file because there are no packages whose inclusion are conditional on the use of this tag? Correct?

if err := generateNotice(notice.FIPSNoticeFilename, "requirefips"); err != nil {
return fmt.Errorf("failed to generate %s: %w", notice.FIPSNoticeFilename, err)

We are only filtering on requirefips, just double checking adding another tag to the FIPS build doesn't affect the FIPS notice file.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.19 Automated backport to the 8.19 branch skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team technical debt

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants