summaryrefslogtreecommitdiffstats
path: root/src/Server.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-01-25 22:05:16 +0100
committerMattes D <github@xoft.cz>2014-01-25 22:05:16 +0100
commit437a9c8d1f13cc7770a95534dbf71b78685edfe7 (patch)
tree68b0e13a46f3936bb772106c0ca8d8e74aba2b8e /src/Server.h
parentMerge pull request #581 from worktycho/strerror (diff)
parentProtoProxy: Modified to use PolarSSL. (diff)
downloadcuberite-437a9c8d1f13cc7770a95534dbf71b78685edfe7.tar
cuberite-437a9c8d1f13cc7770a95534dbf71b78685edfe7.tar.gz
cuberite-437a9c8d1f13cc7770a95534dbf71b78685edfe7.tar.bz2
cuberite-437a9c8d1f13cc7770a95534dbf71b78685edfe7.tar.lz
cuberite-437a9c8d1f13cc7770a95534dbf71b78685edfe7.tar.xz
cuberite-437a9c8d1f13cc7770a95534dbf71b78685edfe7.tar.zst
cuberite-437a9c8d1f13cc7770a95534dbf71b78685edfe7.zip
Diffstat (limited to 'src/Server.h')
-rw-r--r--src/Server.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/Server.h b/src/Server.h
index bb55e81b6..15eafc00a 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -23,8 +23,7 @@
#pragma warning(disable:4702)
#endif
-#include "cryptopp/rsa.h"
-#include "cryptopp/randpool.h"
+#include "Crypto.h"
#ifdef _MSC_VER
#pragma warning(pop)
@@ -110,8 +109,8 @@ public: // tolua_export
/** Returns base64 encoded favicon data (obtained from favicon.png) */
const AString & GetFaviconData(void) const { return m_FaviconData; }
- CryptoPP::RSA::PrivateKey & GetPrivateKey(void) { return m_PrivateKey; }
- CryptoPP::RSA::PublicKey & GetPublicKey (void) { return m_PublicKey; }
+ cRSAPrivateKey & GetPrivateKey(void) { return m_PrivateKey; }
+ const AString & GetPublicKeyDER(void) const { return m_PublicKeyDER; }
private:
@@ -180,8 +179,11 @@ private:
bool m_bRestarting;
- CryptoPP::RSA::PrivateKey m_PrivateKey;
- CryptoPP::RSA::PublicKey m_PublicKey;
+ /** The private key used for the assymetric encryption start in the protocols */
+ cRSAPrivateKey m_PrivateKey;
+
+ /** Public key for m_PrivateKey, ASN1-DER-encoded */
+ AString m_PublicKeyDER;
cRCONServer m_RCONServer;