Skip to content
Permalink
Browse files

Merge pull request #26154 from hpvb/disable-via-padlock

Disable support for VIA Padlock
  • Loading branch information...
hpvb committed Feb 24, 2019
2 parents bfa9be8 + e33e0a5 commit e30ce69cb44cd31933dc81700d16db2c80727015
Showing with 17 additions and 1 deletion.
  1. +1 −0 thirdparty/README.md
  2. +3 −1 thirdparty/mbedtls/include/mbedtls/config.h
  3. +13 −0 thirdparty/mbedtls/padlock.diff
@@ -287,6 +287,7 @@ File extracted from upstream release tarball `mbedtls-2.16.0-apache.tgz`:
- All `*.h` from `include/mbedtls/` to `thirdparty/mbedtls/include/mbedtls/`
- All `*.c` from `library/` to `thirdparty/mbedtls/library/`
- Applied the patch in `thirdparty/mbedtls/1453.diff` (PR 1453). Soon to be merged upstream. Check it out at next update.
- Applied the patch in `thirdparty/mbedtls/padlock.diff`. This disables VIA padlock support which defines a symbol `unsupported` which clashses with a symbol in libwebsockets.

## miniupnpc

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

0 comments on commit e30ce69

Please sign in to comment.
You can’t perform that action at this time.