Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of [NET-7009] security: update x/crypto to 0.17.0 into release/1.3.x #3448

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #3442 to be assessed for backporting due to the inclusion of the label backport/1.3.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


This addresses CVE-2023-48795 (x/crypto/ssh).

How I've tested this PR

CI

How I expect reviewers to test this PR

👀

Checklist


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Jan 5, 2024

CLA assistant check
All committers have signed the CLA.

@zalimeni zalimeni force-pushed the backport/zalimeni/net-7009-bump-x-crypto/duly-intent-chow branch from c046c58 to 6dac458 Compare January 8, 2024 14:41
@zalimeni zalimeni marked this pull request as ready for review January 8, 2024 15:24
@zalimeni zalimeni merged commit 3b6189a into release/1.3.x Jan 8, 2024
31 of 48 checks passed
@zalimeni zalimeni deleted the backport/zalimeni/net-7009-bump-x-crypto/duly-intent-chow branch January 8, 2024 15:25
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.

3 participants