Skip to content

Conversation

@dagood
Copy link
Member

@dagood dagood commented Jan 21, 2026

Automatic merge. Upstream code freeze (ending just about now) should limit diverging changes.

Tiny merge conflicts:

dagood and others added 30 commits January 7, 2026 16:27
Update submodule to latest `master` in `microsoft/main`
FIPS readme: add no-crypto note, clarify linking
#2035)

Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.39.0 to 0.40.0.
- [Commits](golang/sys@v0.39.0...v0.40.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-version: 0.40.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…cache action's dependencies to build vet config
Update submodule to latest `master` in `microsoft/main`
Align TLS 1.2 cipher suites with the Microsoft policy
Don't require system fips mode on Windows
Update submodule to latest `master` in `microsoft/main`
Fallback to Go crypto when RSA key size is not supported
#2042)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.48.0 to 0.49.0.
- [Commits](golang/net@v0.48.0...v0.49.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-version: 0.49.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.9 to 4.31.10.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@5d4e8d1...cdefb33)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@4dc6199...7a3fe6c)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-version: 6.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Fix recover from boringPRFError panic
…test: add ML-DSA to FIPS 140-3 functional tests
Update submodule to latest `master` in `microsoft/main`
Skip DSA TestSignAndVerify on FIPS mode
qmuntal and others added 20 commits January 15, 2026 10:14
SkipTestKeysFromPreMasterSecret when running on FIPS mode
* Match updatecryptodocs with doc changes, improve editability, self-test

* Fix typo, update note about cgo-less experiment

* Fix CRLF-checkout line ending comparison
…2062)

* remove rogue stub file and rename patches to keep consistent casing

* rename files
* CI: enable native macos arm64 testing

* switch to native build

* try pinning to macos 15
…ternal/types2: better diagnostic for type shadowing
Update submodule to latest `master` in `microsoft/main`
Update submodule to latest `master` in `microsoft/main`
@dagood dagood requested a review from a team as a code owner January 21, 2026 18:03
@dagood dagood enabled auto-merge January 21, 2026 18:04
@dagood dagood merged commit 6f14032 into microsoft/release-branch.go1.26 Jan 21, 2026
43 checks passed
@dagood dagood deleted the dev/dagood/merge-1.26 branch January 21, 2026 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants