Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 1, 2025

This PR bumps up the Golang version to 1.25.1. It also:

  • removes the ms_tls13kdf Golang build tag when building in FIPS mode because this tag was only needed with Golang versions 1.24.x.
  • sets ths GODEBUG=tlsmlkem=0 environment variable when running FIPS140-only unit tests. This prevents errors like so: Failed to connect: crypto/ecdh: use of X25519 is not allowed in FIPS 140-only mode.
    This is an automatic backport of pull request Bump Go version to 1.25.1 #5562 done by Mergify.

@mergify mergify bot requested a review from a team as a code owner October 1, 2025 13:46
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 1, 2025
@mergify mergify bot requested review from kaanyalti and swiatekm October 1, 2025 13:46
@mergify
Copy link
Contributor Author

mergify bot commented Oct 1, 2025

Cherry-pick of 15b8c8a has failed:

On branch mergify/bp/9.0/pr-5562
Your branch is up to date with 'origin/9.0'.

You are currently cherry-picking commit 15b8c8a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .go-version
	modified:   .golangci.yml
	new file:   changelog/fragments/1758819869-bump-golang-1.25.1.yaml
	modified:   dev-tools/go.mod
	modified:   go.mod
	modified:   testing/go.mod

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/golangci-lint.yml
	deleted by us:   docs/fips.md
	both modified:   magefile.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Oct 1, 2025
@prodsecmachine
Copy link

prodsecmachine commented Oct 1, 2025

🎉 Snyk checks have passed. No issues have been found so far.

security/snyk check is complete. No issues have been found. (View Details)

license/snyk check is complete. No issues have been found. (View Details)

@github-actions
Copy link
Contributor

github-actions bot commented Oct 1, 2025

🔍 Preview links for changed docs

ycombinator
ycombinator previously approved these changes Oct 1, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Oct 1, 2025

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/9.0/pr-5562 upstream/mergify/bp/9.0/pr-5562
git merge upstream/9.0
git push upstream mergify/bp/9.0/pr-5562

@ycombinator ycombinator force-pushed the mergify/bp/9.0/pr-5562 branch from 1192645 to be3596b Compare October 1, 2025 16:50
ycombinator
ycombinator previously approved these changes Oct 1, 2025
* Bump Go version to 1.25.1

* Update CHANGELOG entry

* Bump the version of golangci-lint

* Remove references to the ms_tls13kdf build tag

* Download go module dependencies before GODEBUG=fips140=only is set

* Exclude X25519 curve types when testing in FIPS-140 mode

* Stricter check

* Add missing license header

* Exclude X25519 curve types when testing in FIPS-140-only mode

* Use stricter check

* Update NOTICE files

* Remove IsFIPS140Only helper function

* Set GODEBUG=tlsmlkem=0 for FIPS140-only unit tests

* Remove replace directive from go.mod

* Try not pre-downloading dependencies

(cherry picked from commit 15b8c8a)
@ycombinator ycombinator force-pushed the mergify/bp/9.0/pr-5562 branch from be3596b to d7a8eed Compare October 1, 2025 18:52
@ycombinator ycombinator merged commit 9182e07 into 9.0 Oct 2, 2025
11 checks passed
@ycombinator ycombinator deleted the mergify/bp/9.0/pr-5562 branch October 2, 2025 18:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants