diff options
| author | Mattes D <github@xoft.cz> | 2014-05-11 20:59:15 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-05-11 20:59:15 +0200 |
| commit | e0c56b752204202840f60ed904210c99414517bb (patch) | |
| tree | 4532e85cbcc873a2616147713e9f899ecf84d111 /Tools | |
| parent | Merge pull request #993 from mc-server/GridStructGen (diff) | |
| parent | Merge branch 'master' into SslWebAdmin (diff) | |
| download | cuberite-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')
| -rw-r--r-- | Tools/ProtoProxy/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tools/ProtoProxy/Connection.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Tools/ProtoProxy/CMakeLists.txt b/Tools/ProtoProxy/CMakeLists.txt index a136c95df..f0796363c 100644 --- a/Tools/ProtoProxy/CMakeLists.txt +++ b/Tools/ProtoProxy/CMakeLists.txt @@ -38,9 +38,9 @@ set(SHARED_SRC ../../src/MCLogger.cpp ../../src/PolarSSL++/AesCfb128Decryptor.cpp ../../src/PolarSSL++/AesCfb128Encryptor.cpp + ../../src/PolarSSL++/CryptoKey.cpp ../../src/PolarSSL++/CtrDrbgContext.cpp ../../src/PolarSSL++/EntropyContext.cpp - ../../src/PolarSSL++/PublicKey.cpp ../../src/PolarSSL++/RsaPrivateKey.cpp ) set(SHARED_HDR @@ -50,9 +50,9 @@ set(SHARED_HDR ../../src/MCLogger.h ../../src/PolarSSL++/AesCfb128Decryptor.h ../../src/PolarSSL++/AesCfb128Encryptor.h + ../../src/PolarSSL++/CryptoKey.h ../../src/PolarSSL++/CtrDrbgContext.h ../../src/PolarSSL++/EntropyContext.h - ../../src/PolarSSL++/PublicKey.h ../../src/PolarSSL++/RsaPrivateKey.h ) set(SHARED_OSS_SRC 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) { |