Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev-tools/mage/gotest.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
}

func makeGoTestArgs(name string) GoTestArgs {
fileName := fmt.Sprintf("build/TEST-go-%s", strings.Replace(strings.ToLower(name), " ", "_", -1))

Check failure on line 49 in dev-tools/mage/gotest.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest)

QF1004: could use strings.ReplaceAll instead (staticcheck)
params := GoTestArgs{
LogName: name,
Race: RaceDetector,
Expand All @@ -64,8 +64,8 @@

func makeGoTestArgsForModule(name, module string) GoTestArgs {
fileName := fmt.Sprintf("build/TEST-go-%s-%s",
strings.Replace(strings.ToLower(name), " ", "_", -1),

Check failure on line 67 in dev-tools/mage/gotest.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest)

QF1004: could use strings.ReplaceAll instead (staticcheck)
strings.Replace(strings.ToLower(module), " ", "_", -1),

Check failure on line 68 in dev-tools/mage/gotest.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest)

QF1004: could use strings.ReplaceAll instead (staticcheck)
)
params := GoTestArgs{
LogName: fmt.Sprintf("%s-%s", name, module),
Expand All @@ -86,7 +86,7 @@
func testTagsFromEnv() []string {
tags := strings.Split(strings.Trim(os.Getenv("TEST_TAGS"), ", "), ",")
if FIPSBuild {
tags = append(tags, "requirefips")
tags = append(tags, "requirefips", "ms_tls13kdf")
}
return tags
}
Expand Down
1 change: 1 addition & 0 deletions dev-tools/packaging/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ settings:
GOEXPERIMENT: systemcrypto
tags:
- requirefips
- ms_tls13kdf
platforms:
- *linux-amd64
- *linux-arm64
Expand Down
1 change: 1 addition & 0 deletions dev-tools/packaging/testing/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@
return "", errors.New("version label not found")
}

parts := strings.SplitN(file, "/", -1)

Check failure on line 453 in dev-tools/packaging/testing/package_test.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest)

QF1004: could use strings.Split instead (staticcheck)
if len(parts) == 0 {
return "", errors.New("failed to get file name parts")
}
Expand Down Expand Up @@ -808,6 +808,7 @@
case "-tags":
foundTags = true
require.Contains(t, setting.Value, "requirefips")
require.Contains(t, setting.Value, "ms_tls13kdf")
continue
case "GOEXPERIMENT":
foundExperiment = true
Expand Down
2 changes: 1 addition & 1 deletion magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ func (Build) WindowsArchiveRootBinary() error {
if devtools.FIPSBuild {
// there is no actual FIPS relevance for this particular binary
// but better safe than sorry
args.ExtraFlags = append(args.ExtraFlags, "-tags=requirefips")
args.ExtraFlags = append(args.ExtraFlags, "-tags=requirefips,ms_tls13kdf")
args.CGO = true
}

Expand Down
Loading