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
---
 tests/HTTP/CMakeLists.txt    |  4 ++--
 tests/Network/CMakeLists.txt | 26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'tests')

diff --git a/tests/HTTP/CMakeLists.txt b/tests/HTTP/CMakeLists.txt
index 5529ed082..32f95a339 100644
--- a/tests/HTTP/CMakeLists.txt
+++ b/tests/HTTP/CMakeLists.txt
@@ -1,8 +1,8 @@
-enable_testing()
+enable_testing()
 
 include_directories(${CMAKE_SOURCE_DIR}/src/)
 include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/libevent/include)
-include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/polarssl/include)
+include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/mbedtls/include)
 
 add_definitions(-DTEST_GLOBALS=1)
 
diff --git a/tests/Network/CMakeLists.txt b/tests/Network/CMakeLists.txt
index 617e3ccc9..60c40cdf4 100644
--- a/tests/Network/CMakeLists.txt
+++ b/tests/Network/CMakeLists.txt
@@ -1,8 +1,8 @@
-enable_testing()
+enable_testing()
 
 include_directories(${CMAKE_SOURCE_DIR}/src/)
 include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/libevent/include)
-include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/polarssl/include)
+include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/mbedtls/include)
 
 add_definitions(-DTEST_GLOBALS=1)
 
@@ -18,11 +18,12 @@ set (Network_SRCS
 	${CMAKE_SOURCE_DIR}/src/OSSupport/NetworkSingleton.cpp
 	${CMAKE_SOURCE_DIR}/src/OSSupport/ServerHandleImpl.cpp
 	${CMAKE_SOURCE_DIR}/src/OSSupport/TCPLinkImpl.cpp
-	${CMAKE_SOURCE_DIR}/src/PolarSSL++/CtrDrbgContext.cpp
-	${CMAKE_SOURCE_DIR}/src/PolarSSL++/CryptoKey.cpp
-	${CMAKE_SOURCE_DIR}/src/PolarSSL++/EntropyContext.cpp
-	${CMAKE_SOURCE_DIR}/src/PolarSSL++/SslContext.cpp
-	${CMAKE_SOURCE_DIR}/src/PolarSSL++/X509Cert.cpp
+	${CMAKE_SOURCE_DIR}/src/mbedTLS++/CtrDrbgContext.cpp
+	${CMAKE_SOURCE_DIR}/src/mbedTLS++/CryptoKey.cpp
+	${CMAKE_SOURCE_DIR}/src/mbedTLS++/EntropyContext.cpp
+	${CMAKE_SOURCE_DIR}/src/mbedTLS++/SslConfig.cpp
+	${CMAKE_SOURCE_DIR}/src/mbedTLS++/SslContext.cpp
+	${CMAKE_SOURCE_DIR}/src/mbedTLS++/X509Cert.cpp
 	${CMAKE_SOURCE_DIR}/src/StringUtils.cpp
 )
 
@@ -39,11 +40,12 @@ set (Network_HDRS
 	${CMAKE_SOURCE_DIR}/src/OSSupport/ServerHandleImpl.h
 	${CMAKE_SOURCE_DIR}/src/OSSupport/TCPLinkImpl.h
 	${CMAKE_SOURCE_DIR}/src/OSSupport/Queue.h
-	${CMAKE_SOURCE_DIR}/src/PolarSSL++/CtrDrbgContext.h
-	${CMAKE_SOURCE_DIR}/src/PolarSSL++/CryptoKey.h
-	${CMAKE_SOURCE_DIR}/src/PolarSSL++/EntropyContext.h
-	${CMAKE_SOURCE_DIR}/src/PolarSSL++/SslContext.h
-	${CMAKE_SOURCE_DIR}/src/PolarSSL++/X509Cert.h
+	${CMAKE_SOURCE_DIR}/src/mbedTLS++/CtrDrbgContext.h
+	${CMAKE_SOURCE_DIR}/src/mbedTLS++/CryptoKey.h
+	${CMAKE_SOURCE_DIR}/src/mbedTLS++/EntropyContext.h
+	${CMAKE_SOURCE_DIR}/src/mbedTLS++/SslConfig.h
+	${CMAKE_SOURCE_DIR}/src/mbedTLS++/SslContext.h
+	${CMAKE_SOURCE_DIR}/src/mbedTLS++/X509Cert.h
 	${CMAKE_SOURCE_DIR}/src/StringUtils.h
 )
 
-- 
cgit v1.2.3