Skip to content

Switch to upstream x/crypto#28929

Merged
jakule merged 2 commits intomasterfrom
jakule/ditch-crypto-fork
Jul 24, 2023
Merged

Switch to upstream x/crypto#28929
jakule merged 2 commits intomasterfrom
jakule/ditch-crypto-fork

Conversation

@jakule
Copy link
Copy Markdown
Contributor

@jakule jakule commented Jul 11, 2023

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.

Related upstream change: golang/crypto@64e0e99

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.
@jakule jakule force-pushed the jakule/ditch-crypto-fork branch from 9ad06da to 6157567 Compare July 20, 2023 20:48
@jakule jakule marked this pull request as ready for review July 20, 2023 20:48
@github-actions github-actions Bot requested review from hugoShaka and ryanclark July 20, 2023 20:49
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.
@jakule jakule added this pull request to the merge queue Jul 24, 2023
Merged via the queue into master with commit 482b841 Jul 24, 2023
@jakule jakule deleted the jakule/ditch-crypto-fork branch July 24, 2023 14:54
@public-teleport-github-review-bot
Copy link
Copy Markdown

@jakule See the table below for backport results.

Branch Result
branch/v11 Failed
branch/v12 Failed
branch/v13 Failed

jakule added a commit that referenced this pull request Jul 25, 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.
github-merge-queue Bot pushed a commit that referenced this pull request Jul 25, 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 pushed a commit that referenced this pull request 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.
github-merge-queue Bot pushed a commit that referenced this pull request Oct 13, 2023
* Bump golang.org/x/net from 0.7.0 to 0.17.0 in /web/.cloudbuild/scripts

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>

* Bump golang.org/x/net in /examples/workflows

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>

* Bump golang.org/x/net from 0.10.0 to 0.17.0 in /build.assets/tooling

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>

* Bump golang.org/x/net in /examples/go-client

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>

* Bump golang.org/x/net from 0.7.0 to 0.17.0 in /assets/backport

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>

* Bump golang.org/x/net from 0.14.0 to 0.17.0 in /api

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>

* Bump golang.org/x/net in /examples/service-discovery-api-client

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 golang.org/x/net from 0.8.0 to 0.17.0 in /examples/api-sync-roles

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 golang.org/x/net from 0.14.0 to 0.17.0

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>

* Bump golang.org/x/net in /examples/access-plugin-minimal

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>

* chore: Bump /x/crypto to v0.14.0 and fix changes (#33169)

* Bump /x/crypto to v0.14.0

* Force ssh.MultiAlgorithmSigner to SHA-512

* Switch to upstream x/crypto (#28929)

* 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.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alan Parra <alan.parra@goteleport.com>
Co-authored-by: Jakub Nyckowski <jakub.nyckowski@goteleport.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants