Skip to content

Commit 3cf8154

Browse files
Add ms_tls13kdf tag when requirefips is passed (#44227) (#44279)
Add ms_tls13kdf tag when requirefips is passed (cherry picked from commit fff4a78) Co-authored-by: Michel Laterman <[email protected]>
1 parent 21788fe commit 3cf8154

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

dev-tools/mage/fips-settings.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ compile:
1010
GOEXPERIMENT: systemcrypto
1111
tags:
1212
- requirefips
13+
- ms_tls13kdf
1314
platforms:
1415
# If the platform list changes, update the platforms for FIPS packaging in CI pipelines '.buildkite/**/pipeline.<beat>.yml' and '.buildkite/packaging-pipeline.yml'
1516
- linux/amd64

dev-tools/mage/gotest.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ func fetchGoPackages(module string) ([]string, error) {
124124

125125
// testTagsFromEnv gets a list of comma-separated tags from the TEST_TAGS
126126
// environment variables, e.g: TEST_TAGS=aws,azure.
127-
// If the FIPS env var is set to true, the requirefips tag is injected.
127+
// If the FIPS env var is set to true, the requirefips and ms_tls13kdf tags are injected.
128128
func testTagsFromEnv() []string {
129129
tags := strings.Split(strings.Trim(os.Getenv("TEST_TAGS"), ", "), ",")
130130
if FIPSBuild {
131-
tags = append(tags, "requirefips")
131+
tags = append(tags, "requirefips", "ms_tls13kdf")
132132
}
133133
return tags
134134
}

dev-tools/packaging/package_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,7 @@ func checkFIPS(t *testing.T, beatName, path string) {
833833
case "-tags":
834834
foundTags = true
835835
require.Contains(t, setting.Value, "requirefips")
836+
require.Contains(t, setting.Value, "ms_tls13kdf")
836837
continue
837838
case "GOEXPERIMENT":
838839
foundExperiment = true

0 commit comments

Comments
 (0)