diff options
author | Chris Wilson <chris+github@qwirx.com> | 2012-04-28 18:11:21 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2012-04-28 18:11:21 +0000 |
commit | 9261f88d923cff5307de4d5465fe9f72f45ccd0a (patch) | |
tree | 9dc850a5447eecdda7fb780bd962d8198d391bf6 /lib/server/TLSContext.cpp | |
parent | fcc32a449e27447f0d231a87325db4b3358f6767 (diff) |
Move LogError out of server/SSLLib so we can use it in Crypto.
Diffstat (limited to 'lib/server/TLSContext.cpp')
-rw-r--r-- | lib/server/TLSContext.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/server/TLSContext.cpp b/lib/server/TLSContext.cpp index ebc7384a..341043e9 100644 --- a/lib/server/TLSContext.cpp +++ b/lib/server/TLSContext.cpp @@ -12,7 +12,7 @@ #define TLS_CLASS_IMPLEMENTATION_CPP #include <openssl/ssl.h> -#include "TLSContext.h" +#include "CryptoUtils.h" #include "ServerException.h" #include "SSLLib.h" #include "TLSContext.h" @@ -77,14 +77,14 @@ void TLSContext::Initialise(bool AsServer, const char *CertificatesFile, const c { std::string msg = "loading certificates from "; msg += CertificatesFile; - SSLLib::LogError(msg); + CryptoUtils::LogError(msg); 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; - SSLLib::LogError(msg); + CryptoUtils::LogError(msg); THROW_EXCEPTION(ServerException, TLSLoadPrivateKeyFailed) } @@ -93,7 +93,7 @@ void TLSContext::Initialise(bool AsServer, const char *CertificatesFile, const c { std::string msg = "loading CA cert from "; msg += TrustedCAsFile; - SSLLib::LogError(msg); + CryptoUtils::LogError(msg); THROW_EXCEPTION(ServerException, TLSLoadTrustedCAsFailed) } @@ -105,7 +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) { - SSLLib::LogError("setting cipher list to " CIPHER_LIST); + CryptoUtils::LogError("setting cipher list to " CIPHER_LIST); THROW_EXCEPTION(ServerException, TLSSetCiphersFailed) } } |