diff options
Diffstat (limited to 'lib/server/SSLLib.cpp')
| -rw-r--r-- | lib/server/SSLLib.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/server/SSLLib.cpp b/lib/server/SSLLib.cpp index de7a941b..6feaae4a 100644 --- a/lib/server/SSLLib.cpp +++ b/lib/server/SSLLib.cpp @@ -18,6 +18,10 @@ #include <wincrypt.h> #endif +<<<<<<< HEAD +======= +#include "CryptoUtils.h" +>>>>>>> 0.12 #include "SSLLib.h" #include "ServerException.h" @@ -39,8 +43,14 @@ 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 @@ -89,6 +99,7 @@ void SSLLib::Initialise() } +<<<<<<< HEAD // -------------------------------------------------------------------------- // // Function @@ -109,3 +120,5 @@ void SSLLib::LogError(const std::string& rErrorDuringAction) } } +======= +>>>>>>> 0.12 |