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
---
 Tools/ProtoProxy/CMakeLists.txt | 28 ++++++++++++++--------------
 Tools/ProtoProxy/Connection.cpp |  4 ++--
 Tools/ProtoProxy/Connection.h   |  6 +++---
 Tools/ProtoProxy/Server.h       |  4 ++--
 4 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'Tools/ProtoProxy')

diff --git a/Tools/ProtoProxy/CMakeLists.txt b/Tools/ProtoProxy/CMakeLists.txt
index 76e9fa609..c64a97428 100644
--- a/Tools/ProtoProxy/CMakeLists.txt
+++ b/Tools/ProtoProxy/CMakeLists.txt
@@ -8,7 +8,7 @@ set_lib_flags()
 
 # Set include paths to the used libraries:
 include_directories(SYSTEM "../../lib")
-include_directories(SYSTEM "../../lib/polarssl/include")
+include_directories(SYSTEM "../../lib/mbedtls/include")
 include_directories("../../src")
 
 function(flatten_files arg1)
@@ -20,7 +20,7 @@ function(flatten_files arg1)
 	set(${arg1} "${res}" PARENT_SCOPE)
 endfunction()
 
-include(../../lib/polarssl.cmake)
+include(../../lib/mbedtls.cmake)
 add_subdirectory(../../lib/zlib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/lib/zlib)
 
 set_exe_flags()
@@ -30,12 +30,12 @@ set(SHARED_SRC
 	../../src/ByteBuffer.cpp
 	../../src/StringUtils.cpp
 	../../src/UUID.cpp
-	../../src/PolarSSL++/AesCfb128Decryptor.cpp
-	../../src/PolarSSL++/AesCfb128Encryptor.cpp
-	../../src/PolarSSL++/CryptoKey.cpp
-	../../src/PolarSSL++/CtrDrbgContext.cpp
-	../../src/PolarSSL++/EntropyContext.cpp
-	../../src/PolarSSL++/RsaPrivateKey.cpp
+	../../src/mbedTLS++/AesCfb128Decryptor.cpp
+	../../src/mbedTLS++/AesCfb128Encryptor.cpp
+	../../src/mbedTLS++/CryptoKey.cpp
+	../../src/mbedTLS++/CtrDrbgContext.cpp
+	../../src/mbedTLS++/EntropyContext.cpp
+	../../src/mbedTLS++/RsaPrivateKey.cpp
 	../../src/LoggerListeners.cpp
 	../../src/Logger.cpp
 )
@@ -43,12 +43,12 @@ set(SHARED_HDR
 	../../src/ByteBuffer.h
 	../../src/StringUtils.h
 	../../src/UUID.h
-	../../src/PolarSSL++/AesCfb128Decryptor.h
-	../../src/PolarSSL++/AesCfb128Encryptor.h
-	../../src/PolarSSL++/CryptoKey.h
-	../../src/PolarSSL++/CtrDrbgContext.h
-	../../src/PolarSSL++/EntropyContext.h
-	../../src/PolarSSL++/RsaPrivateKey.h
+	../../src/mbedTLS++/AesCfb128Decryptor.h
+	../../src/mbedTLS++/AesCfb128Encryptor.h
+	../../src/mbedTLS++/CryptoKey.h
+	../../src/mbedTLS++/CtrDrbgContext.h
+	../../src/mbedTLS++/EntropyContext.h
+	../../src/mbedTLS++/RsaPrivateKey.h
 )
 set(SHARED_OSS_SRC
 	../../src/OSSupport/CriticalSection.cpp
diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp
index 2804a881c..c54157f05 100644
--- a/Tools/ProtoProxy/Connection.cpp
+++ b/Tools/ProtoProxy/Connection.cpp
@@ -1,4 +1,4 @@
-
+
 // Connection.cpp
 
 // Interfaces to the cConnection class representing a single pair of connected sockets
@@ -7,7 +7,7 @@
 #include "Connection.h"
 #include "Server.h"
 #include <iostream>
-#include "PolarSSL++/CryptoKey.h"
+#include "mbedTLS++/CryptoKey.h"
 #include "../../src/Logger.h"
 
 #ifdef _WIN32
diff --git a/Tools/ProtoProxy/Connection.h b/Tools/ProtoProxy/Connection.h
index 8aacaaa7f..226623c93 100644
--- a/Tools/ProtoProxy/Connection.h
+++ b/Tools/ProtoProxy/Connection.h
@@ -1,4 +1,4 @@
-
+
 // Connection.h
 
 // Interfaces to the cConnection class representing a single pair of connected sockets
@@ -10,8 +10,8 @@
 #pragma once
 
 #include "ByteBuffer.h"
-#include "PolarSSL++/AesCfb128Decryptor.h"
-#include "PolarSSL++/AesCfb128Encryptor.h"
+#include "mbedTLS++/AesCfb128Decryptor.h"
+#include "mbedTLS++/AesCfb128Encryptor.h"
 
 
 
diff --git a/Tools/ProtoProxy/Server.h b/Tools/ProtoProxy/Server.h
index bfa16c36c..6e930835e 100644
--- a/Tools/ProtoProxy/Server.h
+++ b/Tools/ProtoProxy/Server.h
@@ -1,4 +1,4 @@
-
+
 // Server.h
 
 // Interfaces to the cServer class encapsulating the entire "server"
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "PolarSSL++/RsaPrivateKey.h"
+#include "mbedTLS++/RsaPrivateKey.h"
 
 
 
-- 
cgit v1.2.3