diff options
Diffstat (limited to 'lib/server/TLSContext.cpp')
| -rw-r--r-- | lib/server/TLSContext.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/lib/server/TLSContext.cpp b/lib/server/TLSContext.cpp index 1f06d602..341043e9 100644 --- a/lib/server/TLSContext.cpp +++ b/lib/server/TLSContext.cpp @@ -12,11 +12,7 @@ #define TLS_CLASS_IMPLEMENTATION_CPP #include <openssl/ssl.h> -<<<<<<< HEAD -#include "TLSContext.h" -======= #include "CryptoUtils.h" ->>>>>>> 0.12 #include "ServerException.h" #include "SSLLib.h" #include "TLSContext.h" @@ -81,22 +77,14 @@ void TLSContext::Initialise(bool AsServer, const char *CertificatesFile, const c { std::string msg = "loading certificates from "; msg += CertificatesFile; -<<<<<<< HEAD - SSLLib::LogError(msg); -======= CryptoUtils::LogError(msg); ->>>>>>> 0.12 THROW_EXCEPTION(ServerException, TLSLoadCertificatesFailed) } if(::SSL_CTX_use_PrivateKey_file(mpContext, PrivateKeyFile, SSL_FILETYPE_PEM) != 1) { std::string msg = "loading private key from "; msg += PrivateKeyFile; -<<<<<<< HEAD - SSLLib::LogError(msg); -======= CryptoUtils::LogError(msg); ->>>>>>> 0.12 THROW_EXCEPTION(ServerException, TLSLoadPrivateKeyFailed) } @@ -105,11 +93,7 @@ void TLSContext::Initialise(bool AsServer, const char *CertificatesFile, const c { std::string msg = "loading CA cert from "; msg += TrustedCAsFile; -<<<<<<< HEAD - SSLLib::LogError(msg); -======= CryptoUtils::LogError(msg); ->>>>>>> 0.12 THROW_EXCEPTION(ServerException, TLSLoadTrustedCAsFailed) } @@ -121,11 +105,7 @@ void TLSContext::Initialise(bool AsServer, const char *CertificatesFile, const c // Setup allowed ciphers if(::SSL_CTX_set_cipher_list(mpContext, CIPHER_LIST) != 1) { -<<<<<<< HEAD - SSLLib::LogError("setting cipher list to " CIPHER_LIST); -======= CryptoUtils::LogError("setting cipher list to " CIPHER_LIST); ->>>>>>> 0.12 THROW_EXCEPTION(ServerException, TLSSetCiphersFailed) } } |