From 84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7 Mon Sep 17 00:00:00 2001
From: peterbell10 <peterbell10@live.co.uk>
Date: Wed, 30 Aug 2017 15:00:06 +0100
Subject: Update mbedtls to 2.5.1 (#3964)

* Renaming changes:
  * macro prefix "POLARSSL" -> "MBEDTLS"
  * functions now prefixed with "mbedtls_"
  * rename PolarSSL++ -> mbedTLS++
  * rename polarssl submodule

* Use mbedtls' AES-CFB8 implementation.

* Add cSslConfig to wrap mbedtls_ssl_config

* Update cTCPLink and cBlockingSslClientSocket to use cSslConfig

* Use cSslConfig in cHTTPServer

* Use cSslConfig for cMojangAPI::SecureRequest

* CI Fixes

* Set -fomit-frame-pointer on the right target
---
 lib/mbedtls        |  1 +
 lib/mbedtls.cmake  | 10 ++++++++++
 lib/polarssl       |  1 -
 lib/polarssl.cmake | 10 ----------
 4 files changed, 11 insertions(+), 11 deletions(-)
 create mode 160000 lib/mbedtls
 create mode 100644 lib/mbedtls.cmake
 delete mode 160000 lib/polarssl
 delete mode 100644 lib/polarssl.cmake

(limited to 'lib')

diff --git a/lib/mbedtls b/lib/mbedtls
new file mode 160000
index 000000000..f2a597fa3
--- /dev/null
+++ b/lib/mbedtls
@@ -0,0 +1 @@
+Subproject commit f2a597fa3dd1c7b15e0fee62f6932b253295803d
diff --git a/lib/mbedtls.cmake b/lib/mbedtls.cmake
new file mode 100644
index 000000000..c33ed8959
--- /dev/null
+++ b/lib/mbedtls.cmake
@@ -0,0 +1,10 @@
+
+# This script includes PolarSSL, if not already included.
+# It is needed for when multiple projects reference PolarSSL.
+
+if(NOT TARGET mbedtls)
+	message("including mbedtls")
+	set(ENABLE_TESTING OFF CACHE BOOL "Disable tests")
+	set(ENABLE_PROGRAMS OFF CACHE BOOL "Disable programs")
+	add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/mbedtls/ ${CMAKE_CURRENT_BINARY_DIR}/lib/mbedtls EXCLUDE_FROM_ALL)
+endif()
diff --git a/lib/polarssl b/lib/polarssl
deleted file mode 160000
index 4f4c5b745..000000000
--- a/lib/polarssl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4f4c5b7450631e46a94cb89adf4a7737fbb178bc
diff --git a/lib/polarssl.cmake b/lib/polarssl.cmake
deleted file mode 100644
index 3506d0fb4..000000000
--- a/lib/polarssl.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# This script includes PolarSSL, if not already included.
-# It is needed for when multiple projects reference PolarSSL.
-
-if(NOT TARGET mbedtls)
-	message("including polarssl")
-	set(ENABLE_TESTING OFF CACHE BOOL "Disable tests")
-	set(ENABLE_PROGRAMS OFF CACHE BOOL "Disable programs")
-	add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/polarssl/ ${CMAKE_CURRENT_BINARY_DIR}/lib/polarssl EXCLUDE_FROM_ALL)
-endif()
-- 
cgit v1.2.3