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 [Security] Bump crypto libraries into release/1.20.x #22007

Merged

Conversation

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

Backport

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

🚨

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:
@sarahalsmiller
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: unable to process merge commit: "00427d214d9280f7dc42bac0af91e410a682de81", automatic backport requires rebase workflow

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


Description

Update crypto libraries

  • HOLDING OFF ON MERGING THIS

Testing & Reproduction steps

  • ci passes

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@github-actions github-actions bot added the pr/dependencies PR specifically updates dependencies of project label Dec 16, 2024
@sarahalsmiller sarahalsmiller force-pushed the backport/bump-crypto-ssh/allegedly-emerging-loon branch from 4bba79a to 04884bd Compare December 18, 2024 19:18
sarahalsmiller
sarahalsmiller previously approved these changes Dec 18, 2024
@sarahalsmiller sarahalsmiller marked this pull request as ready for review December 18, 2024 19:23
@sarahalsmiller sarahalsmiller requested a review from a team as a code owner December 18, 2024 19:23
@sarahalsmiller sarahalsmiller enabled auto-merge (squash) December 18, 2024 19:31
@sarahalsmiller sarahalsmiller force-pushed the backport/bump-crypto-ssh/allegedly-emerging-loon branch from 9a6f2f9 to 440b1dd Compare December 18, 2024 20:28
@sarahalsmiller sarahalsmiller requested review from a team as code owners December 18, 2024 20:28
@sarahalsmiller sarahalsmiller merged commit 3df3d08 into release/1.20.x Dec 18, 2024
93 checks passed
@sarahalsmiller sarahalsmiller deleted the backport/bump-crypto-ssh/allegedly-emerging-loon branch December 18, 2024 20:43
sarah-oloumi pushed a commit to SolaceDev/consul that referenced this pull request Jan 14, 2025
…hicorp#22007)

* backport of commit 61d6d77

* Merge branch 'bump-crypto-ssh' of github.com:hashicorp/consul into bump-crypto-ssh

* add changelog, suppress vulnerability that hasn't been fixed yet

---------

Co-authored-by: Sarah Alsmiller <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/dependencies PR specifically updates dependencies of project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants