diff options
| author | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-08-30 16:42:58 +0200 |
|---|---|---|
| committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-08-30 16:42:58 +0200 |
| commit | f0d14229706eca615198c888bd8d3b95b663cfb4 (patch) | |
| tree | dfcb7fb092091b69a80b3b362adf862f80ba1ba0 /src/HTTP/HTTPServer.h | |
| parent | Initial zombies (diff) | |
| parent | Merge pull request #3969 from peterbell10/cuboid (diff) | |
| download | cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.gz cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.bz2 cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.lz cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.xz cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.tar.zst cuberite-f0d14229706eca615198c888bd8d3b95b663cfb4.zip | |
Diffstat (limited to 'src/HTTP/HTTPServer.h')
| -rw-r--r-- | src/HTTP/HTTPServer.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/HTTP/HTTPServer.h b/src/HTTP/HTTPServer.h index cd944bb89..a2d5d84fc 100644 --- a/src/HTTP/HTTPServer.h +++ b/src/HTTP/HTTPServer.h @@ -1,4 +1,4 @@ - + // HTTPServer.h // Declares the cHTTPServer class representing a HTTP webserver that uses cListenThread and cSocketThreads for processing @@ -11,8 +11,8 @@ #include "../OSSupport/Network.h" #include "../IniFile.h" -#include "PolarSSL++/CryptoKey.h" -#include "PolarSSL++/X509Cert.h" +#include "mbedTLS++/CryptoKey.h" +#include "mbedTLS++/X509Cert.h" @@ -21,6 +21,7 @@ // fwd: class cHTTPIncomingRequest; class cHTTPServerConnection; +class cSslConfig; @@ -70,11 +71,8 @@ protected: /** The callbacks to call for various events */ cCallbacks * m_Callbacks; - /** The server certificate to use for the SSL connections */ - cX509CertPtr m_Cert; - - /** The private key for m_Cert. */ - cCryptoKeyPtr m_CertPrivKey; + /** Configuration for server ssl connections. */ + std::shared_ptr<const cSslConfig> m_SslConfig; /** Called by cHTTPServerListenCallbacks when there's a new incoming connection. |