Skip to content

[v12] Bump golang.org/x/net Backport #33448

Merged
jentfoo merged 12 commits intobranch/v12from
jent/http2_updates-v12
Oct 13, 2023
Merged

[v12] Bump golang.org/x/net Backport #33448
jentfoo merged 12 commits intobranch/v12from
jent/http2_updates-v12

Conversation

@jentfoo
Copy link
Copy Markdown
Contributor

@jentfoo jentfoo commented Oct 13, 2023

v12 backport similar to #33420 to address the HTTP/2 Rapid Reset DoS GHSA-2wrh-6pvc-2jm9.

I had planned to backport the merge commit from #33420. However the conflicts made that more complicated, so this was built using dependabot on our new release branch mirror.

I also needed to backport the crypto fork replacement removal from: #28929

dependabot Bot and others added 11 commits October 13, 2023 06:48
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.7.0 to 0.17.0.
- [Commits](golang/net@v0.7.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20220127200216-cd36cc0744dd to 0.17.0.
- [Commits](https://github.com/golang/net/commits/v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.10.0 to 0.17.0.
- [Commits](golang/net@v0.10.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20220127200216-cd36cc0744dd to 0.17.0.
- [Commits](https://github.com/golang/net/commits/v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.7.0 to 0.17.0.
- [Commits](golang/net@v0.7.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.14.0 to 0.17.0.
- [Commits](golang/net@v0.14.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.8.0 to 0.17.0.
- [Commits](golang/net@v0.8.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.8.0 to 0.17.0.
- [Commits](golang/net@v0.8.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.14.0 to 0.17.0.
- [Commits](golang/net@v0.14.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.8.0 to 0.17.0.
- [Commits](golang/net@v0.8.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
* Bump /x/crypto to v0.14.0

* Force ssh.MultiAlgorithmSigner to SHA-512
@rosstimothy
Copy link
Copy Markdown
Contributor

What are we going to do about grpc-go on branch/v12?

@jentfoo jentfoo added go Issues related to Go builds/tooling dependencies Pull requests that update a dependency file labels Oct 13, 2023
* Switch to upstream x/crypto

Removed the dependency override for golang.org/x/crypto and updated the specific version used latest in go.mod. This change is needed because the specific issue with OpenSSH <= 7.6 that necessitated the override has been addressed upstream, making the override unnecessary.

* Update config test to align with newer encryption standards

Commit updates the config test to include more encryption standards, thus maintaining compatibility with a wider range of environments. "ElementsMatch" is now used to ensure the presence of cipher keys, irrespective of their order in the list. This makes the tests more resilient against future changes and amendments in encryption standards.
@jentfoo jentfoo requested a review from jakule October 13, 2023 13:49
Merged via the queue into branch/v12 with commit d84852a Oct 13, 2023
@jentfoo jentfoo deleted the jent/http2_updates-v12 branch October 13, 2023 14:37
This was referenced Oct 18, 2023
@jentfoo jentfoo added the no-changelog Indicates that a PR does not require a changelog entry label Oct 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport dependencies Pull requests that update a dependency file go Issues related to Go builds/tooling no-changelog Indicates that a PR does not require a changelog entry size/sm ui

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants