[v13]: Update gravitational/protobuf fork tag (#26373)#26488
Merged
jentfoo merged 1 commit intobranch/v13from May 18, 2023
Merged
[v13]: Update gravitational/protobuf fork tag (#26373)#26488jentfoo merged 1 commit intobranch/v13from
gravitational/protobuf fork tag (#26373)#26488jentfoo merged 1 commit intobranch/v13from
Conversation
* Update `gravitational/protobuf` fork tag Previously we were not referencing a tag, instead we were referenced to a commit on this branch: https://github.com/gravitational/protobuf/tree/dmitri/merge-values Previously versioned `1.3.2` it was thought that this branch contained the fix for `Skippy Peanut Butter` CVE: https://nvd.nist.gov/vuln/detail/CVE-2021-3121 However that was not the case, so the following was performed: * A `teleport` branch was created on `protobuf` from the upstream v1.3.2 tag * Our custom commits were cherry-picked in (the Clone Merger functionality added, codeql config, and dependency-review config) * It was pushed as tag `v1.3.2-1` to our fork (as seen in this change) * Update protobuf tag to v1.3.2-teleport.1
jentfoo
added
security
jentfoo
requested review from
codingllama,
espadolini,
r0mant,
strideynet,
wadells and
zmb3
codingllama
approved these changes
May 17, 2023
espadolini
approved these changes
May 18, 2023
public-teleport-github-review-bot
Bot
removed request for
r0mant,
strideynet,
wadells and
zmb3
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of PR: #26373 to address CVE: https://nvd.nist.gov/vuln/detail/CVE-2021-3121