Merge branch 'b11.16' into 'master'11.16

add upstream 11.16

See merge request opensource-tracking/FreeFileSync!40

1 files changed, 0 insertions, 17 deletions

diff --git a/zen/open_ssl.h b/zen/open_ssl.h
index 2b0c7245..d1b823de 100644
--- a/zen/open_ssl.h
+++ b/zen/open_ssl.h
@@ -36,23 +36,6 @@ std::string convertRsaKey(const std::string& keyStream, RsaStreamType typeFrom,
 
 bool isPuttyKeyStream(const std::string& keyStream);
 std::string convertPuttyKeyToPkix(const std::string& keyStream, const std::string& passphrase); //throw SysError
-
-
-class TlsContext
-{
-public:
-    TlsContext(int socket, //throw SysError
-               const Zstring& server,
-               const Zstring* caCertFilePath /*optional: enable certificate validation*/);
-    ~TlsContext();
-
-    size_t tryRead(       void* buffer, size_t bytesToRead ); //throw SysError; may return short, only 0 means EOF!
-    size_t tryWrite(const void* buffer, size_t bytesToWrite); //throw SysError; may return short! CONTRACT: bytesToWrite > 0
-
-private:
-    class Impl;
-    const std::unique_ptr<Impl> pimpl_;
-};
 }
 
 #endif //OPEN_SSL_H_801974580936508934568792347506