diff options
Diffstat (limited to 'lib/server/SSLLib.cpp')
| -rw-r--r-- | lib/server/SSLLib.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/lib/server/SSLLib.cpp b/lib/server/SSLLib.cpp index 6feaae4a..004d2d98 100644 --- a/lib/server/SSLLib.cpp +++ b/lib/server/SSLLib.cpp @@ -18,10 +18,7 @@ #include <wincrypt.h> #endif -<<<<<<< HEAD -======= #include "CryptoUtils.h" ->>>>>>> 0.12 #include "SSLLib.h" #include "ServerException.h" @@ -43,14 +40,9 @@ void SSLLib::Initialise() { if(!::SSL_library_init()) { -<<<<<<< HEAD - LogError("initialising OpenSSL"); - THROW_EXCEPTION(ServerException, SSLLibraryInitialisationError) -======= THROW_EXCEPTION_MESSAGE(ServerException, SSLLibraryInitialisationError, CryptoUtils::LogError("initialising OpenSSL")); ->>>>>>> 0.12 } // More helpful error messages @@ -99,26 +91,3 @@ void SSLLib::Initialise() } -<<<<<<< HEAD -// -------------------------------------------------------------------------- -// -// Function -// Name: SSLLib::LogError(const char *) -// Purpose: Logs an error -// Created: 2003/08/06 -// -// -------------------------------------------------------------------------- -void SSLLib::LogError(const std::string& rErrorDuringAction) -{ - unsigned long errcode; - char errname[256]; // SSL docs say at least 120 bytes - while((errcode = ERR_get_error()) != 0) - { - ::ERR_error_string_n(errcode, errname, sizeof(errname)); - BOX_ERROR("SSL error while " << rErrorDuringAction << ": " << - errname); - } -} - -======= ->>>>>>> 0.12 |