From 8189abd64a0871871fbae5a8e94753b99a2af2ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 10 Mar 2020 09:11:16 +0100 Subject: 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. --- thirdparty/mbedtls/include/mbedtls/config.h | 4 +++- thirdparty/mbedtls/patches/padlock.diff | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 thirdparty/mbedtls/patches/padlock.diff (limited to 'thirdparty/mbedtls') diff --git a/thirdparty/mbedtls/include/mbedtls/config.h b/thirdparty/mbedtls/include/mbedtls/config.h index 834cced87f..8d9c31a504 100644 --- a/thirdparty/mbedtls/include/mbedtls/config.h +++ b/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 diff --git a/thirdparty/mbedtls/patches/padlock.diff b/thirdparty/mbedtls/patches/padlock.diff new file mode 100644 index 0000000000..6ace48891c --- /dev/null +++ b/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 -- cgit v1.2.3