浏览代码

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.
Rémi Verschelde 5 年之前
父节点
当前提交
8189abd64a
共有 3 个文件被更改,包括 19 次插入1 次删除
  1. 3 0
      thirdparty/README.md
  2. 3 1
      thirdparty/mbedtls/include/mbedtls/config.h
  3. 13 0
      thirdparty/mbedtls/patches/padlock.diff

+ 3 - 0
thirdparty/README.md

@@ -312,6 +312,9 @@ File extracted from upstream release tarball (`-apache.tgz` variant):
 - LICENSE and apache-2.0.txt files
 - Applied the patch in `thirdparty/mbedtls/patches/1453.diff` (PR 1453).
   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
   for light bundling with core.
 

+ 3 - 1
thirdparty/mbedtls/include/mbedtls/config.h

@@ -2542,7 +2542,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

+ 13 - 0
thirdparty/mbedtls/patches/padlock.diff

@@ -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