summaryrefslogtreecommitdiffstats
path: root/Tools/ProtoProxy/Connection.cpp
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 /Tools/ProtoProxy/Connection.cpp
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 'Tools/ProtoProxy/Connection.cpp')
-rw-r--r--Tools/ProtoProxy/Connection.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp
index 26aed2206..c5916c1ca 100644
--- a/Tools/ProtoProxy/Connection.cpp
+++ b/Tools/ProtoProxy/Connection.cpp
@@ -7,7 +7,7 @@
#include "Connection.h"
#include "Server.h"
#include <iostream>
-#include "PolarSSL++/PublicKey.h"
+#include "PolarSSL++/CryptoKey.h"
#ifdef _WIN32
#include <direct.h> // For _mkdir()
@@ -2900,7 +2900,7 @@ void cConnection::SendEncryptionKeyResponse(const AString & a_ServerPublicKey, c
Byte SharedSecret[16];
Byte EncryptedSecret[128];
memset(SharedSecret, 0, sizeof(SharedSecret)); // Use all zeroes for the initial secret
- cPublicKey PubKey(a_ServerPublicKey);
+ cCryptoKey PubKey(a_ServerPublicKey);
int res = PubKey.Encrypt(SharedSecret, sizeof(SharedSecret), EncryptedSecret, sizeof(EncryptedSecret));
if (res < 0)
{