Conflicts:

src/lib/plugin/ns/SecureSocket.cpp
This commit is contained in:
Jerry (Xinyu Hou) 2016-08-24 17:59:53 +01:00 committed by Andrew Nelless
parent 07902d623c
commit e0819b86cd
2 changed files with 9 additions and 9 deletions

View File

@ -46,15 +46,15 @@ public:
ISocketMultiplexerJob*
newJob();
void secureConnect();
void secureAccept();
EJobResult doRead();
EJobResult doWrite();
bool isFatal() const { return m_fatal; }
void isFatal(bool b) { m_fatal = b; }
bool isSecureReady();
void secureConnect();
void secureAccept();
int secureRead(void* buffer, int size, int& read);
int secureWrite(const void* buffer, int size, int& wrote);
EJobResult doRead();
EJobResult doWrite();
void initSsl(bool server);
bool loadCertificates(String& CertFile);