-
-
Notifications
You must be signed in to change notification settings - Fork 21.1k
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
mbedtls: Update to upstream version 2.16.5 #36823
Merged
Merged
Conversation
This file contains 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
Fixes https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2020-02 Drop patch to disable VIA padlock since we no longer use libwebsockets, so there's no conflict anymore.
akien-mga
added
enhancement
topic:thirdparty
cherrypick:3.1
cherrypick:3.x
Considered for cherry-picking into a future 3.x release
labels
Mar 5, 2020
Cherry-picked for 3.2.1. |
akien-mga
removed
the
cherrypick:3.x
Considered for cherry-picking into a future 3.x release
label
Mar 6, 2020
Cherry-picked for 3.1.3. |
akien-mga
added a commit
to akien-mga/godot
that referenced
this pull request
Mar 9, 2020
For some weird reason 'git apply' does not error out when it does nothing, so I missed that I did not apply the patch properly in godotengine#36823... This broke the UWP 32-bit x86 build.
akien-mga
added a commit
that referenced
this pull request
Mar 9, 2020
mbedtls: Re-apply upstream PR 1453 after #36823
Aaaand that turned out to be a mistake too, 32-bit Linux and macOS builds are failing now with
So apparently it was not (just) libwebsockets that caused a conflict. |
akien-mga
added a commit
to akien-mga/godot
that referenced
this pull request
Mar 10, 2020
The comment mentioned a conflict with libwebsockets, but we actually still get this conflict even now that we don't use libwebsockets. Not sure what component is clashing but we should basically just keep this patch. Follow-up to godotengine#36823.
akien-mga
added a commit
that referenced
this pull request
Mar 10, 2020
The comment mentioned a conflict with libwebsockets, but we actually still get this conflict even now that we don't use libwebsockets. Not sure what component is clashing but we should basically just keep this patch. Follow-up to #36823. (cherry picked from commit 8189abd) Note: For the 3.1 branch, only modifies the README.md a bit as I had kept the patch removed in master/3.2.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2020-02
Drop patch to disable VIA padlock since we no longer use libwebsockets,
so there's no conflict anymore.
Note to self: Don't drop the VIA padlock patch when cherry-picking for
3.1
, as we still use libwebsockets there.