mbedtls: Re-add patch to disable VIA padlock

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 8189abd64a)
This commit is contained in:
Rémi Verschelde 2020-03-10 09:11:16 +01:00
parent 268cbfbad6
commit efc0a5a481
3 changed files with 19 additions and 1 deletions

View file

@ -274,6 +274,9 @@ File extracted from upstream release tarball (`-apache.tgz` variant):
- LICENSE and apache-2.0.txt files - LICENSE and apache-2.0.txt files
- Applied the patch in `thirdparty/mbedtls/patches/1453.diff` (PR 1453). - Applied the patch in `thirdparty/mbedtls/patches/1453.diff` (PR 1453).
Soon to be merged upstream. Check it out at next update. Soon to be merged upstream. Check it out at next update.
- Applied the patch in `thirdparty/mbedtls/patches/padlock.diff`. This disables
VIA padlock support which defines a symbol `unsupported` which clashes with
a pre-defined symbol.
- Added 2 files `godot_core_mbedtls_platform.{c,h}` providing configuration - Added 2 files `godot_core_mbedtls_platform.{c,h}` providing configuration
for light bundling with core. for light bundling with core.

View file

@ -2542,7 +2542,9 @@
* *
* This modules adds support for the VIA PadLock on x86. * This modules adds support for the VIA PadLock on x86.
*/ */
#define MBEDTLS_PADLOCK_C // -- GODOT start --
// #define MBEDTLS_PADLOCK_C
// -- GODOT end --
/** /**
* \def MBEDTLS_PEM_PARSE_C * \def MBEDTLS_PEM_PARSE_C

13
thirdparty/mbedtls/patches/padlock.diff vendored Normal file
View file

@ -0,0 +1,13 @@
--- a/thirdparty/mbedtls/include/mbedtls/config.h
+++ b/thirdparty/mbedtls/include/mbedtls/config.h
@@ -2477,7 +2477,9 @@
*
* This modules adds support for the VIA PadLock on x86.
*/
-#define MBEDTLS_PADLOCK_C
+// -- GODOT start --
+// #define MBEDTLS_PADLOCK_C
+// -- GODOT end --
/**
* \def MBEDTLS_PEM_PARSE_C