summaryrefslogtreecommitdiffstats
path: root/src/HTTPServer/HTTPServer.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-05-11 20:59:15 +0200
committerMattes D <github@xoft.cz>2014-05-11 20:59:15 +0200
commite0c56b752204202840f60ed904210c99414517bb (patch)
tree4532e85cbcc873a2616147713e9f899ecf84d111 /src/HTTPServer/HTTPServer.h
parentMerge pull request #993 from mc-server/GridStructGen (diff)
parentMerge branch 'master' into SslWebAdmin (diff)
downloadcuberite-e0c56b752204202840f60ed904210c99414517bb.tar
cuberite-e0c56b752204202840f60ed904210c99414517bb.tar.gz
cuberite-e0c56b752204202840f60ed904210c99414517bb.tar.bz2
cuberite-e0c56b752204202840f60ed904210c99414517bb.tar.lz
cuberite-e0c56b752204202840f60ed904210c99414517bb.tar.xz
cuberite-e0c56b752204202840f60ed904210c99414517bb.tar.zst
cuberite-e0c56b752204202840f60ed904210c99414517bb.zip
Diffstat (limited to 'src/HTTPServer/HTTPServer.h')
-rw-r--r--src/HTTPServer/HTTPServer.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/HTTPServer/HTTPServer.h b/src/HTTPServer/HTTPServer.h
index 8eff7d879..522b7da62 100644
--- a/src/HTTPServer/HTTPServer.h
+++ b/src/HTTPServer/HTTPServer.h
@@ -12,6 +12,9 @@
#include "../OSSupport/ListenThread.h"
#include "../OSSupport/SocketThreads.h"
#include "inifile/iniFile.h"
+#include "PolarSSL++/RsaPrivateKey.h"
+#include "PolarSSL++/CryptoKey.h"
+#include "PolarSSL++/X509Cert.h"
@@ -66,6 +69,7 @@ public:
protected:
friend class cHTTPConnection;
+ friend class cSslHTTPConnection;
cListenThread m_ListenThreadIPv4;
cListenThread m_ListenThreadIPv6;
@@ -78,6 +82,12 @@ 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;
+
// cListenThread::cCallback overrides:
virtual void OnConnectionAccepted(cSocket & a_Socket) override;