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.28.2 #70395

Merged
merged 1 commit into from
Dec 21, 2022

Conversation

akien-mga
Copy link
Member

No description provided.

@akien-mga akien-mga added bug topic:thirdparty cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release labels Dec 21, 2022
@akien-mga akien-mga added this to the 4.0 milestone Dec 21, 2022
@akien-mga akien-mga requested a review from a team as a code owner December 21, 2022 11:07
Comment on lines +10 to +11
+// -- GODOT start --
+#if !defined(HAVE_HARDCLOCK) && defined(_WIN32) && \
Copy link
Member Author

@akien-mga akien-mga Dec 21, 2022

Choose a reason for hiding this comment

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

@bruvzg We need to PR that change upstream so we don't have to keep applying a patch here.

I'm not sure this would be the right/sufficient fix but if not, opening an issue upstream with the build error you encounter on MSVC arm64 would be good.

Copy link
Member

@bruvzg bruvzg Dec 21, 2022

Choose a reason for hiding this comment

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

Should be already fixed by Mbed-TLS/mbedtls#4640

Copy link
Member Author

Choose a reason for hiding this comment

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

That's weird because that PR was backported to 2.28 in April, so it should have been included in our build at the time you wrote this patch.

@akien-mga akien-mga merged commit 27b637c into godotengine:master Dec 21, 2022
@akien-mga akien-mga deleted the mbedtls-2.28.2 branch December 21, 2022 17:39
@akien-mga
Copy link
Member Author

Cherry-picked for 3.6.

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

Cherry-picked for 3.5.2.

@akien-mga akien-mga removed the cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release label Dec 22, 2022
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.

2 participants