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

mbedtls: Update to upstream version 2.16.5 #36823

Merged
merged 1 commit into from
Mar 5, 2020

Conversation

akien-mga
Copy link
Member

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.

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 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
@akien-mga akien-mga added this to the 4.0 milestone Mar 5, 2020
@akien-mga akien-mga requested a review from Faless March 5, 2020 15:15
@akien-mga akien-mga merged commit da05ca6 into godotengine:master Mar 5, 2020
@akien-mga akien-mga deleted the mbedtls-2.16.5 branch March 5, 2020 21:41
@akien-mga
Copy link
Member Author

Cherry-picked for 3.2.1.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Mar 6, 2020
@akien-mga
Copy link
Member Author

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
akien-mga added a commit 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 #36823...

This broke the UWP 32-bit x86 build.

(cherry picked from commit 9a72771)
@akien-mga
Copy link
Member Author

Drop patch to disable VIA padlock since we no longer use libwebsockets,
so there's no conflict anymore.

Aaaand that turned out to be a mistake too, 32-bit Linux and macOS builds are failing now with

thirdparty/mbedtls/library/padlock.c: Assembler messages:
thirdparty/mbedtls/library/padlock.c:64: Error: symbol `unsupported' is already defined

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)
akien-mga added a commit that referenced this pull request Mar 10, 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 #36823...

This broke the UWP 32-bit x86 build.

(cherry picked from commit 9a72771)
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant