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 version 2.28.5 #83721

Merged
merged 1 commit into from
Oct 21, 2023
Merged

Conversation

Faless
Copy link
Collaborator

@Faless Faless commented Oct 21, 2023

Reapplied the patch in thirdparty/mbedtls/patches/windows-arm64-hardclock.diff, removed the patch thirdparty/mbedtls/patches/aesni-no-arm-intrinsics.patch as it's no longer needed (see Mbed-TLS/mbedtls#8168)

See https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-2.28.5 for release notes (the security advisory does not affect Godot anyway since the proper flags were already in place, see here for details).

@akien-mga
Copy link
Member

Our patch aesni-no-arm-intrinsics.patch shouldn't be needed anymore (and thus can be reversed), they fixed the bug properly in aesni.h from what I can see. For context: Mbed-TLS/mbedtls#8168

@akien-mga akien-mga added 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 cherrypick:4.0 cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release labels Oct 21, 2023
@Faless
Copy link
Collaborator Author

Faless commented Oct 21, 2023

Thanks, reverted the patch, and removed it from tree.

@akien-mga akien-mga merged commit f71f4b8 into godotengine:master Oct 21, 2023
15 checks passed
@akien-mga
Copy link
Member

Thanks!

@Faless Faless deleted the mbedtls/2.18.5 branch October 21, 2023 16:19
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.3.

@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Oct 24, 2023
@akien-mga
Copy link
Member

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 Oct 30, 2023
@akien-mga akien-mga changed the title mbedTLS: Update to version 2.18.5 mbedTLS: Update to version 2.28.5 Nov 29, 2023
@akien-mga akien-mga changed the title mbedTLS: Update to version 2.28.5 mbedtls: Update to version 2.28.5 Nov 29, 2023
@akien-mga
Copy link
Member

Cherry-picked for 3.5.4.

@akien-mga akien-mga removed the cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release label Jan 30, 2024
@akien-mga akien-mga added cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release and removed cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release labels Mar 9, 2024
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.

3 participants