diff options
Diffstat (limited to 'lib/server/SocketStreamTLS.cpp')
| -rw-r--r-- | lib/server/SocketStreamTLS.cpp | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/lib/server/SocketStreamTLS.cpp b/lib/server/SocketStreamTLS.cpp index 19fdadd4..6f1cc46a 100644 --- a/lib/server/SocketStreamTLS.cpp +++ b/lib/server/SocketStreamTLS.cpp @@ -19,11 +19,20 @@ #include <poll.h> #endif +<<<<<<< HEAD #include "SocketStreamTLS.h" #include "SSLLib.h" #include "ServerException.h" #include "TLSContext.h" #include "BoxTime.h" +======= +#include "BoxTime.h" +#include "CryptoUtils.h" +#include "ServerException.h" +#include "SocketStreamTLS.h" +#include "SSLLib.h" +#include "TLSContext.h" +>>>>>>> 0.12 #include "MemLeakFindOn.h" @@ -124,7 +133,11 @@ void SocketStreamTLS::Handshake(const TLSContext &rContext, bool IsServer) mpBIO = ::BIO_new(::BIO_s_socket()); if(mpBIO == 0) { +<<<<<<< HEAD SSLLib::LogError("creating socket bio"); +======= + CryptoUtils::LogError("creating socket bio"); +>>>>>>> 0.12 THROW_EXCEPTION(ServerException, TLSAllocationFailed) } @@ -135,7 +148,11 @@ void SocketStreamTLS::Handshake(const TLSContext &rContext, bool IsServer) mpSSL = ::SSL_new(rContext.GetRawContext()); if(mpSSL == 0) { +<<<<<<< HEAD SSLLib::LogError("creating SSL object"); +======= + CryptoUtils::LogError("creating SSL object"); +>>>>>>> 0.12 THROW_EXCEPTION(ServerException, TLSAllocationFailed) } @@ -203,12 +220,20 @@ void SocketStreamTLS::Handshake(const TLSContext &rContext, bool IsServer) // Error occured if(IsServer) { +<<<<<<< HEAD SSLLib::LogError("accepting connection"); +======= + CryptoUtils::LogError("accepting connection"); +>>>>>>> 0.12 THROW_EXCEPTION(ConnectionException, Conn_TLSHandshakeFailed) } else { +<<<<<<< HEAD SSLLib::LogError("connecting"); +======= + CryptoUtils::LogError("connecting"); +>>>>>>> 0.12 THROW_EXCEPTION(ConnectionException, Conn_TLSHandshakeFailed) } } @@ -335,7 +360,11 @@ int SocketStreamTLS::Read(void *pBuffer, int NBytes, int Timeout) break; default: +<<<<<<< HEAD SSLLib::LogError("reading"); +======= + CryptoUtils::LogError("reading"); +>>>>>>> 0.12 THROW_EXCEPTION(ConnectionException, Conn_TLSReadFailed) break; } @@ -400,7 +429,11 @@ void SocketStreamTLS::Write(const void *pBuffer, int NBytes) break; default: +<<<<<<< HEAD SSLLib::LogError("writing"); +======= + CryptoUtils::LogError("writing"); +>>>>>>> 0.12 THROW_EXCEPTION(ConnectionException, Conn_TLSWriteFailed) break; } @@ -442,7 +475,11 @@ void SocketStreamTLS::Shutdown(bool Read, bool Write) if(::SSL_shutdown(mpSSL) < 0) { +<<<<<<< HEAD SSLLib::LogError("shutting down"); +======= + CryptoUtils::LogError("shutting down"); +>>>>>>> 0.12 THROW_EXCEPTION(ConnectionException, Conn_TLSShutdownFailed) } |