Merge pull request #16519 from Faless/mbedtls

Replace OpenSSL with mbedTLS

3 files changed, 5 insertions, 8 deletions

diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py
index 74d653634..7e6a1518e 100644
--- a/platform/javascript/detect.py
+++ b/platform/javascript/detect.py
@@ -28,11 +28,11 @@ def get_flags():
     return [
         ('tools', False),
         ('module_theora_enabled', False),
-        # Disabling the OpenSSL module noticeably reduces file size.
+        # Disabling the mbedtls module reduces file size.
         # The module has little use due to the limited networking functionality
         # in this platform. For the available networking methods, the browser
         # manages TLS.
-        ('module_openssl_enabled', False),
+        ('module_mbedtls_enabled', False),
     ]
 
 
diff --git a/platform/server/detect.py b/platform/server/detect.py
index 61b56ddef..bc615d3d0 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -67,9 +67,6 @@ def configure(env):
 
     # FIXME: Check for existence of the libs before parsing their flags with pkg-config
 
-    if not env['builtin_openssl']:
-        env.ParseConfig('pkg-config openssl --cflags --libs')
-
     if not env['builtin_libwebp']:
         env.ParseConfig('pkg-config libwebp --cflags --libs')
 
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 02bd7232c..c5ef82150 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -65,7 +65,6 @@ def get_flags():
     return [
         ('builtin_freetype', False),
         ('builtin_libpng', False),
-        ('builtin_openssl', False),
         ('builtin_zlib', False),
     ]
 
@@ -153,8 +152,9 @@ def configure(env):
 
     # FIXME: Check for existence of the libs before parsing their flags with pkg-config
 
-    if not env['builtin_openssl']:
-        env.ParseConfig('pkg-config openssl --cflags --libs')
+    if not env['builtin_mbedtls']:
+        # mbedTLS does not provide a pkgconfig config yet. See https://github.com/ARMmbed/mbedtls/issues/228
+        env.Append(LIBS=['mbedtls', 'mbedcrypto', 'mbedx509'])
 
     if not env['builtin_libwebp']:
         env.ParseConfig('pkg-config libwebp --cflags --libs')