Skip to content

Commit 6526a10

Browse files
Add ms_tls13kdf buildtag for FIPS builds (#8092) (#8139)
Add ms_tls13kdf buildtag for FIPS builds (cherry picked from commit c2ecbaf) Co-authored-by: Michel Laterman <[email protected]>
1 parent 4af6c2c commit 6526a10

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

dev-tools/mage/gotest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func makeGoTestArgsForModule(name, module string) GoTestArgs {
8686
func testTagsFromEnv() []string {
8787
tags := strings.Split(strings.Trim(os.Getenv("TEST_TAGS"), ", "), ",")
8888
if FIPSBuild {
89-
tags = append(tags, "requirefips")
89+
tags = append(tags, "requirefips", "ms_tls13kdf")
9090
}
9191
return tags
9292
}

dev-tools/packaging/packages.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ settings:
4242
GOEXPERIMENT: systemcrypto
4343
tags:
4444
- requirefips
45+
- ms_tls13kdf
4546
platforms:
4647
- *linux-amd64
4748
- *linux-arm64

dev-tools/packaging/testing/package_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,7 @@ func checkFIPS(t *testing.T, agentPackageRootDir string) {
712712
case "-tags":
713713
foundTags = true
714714
require.Contains(t, setting.Value, "requirefips")
715+
require.Contains(t, setting.Value, "ms_tls13kdf")
715716
continue
716717
case "GOEXPERIMENT":
717718
foundExperiment = true

magefile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ func (Build) WindowsArchiveRootBinary() error {
335335
if devtools.FIPSBuild {
336336
// there is no actual FIPS relevance for this particular binary
337337
// but better safe than sorry
338-
args.ExtraFlags = append(args.ExtraFlags, "-tags=requirefips")
338+
args.ExtraFlags = append(args.ExtraFlags, "-tags=requirefips,ms_tls13kdf")
339339
args.CGO = true
340340
}
341341

0 commit comments

Comments
 (0)