missing dylib path fix

Stable

.gitignore

@@ -18,4 +18,8 @@ uics/
 make.sh
 gitpush_serverstuff_stable
 pokerth_server
-
+.vscode
+.qmake.stash
+pokerth.ap*
+*.DS_STORE
+.gitignore.save

INSTALL

@@ -1,36 +1 @@
-Requirements
+see https://github.com/pokerth/pokerth/wiki/Building-PokerTH
-============
-
-To compile PokerTH you need following libs: 
-
-Linux:
-- Qt version >= 4.4.3, 4.8.x recommended  --> http://qtsoftware.com/
-- zlib version >= 1.2.3  --> http://www.zlib.net/
-- libcurl version >= 7.16  --> http://curl.haxx.se/
-- libgcrypt (e.g. version 1.4.6)  --> http://www.gnu.org/software/libgcrypt/
-- libgsasl version >= 1.4 --> http://www.gnu.org/software/gsasl/
-- libboost_thread, libboost_filesystem, libboost_datetime, libboost_program_options,
-  libboost_iostreams, libboost_asio, libboost_regex, libboost_random, libboost_uuid
-  (version >= 1.49, latest always recommended)  --> http://www.boost.org/
-- libSDL_mixer, libSDL  --> http://www.libsdl.org/
-- libSQLite3 --> http://sqlite.org/
-- libtinyxml > 2.0 --> http://www.sourceforge.net/projects/tinyxml
-- protoc >= 2.3.0 (during build), libprotobuf >= 2.3.0 -> https://github.com/google/protobuf
-- For the server: libircclient 1.3 --> http://www.sourceforge.net/projects/libircclient/
-
-Windows:
-see docs/build_mingw_windows.txt
-
-
-Basic Installation
-==================
-
-Linux:
-
-  1. Type "cd path/to/the/sources". Then do for example "/usr/qt/4/bin/qmake pokerth.pro" to configure the makefile for your system.
-     Pay attention that the QTDIR environment variable points to Qt4 not Qt3. For example QTDIR=/usr/qt/4.
-     You can set this variable typing: "export QTDIR=/usr/qt/4"
-
-  2. Type "make" to compile the package.
-
-  3. Become root (typing "su") and type "make install" to install the program binary.

chatcleaner.proto

@@ -28,6 +28,7 @@
  * shall include the source code for the parts of OpenSSL used as well       *
  * as that of the covered work.                                              *
  *****************************************************************************/
+syntax = "proto2";
 
 option java_package = "de.chatcleaner.protocol";
 option java_outer_classname = "ProtoBuf";

connectivity.pro

@@ -41,13 +41,13 @@ unix : !mac {
 
 	QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
 	INCLUDEPATH += $${PREFIX}/include
-	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
+	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
 	BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
 	BOOST_SYS = boost_system boost_system-mt
 
 
 	#
-	# searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS)
+	# searching in $PREFIX/lib, $PREFIX/lib64 and $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
 	# to override the default '/usr' pass PREFIX
 	# variable to qmake.
 	#

load.pro

@@ -42,14 +42,14 @@ unix : !mac {
 
 	QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
 	INCLUDEPATH += $${PREFIX}/include
-	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
+	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
 	BOOST_THREAD = boost_thread boost_thread-mt
 	BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
 	BOOST_SYS = boost_system boost_system-mt
 
 
 	#
-	# searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS)
+	# searching in $PREFIX/lib, $PREFIX/lib64 and $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
 	# to override the default '/usr' pass PREFIX
 	# variable to qmake.
 	#

mac_post_make.sh

@@ -9,12 +9,13 @@
 # of binary-size if you leave Qt out.
 # (see http://trolltech.com/developer/downloads/qt/mac)
 
-QT_FW_PATH="/Users/$USER/Qt/5.9/clang_64/lib"
+QT_FW_PATH="/usr/local/Cellar/qt/5.13.0/lib"
-QT_PLUGIN_PATH="/Users/$USER/Qt/5.9/clang_64/plugins"
+QT_PLUGIN_PATH="/usr/local/Cellar/qt/5.13.0/plugins"
 SDL_FW_PATH="/Library/Frameworks"
 APPLICATION="./pokerth.app"
 BINARY="$APPLICATION/Contents/MacOs/pokerth"
 RESOURCES="$APPLICATION/Contents/Resources"
+DYLIB_PATH="$APPLICATION/Contents/MacOs/dylibs"
 
 # strip binary
 strip $BINARY
@@ -23,18 +24,56 @@ cp -R ./data $RESOURCES/
 find $RESOURCES/data -name ".svn" | xargs rm -Rf
 # create framework-path
 BINARY_FW_PATH="$APPLICATION/Contents/Frameworks"
-mkdir $BINARY_FW_PATH
 BINARY_PLUGIN_PATH="$APPLICATION/Contents/plugins"
+
+rm -rf $BINARY_FW_PATH
+rm -rf $BINARY_PLUGIN_PATH
+rm -rf $DYLIB_PATH
+
+mkdir $BINARY_FW_PATH
 mkdir -p $BINARY_PLUGIN_PATH/imageformats
 mkdir -p $BINARY_PLUGIN_PATH/sqldrivers
 mkdir -p $BINARY_PLUGIN_PATH/platforms
+mkdir -p $DYLIB_PATH
 
 # integrate SDL-frameworks into binary
 cp -R $SDL_FW_PATH/SDL.framework $BINARY_FW_PATH
 cp -R $SDL_FW_PATH/SDL_mixer.framework $BINARY_FW_PATH
 
-# integrate Qt-frameworks into binary
+# integrate dylibs
+cp /usr/lib/libcurl.4.dylib $DYLIB_PATH/.
+cp /usr/local/Cellar/openssl/1.0.2s/lib/libcrypto.1.0.0.dylib $DYLIB_PATH/.
+cp /usr/local/opt/openssl/lib/libssl.1.0.0.dylib $DYLIB_PATH/.
+cp /usr/lib/libsqlite3.dylib $DYLIB_PATH/.
+cp /usr/local/opt/tinyxml/lib/libtinyxml.dylib $DYLIB_PATH/.
+cp /usr/local/opt/protobuf/lib/libprotobuf.18.dylib $DYLIB_PATH/.
+cp /usr/lib/libz.1.dylib $DYLIB_PATH/.
 
+chmod -R +w $DYLIB_PATH;
+
+LIBCURL_LINK=$(otool -L $BINARY | grep libcurl | cut -d"(" -f1 | cut -f2)
+LIBCRYPTO_LINK=$(otool -L $BINARY | grep libcrypto | cut -d"(" -f1 | cut -f2)
+LIBSSL_LINK=$(otool -L $BINARY | grep libssl | cut -d"(" -f1 | cut -f2)
+LIBTINYXML_LINK=$(otool -L $BINARY | grep libtinyxml | cut -d"(" -f1 | cut -f2)
+LIBSQLITE_LINK=$(otool -L $BINARY | grep libsqlite | cut -d"(" -f1 | cut -f2)
+LIBPROTOBUF_LINK=$(otool -L $BINARY | grep libprotobuf | cut -d"(" -f1 | cut -f2)
+LIBZ_LINK=$(otool -L $BINARY | grep libz | cut -d"(" -f1 | cut -f2)
+
+install_name_tool -change $LIBCURL_LINK @loader_path/dylibs/libcurl.4.dylib $BINARY
+install_name_tool -change $LIBCRYPTO_LINK @loader_path/dylibs/libcrypto.1.0.0.dylib  $BINARY
+install_name_tool -change $LIBSSL_LINK @loader_path/dylibs/libssl.1.0.0.dylib $BINARY
+install_name_tool -change $LIBTINYXML_LINK @loader_path/dylibs/libtinyxml.dylib $BINARY
+install_name_tool -change $LIBSQLITE_LINK @loader_path/dylibs/libsqlite3.dylib $BINARY
+install_name_tool -change $LIBPROTOBUF_LINK @loader_path/dylibs/libprotobuf.18.dylib $BINARY
+install_name_tool -change $LIBSQLITE_LINK @loader_path/dylibs/libsqlite3.dylib $BINARY
+install_name_tool -change $LIBZ_LINK @loader_path/dylibs/libz.1.dylib $BINARY
+
+LIBCRYPTO_LINK=$(otool -L $DYLIB_PATH/libssl.1.0.0.dylib | grep libcrypto | cut -d"(" -f1 | cut -f2)
+LIBSSL_LINK=$(otool -L $DYLIB_PATH/libssl.1.0.0.dylib | grep libssl | cut -d"(" -f1 | cut -f2)
+install_name_tool -change $LIBCRYPTO_LINK @executable_path/dylibs/libcrypto.1.0.0.dylib $DYLIB_PATH/libssl.1.0.0.dylib
+install_name_tool -change /usr/local/opt/openssl/lib/libssl.1.0.0.dylib @executable_path/dylibs/libssl.1.0.0.dylib $DYLIB_PATH/libssl.1.0.0.dylib
+
+# integrate Qt-frameworks into binary
 if [ "$1" != "--without-qt" ] ; then
         cp $QT_PLUGIN_PATH/imageformats/libqgif.dylib $BINARY_PLUGIN_PATH/imageformats
         cp $QT_PLUGIN_PATH/imageformats/libqjpeg.dylib $BINARY_PLUGIN_PATH/imageformats
@@ -46,6 +85,8 @@ if [ "$1" != "--without-qt" ] ; then
         cp -R $QT_FW_PATH/QtSql.framework $BINARY_FW_PATH
         cp -R $QT_FW_PATH/QtNetwork.framework $BINARY_FW_PATH
         cp -R $QT_FW_PATH/QtPrintSupport.framework $BINARY_FW_PATH
+        cp -R /usr/local/Cellar/qt/5.13.0/lib/QtDBus.framework $BINARY_FW_PATH
+        chmod -R 775 $BINARY_FW_PATH
         # remove debug versions
         rm -f $APPLICATION/Contents/Frameworks/QtCore.framework/QtCore_debug
         rm -f $APPLICATION/Contents/Frameworks/QtCore.framework/QtCore_debug.prl
@@ -65,6 +106,9 @@ if [ "$1" != "--without-qt" ] ; then
         rm -f $APPLICATION/Contents/Frameworks/QtPrintSupport.framework/QtPrintSupport_debug
         rm -f $APPLICATION/Contents/Frameworks/QtPrintSupport.framework/QtPrintSupport_debug.prl
         rm -f $APPLICATION/Contents/Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport_debug
+        rm -f $APPLICATION/Contents/Frameworks/QtDBus.framework/QtDBus_debug
+        rm -f $APPLICATION/Contents/Frameworks/QtDBus.framework/QtDBus_debug.prl
+        rm -f $APPLICATION/Contents/Frameworks/QtDBus.framework/Versions/5/QtDBus_debug
 
         # redirect binary to use integrated frameworks
         QTCORE="QtCore.framework/Versions/5/QtCore"
@@ -73,18 +117,20 @@ if [ "$1" != "--without-qt" ] ; then
         QTSQL="QtSql.framework/Versions/5/QtSql"
         QTNETWORK="QtNetwork.framework/Versions/5/QtNetwork"
         QTPRINT="QtPrintSupport.framework/Versions/5/QtPrintSupport"
+        QTDBUS="QtDBus.framework/Versions/5/QtDBus"
         install_name_tool -id @executable_path/../Frameworks/$QTCORE $BINARY_FW_PATH/$QTCORE
         install_name_tool -id @executable_path/../Frameworks/$QTGUI $BINARY_FW_PATH/$QTGUI
         install_name_tool -id @executable_path/../Frameworks/$QTWIDGETS $BINARY_FW_PATH/$QTWIDGETS
         install_name_tool -id @executable_path/../Frameworks/$QTSQL $BINARY_FW_PATH/$QTSQL
         install_name_tool -id @executable_path/../Frameworks/$QTNETWORK $BINARY_FW_PATH/$QTNETWORK
         install_name_tool -id @executable_path/../Frameworks/$QTPRINT $BINARY_FW_PATH/$QTPRINT
+        install_name_tool -id @executable_path/../Frameworks/$QDBUS $BINARY_FW_PATH/$QTDBUS
         QTCORE_LINK=$(otool -L $BINARY | grep QtCore | cut -d"(" -f1 | cut -f2)
         QTGUI_LINK=$(otool -L $BINARY | grep QtGui | cut -d"(" -f1 | cut -f2)
         QTWIDGETS_LINK=$(otool -L $BINARY | grep QtWidgets | cut -d"(" -f1 | cut -f2)
         QTSQL_LINK=$(otool -L $BINARY | grep QtSql | cut -d"(" -f1 | cut -f2)
         QTNETWORK_LINK=$(otool -L $BINARY | grep QtNetwork | cut -d"(" -f1 | cut -f2)
-        QTPRINT_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep QtPrintSupport | cut -d"(" -f1 | cut -f2)
+
         install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY
         install_name_tool -change $QTGUI_LINK @executable_path/../Frameworks/$QTGUI $BINARY
         install_name_tool -change $QTWIDGETS_LINK @executable_path/../Frameworks/$QTWIDGETS $BINARY
@@ -98,10 +144,22 @@ if [ "$1" != "--without-qt" ] ; then
         install_name_tool -change $QTWIDGETS_LINK @executable_path/../Frameworks/$QTWIDGETS $BINARY_PLUGIN_PATH/imageformats/libqjpeg.dylib
         install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_PLUGIN_PATH/sqldrivers/libqsqlite.dylib
         install_name_tool -change $QTSQL_LINK @executable_path/../Frameworks/$QTSQL $BINARY_PLUGIN_PATH/sqldrivers/libqsqlite.dylib
+
+        QTDBUS_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep QtDBus | cut -d"(" -f1 | cut -f2)
+        QTPRINT_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep QtPrintSupport | cut -d"(" -f1 | cut -f2)
+        QTZ_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep libz | cut -d"(" -f1 | cut -f2)
+        QTCORE_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep QtCore | cut -d"(" -f1 | cut -f2)
+        QTGUI_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep QtGui | cut -d"(" -f1 | cut -f2)
+        QTWIDGETS_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep QtWidgets | cut -d"(" -f1 | cut -f2)
         install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib
         install_name_tool -change $QTGUI_LINK @executable_path/../Frameworks/$QTGUI $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib
         install_name_tool -change $QTWIDGETS_LINK @executable_path/../Frameworks/$QTWIDGETS $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib
         install_name_tool -change $QTPRINT_LINK @executable_path/../Frameworks/$QTPRINT $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib
+        install_name_tool -change $QTDBUS_LINK @executable_path/../Frameworks/$QTDBUS $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib
+        install_name_tool -change $QTZ_LINK @loader_path/dylibs/libz.1.dylib $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib
+
+        QTCORE_LINK=$(otool -L $BINARY_FW_PATH/$QTDBUS | grep QtCore | head -1 | cut -d"(" -f1 | cut -f2)
+        install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_FW_PATH/$QTDBUS
 
         QTCORE_LINK=$(otool -L $BINARY_FW_PATH/$QTGUI | grep QtCore | head -1 | cut -d"(" -f1 | cut -f2)
         install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_FW_PATH/$QTGUI

pokerth.proto

@@ -1,3 +1,4 @@
+syntax = "proto2";
 /*****************************************************************************
  * PokerTH - The open source texas holdem engine                             *
  * Copyright (C) 2006-2013 Felix Hammer, Florian Thauer, Lothar May          *
@@ -701,7 +702,7 @@ message ReportGameAckMessage {
 
 message ErrorMessage {
 	enum ErrorReason {
-		reserved = 0;
+		custReserved = 0;
 		initVersionNotSupported = 1;
 		initServerFull = 2;
 		initAuthFailure = 3;

pokerth_db.pro

@@ -60,7 +60,7 @@ mac{
         CONFIG += x86_64
         CONFIG -= x86
         CONFIG -= ppc
-        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
         QMAKE_CXXFLAGS -= -std=gnu++0x
 
 	# for universal-compilation on PPC-Mac uncomment the following line

pokerth_game.pro

@@ -412,7 +412,7 @@ unix:!mac {
 		LIB_DIRS = $${PREFIX}/lib \
 			$${PREFIX}/lib64 \
                         $${PREFIX}/lib/x86_64-linux-gnu \
-			$$system(qmake -query QT_INSTALL_LIBS)
+			$$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
 	}
 	android{
 		LIBPATH += $${PREFIX}/lib/armv7
@@ -433,7 +433,7 @@ unix:!mac {
 	BOOST_CHRONO = boost_chrono \
 		boost_chrono-mt
 
-	# searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS)
+	# searching in $PREFIX/lib, $PREFIX/lib64 and $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
 	# to override the default '/usr' pass PREFIX
 	# variable to qmake.
 	for(dir, LIB_DIRS):exists($$dir) {
@@ -576,7 +576,7 @@ mac {
 	CONFIG += x86_64
 	CONFIG -= x86
 	CONFIG -= ppc
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
+	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
 	QMAKE_CXXFLAGS -= -std=gnu++0x
 
 	# workaround for problems with boost_filesystem exceptions
@@ -587,12 +587,13 @@ mac {
 	# QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/
 	LIBPATH += lib
 
+
 	# QT dynamic linked framework (see also mac_post_make.sh)
 	LIBS += -F /Library/Frameworks
-	LIBS += -framework \
+#	LIBS += -framework \
-		QtCore
+#		QtCore
-	LIBS += -framework \
+#	LIBS += -framework \
-		QtGui
+#		QtGui
    LIBS += -framework \
         SDL
     LIBS += -framework \

pokerth_lib.pro

@@ -294,7 +294,7 @@ mac{
 	CONFIG += x86_64
 	CONFIG -= x86
 	CONFIG -= ppc
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
+	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
 	QMAKE_CXXFLAGS -= -std=gnu++0x
 
 	# for universal-compilation on PPC-Mac uncomment the following line

pokerth_protocol.pro

@@ -56,7 +56,10 @@ mac {
 	CONFIG += x86_64
 	CONFIG -= x86
 	CONFIG -= ppc
-        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
+	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+	system(protoc pokerth.proto --cpp_out=src/third_party/protobuf)
+	system(protoc chatcleaner.proto --cpp_out=src/third_party/protobuf)
+	system(protoc pokerth.proto --java_out=tests/src)	
 
 	# for universal-compilation on PPC-Mac uncomment the following line
 	# on Intel-Mac you have to comment this line out or build will fail.

pokerth_server.pro

@@ -180,7 +180,7 @@ unix : !mac {
 	INCLUDEPATH += $${PREFIX}/include
 	# see issue https://github.com/pokerth/pokerth/issues/282
 	INCLUDEPATH += $${PREFIX}/include/libircclient
-	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
+	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
 	BOOST_FS = boost_filesystem boost_filesystem-mt
 	BOOST_THREAD = boost_thread boost_thread-mt
 	BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
@@ -191,7 +191,7 @@ unix : !mac {
 	BOOST_CHRONO = boost_chrono boost_chrono-mt
 
 	#
-	# searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS)
+	# searching in $PREFIX/lib, $PREFIX/lib64 and $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
 	# to override the default '/usr' pass PREFIX
 	# variable to qmake.
 	#
@@ -310,7 +310,7 @@ mac {
 	CONFIG += x86_64
 	CONFIG -= x86
 	CONFIG -= ppc
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
+	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
 	QMAKE_CXXFLAGS -= -std=gnu++0x
 
 	# workaround for problems with boost_filesystem exceptions

src/core/common/crypthelper.cpp

@@ -291,22 +291,33 @@ CryptHelper::AES128Encrypt(const unsigned char *keyData, unsigned keySize, const
 		outCipher.resize(cipherSize);
 
 #ifdef HAVE_OPENSSL
-		EVP_CIPHER_CTX encryptCtx;
+	#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-		EVP_CIPHER_CTX_init(&encryptCtx);
+		EVP_CIPHER_CTX *encryptCtx = EVP_CIPHER_CTX_new();  
+	#else
+		EVP_CIPHER_CTX _encryptCtx; 
+		EVP_CIPHER_CTX *encryptCtx; 
+		encryptCtx = &_encryptCtx; 
+	#endif // OPENSSL_VERSION_NUMBER >= 0x10100000L 
+
+		EVP_CIPHER_CTX_init(encryptCtx);
 		int outCipherSize = cipherSize;
 
-		int success = EVP_EncryptInit(&encryptCtx, EVP_aes_128_cbc(), key, iv);
+		int success = EVP_EncryptInit(encryptCtx, EVP_aes_128_cbc(), key, iv);
-		EVP_CIPHER_CTX_set_padding(&encryptCtx, 0);
+		EVP_CIPHER_CTX_set_padding(encryptCtx, 0);
 		if (success) {
-			success = EVP_EncryptUpdate(&encryptCtx, &outCipher[0], &outCipherSize, paddedPlainStr, paddedPlainSize);
+			success = EVP_EncryptUpdate(encryptCtx, &outCipher[0], &outCipherSize, paddedPlainStr, paddedPlainSize);
 
 			if (success && outCipherSize) {
 				// Since padding is off, this will not modify the cipher. However, parameters need to be set.
-				EVP_EncryptFinal(&encryptCtx, &outCipher[0], &outCipherSize);
+				EVP_EncryptFinal(encryptCtx, &outCipher[0], &outCipherSize);
 				retVal = true;
 			}
 		} else
 			outCipher.clear();
+		
+	#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+		EVP_CIPHER_CTX_free(encryptCtx);
+	#endif // OPENSSL_VERSION_NUMBER >= 0x10100000L 
 #else
 		gcry_cipher_hd_t hd;
 		gcry_error_t err = gcry_cipher_open(&hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CBC, 0);
@@ -338,22 +349,33 @@ CryptHelper::AES128Decrypt(const unsigned char *keyData, unsigned keySize, const
 		BytesToKey(keyData, keySize, key, iv);
 		outPlain.resize(cipherSize);
 #ifdef HAVE_OPENSSL
-		EVP_CIPHER_CTX decryptCtx;
+	#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-		EVP_CIPHER_CTX_init(&decryptCtx);
+		EVP_CIPHER_CTX *decryptCtx = EVP_CIPHER_CTX_new();  
+	#else
+		EVP_CIPHER_CTX _decryptCtx; 
+		EVP_CIPHER_CTX *decryptCtx; 
+		decryptCtx = &_decryptCtx; 
+	#endif // OPENSSL_VERSION_NUMBER >= 0x10100000L 
+
+		EVP_CIPHER_CTX_init(decryptCtx);
 		int outPlainSize = cipherSize;
 
-		int success = EVP_DecryptInit(&decryptCtx, EVP_aes_128_cbc(), key, iv);
+		int success = EVP_DecryptInit(decryptCtx, EVP_aes_128_cbc(), key, iv);
-		EVP_CIPHER_CTX_set_padding(&decryptCtx, 0);
+		EVP_CIPHER_CTX_set_padding(decryptCtx, 0);
 		if (success) {
-			success = EVP_DecryptUpdate(&decryptCtx, (unsigned char *)&outPlain[0], &outPlainSize, cipher, cipherSize);
+			success = EVP_DecryptUpdate(decryptCtx, (unsigned char *)&outPlain[0], &outPlainSize, cipher, cipherSize);
 
 			if (success && outPlainSize) {
 				// Since padding is off, this will not modify the plain text. However, parameters need to be set.
-				EVP_DecryptFinal(&decryptCtx, (unsigned char *)outPlain.c_str(), &outPlainSize);
+				EVP_DecryptFinal(decryptCtx, (unsigned char *)outPlain.c_str(), &outPlainSize);
 				retVal = true;
 			}
 		} else
 			outPlain.clear();
+		
+	#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+		EVP_CIPHER_CTX_free(decryptCtx);
+	#endif // OPENSSL_VERSION_NUMBER >= 0x10100000L 
 #else
 		gcry_cipher_hd_t hd;
 		gcry_error_t err = gcry_cipher_open(&hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CBC, 0);

src/gui/qt/gametable/gametableimpl.cpp

@@ -3859,7 +3859,7 @@ void gameTableImpl::triggerVoteOnKick(int id)
 	int playerCount = static_cast<int>(seatList->size());
 	if (id < playerCount) {
 		PlayerListIterator pos = seatList->begin();
-		advance(pos, id);
+		std::advance(pos, id);
 		myStartWindow->getSession()->startVoteKickPlayer((*pos)->getMyUniqueID());
 	}
 }

src/net/common/clientthread.cpp

@@ -993,8 +993,11 @@ ClientThread::CreateContextSession()
 			newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v6()));
 		else
 			newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v4()));
-		boost::asio::socket_base::non_blocking_io command(true);
+
-		newSock->io_control(command);
+		// Deprecated  non_blocking_io command
+		/*boost::asio::socket_base::non_blocking_io command(true);
+		newSock->io_control(command);*/
+		newSock->non_blocking(true);
 		newSock->set_option(tcp::no_delay(true));
 		newSock->set_option(boost::asio::socket_base::keep_alive(true));
 

src/net/common/netpacket.cpp

@@ -249,7 +249,7 @@ NetPacket::GameErrorToNetError(int gameErrorReason)
 		retVal = ErrorMessage::sessionTimeout;
 		break;
 	default :
-		retVal = ErrorMessage::reserved;
+		retVal = ErrorMessage::custReserved;
 		break;
 	}
 	return retVal;

src/net/serveraccepthelper.h

@@ -122,8 +122,10 @@ protected:
 					  const boost::system::error_code &error)
 	{
 		if (!error) {
-			boost::asio::socket_base::non_blocking_io command(true);
+			// Deprecated  non_blocking_io command
-			acceptedSocket->io_control(command);
+			/*boost::asio::socket_base::non_blocking_io command(true);
+			newSock->io_control(command);*/
+			acceptedSocket->non_blocking(true);
 			acceptedSocket->set_option(typename P::no_delay(true));
 			acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true));
 			boost::shared_ptr<SessionData> sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService));

src/pokerth.cpp

@@ -103,6 +103,7 @@ int main( int argc, char **argv )
 	QApplication a(argc, argv);
 	a.setApplicationName("PokerTH");
 #else
+	QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 	SharedTools::QtSingleApplication a( "PokerTH", argc, argv );
 	if (a.sendMessage("Wake up!")) {
 		return 0;