Permalink
Browse files

Include OpenSSL in standard edition server

  • Loading branch information...
bear101 committed Jan 7, 2019
1 parent b1b0361 commit 0b55adfa36b46704cedafcb8852cd6c108ae3040
Showing with 10 additions and 12 deletions.
  1. +1 −2 Library/TeamTalkLib/bin/ttsrv/ServerGuard.cpp
  2. +9 −10 Library/TeamTalkLib/build/ttsrv.cmake
@@ -919,8 +919,7 @@ namespace teamtalk {
privfile = Utf8ToUnicode(xmlSettings.GetPrivateKeyFile().c_str());

ACE_SSL_Context *context = ACE_SSL_Context::instance ();
//context->set_mode(ACE_SSL_Context::SSLv3_server);
context->set_mode(ACE_SSL_Context::SSLv23_server);
context->set_mode(ACE_SSL_Context::SSLv23);
if(certfile.length() && privfile.length())
{
if(context->certificate (UnicodeToLocal(certfile).c_str(), SSL_FILETYPE_PEM)<0)
@@ -1,29 +1,28 @@
include (ttsrvlib)
include (tinyxml)

set (TTSRV_INCLUDE_DIR ${TTSRVLIB_INCLUDE_DIR} ${TINYXML_INCLUDE_DIR})
set (TTSRV_COMPILE_FLAGS ${TTSRVLIB_COMPILE_FLAGS} -DENABLE_HTTP_AUTH)
set (TTSRV_LINK_FLAGS ${ACEINET_STATIC_LIB}
${TTSRVLIB_LINK_FLAGS} ${TINYXML_STATIC_LIB})
set (TTSRV_INCLUDE_DIR ${TTSRVLIB_INCLUDE_DIR} ${TINYXML_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
set (TTSRV_COMPILE_FLAGS ${TTSRVLIB_COMPILE_FLAGS} -DENABLE_HTTP_AUTH -DENABLE_ENCRYPTION)
set (TTSRV_LINK_FLAGS ${ACEINETSSL_STATIC_LIB} ${ACESSL_STATIC_LIB} ${OPENSSL_STATIC_LIB}
${ACEINET_STATIC_LIB} ${TTSRVLIB_LINK_FLAGS} ${TINYXML_STATIC_LIB})

set (TTSRVPRO_INCLUDE_DIR ${TTSRV_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
set (TTSRVPRO_COMPILE_FLAGS ${TTSRV_COMPILE_FLAGS} -DENABLE_ENCRYPTION)
set (TTSRVPRO_LINK_FLAGS
${ACEINETSSL_STATIC_LIB} ${ACESSL_STATIC_LIB} ${OPENSSL_STATIC_LIB} ${TTSRV_LINK_FLAGS})
set (TTSRVPRO_INCLUDE_DIR ${TTSRV_INCLUDE_DIR})
set (TTSRVPRO_COMPILE_FLAGS ${TTSRV_COMPILE_FLAGS} -DENABLE_TEAMTALKPRO)
set (TTSRVPRO_LINK_FLAGS ${TTSRV_LINK_FLAGS})

set (TTSRV_SOURCES
${TTSRVLIB_SOURCES}
${TEAMTALKLIB_ROOT}/bin/ttsrv/ServerGuard.cpp
${TEAMTALKLIB_ROOT}/bin/ttsrv/ServerXML.cpp
${TEAMTALKLIB_ROOT}/settings/Settings.cpp
${TEAMTALKLIB_ROOT}/bin/ttsrv/Main.cpp
${TEAMTALKLIB_ROOT}/bin/ttsrv/ttsrv.rc )
${TEAMTALKLIB_ROOT}/bin/ttsrv/ttsrv.rc)

set (TTSRV_HEADERS
${TTSRVLIB_HEADERS}
${TEAMTALKLIB_ROOT}/bin/ttsrv/AppInfo.h
${TEAMTALKLIB_ROOT}/bin/ttsrv/resource.h
${TEAMTALKLIB_ROOT}/bin/ttsrv/ServerGuard.h
${TEAMTALKLIB_ROOT}/bin/ttsrv/ServerXML.h
${TEAMTALKLIB_ROOT}/settings/Settings.h )
${TEAMTALKLIB_ROOT}/settings/Settings.h)

0 comments on commit 0b55adf

Please sign in to comment.