diff options
| author | Mattes D <github@xoft.cz> | 2014-04-30 17:05:13 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-04-30 17:05:13 +0200 |
| commit | 014fab58e6eafce87a092aa859c5008dbdaa5c7b (patch) | |
| tree | ac4ea8515e0461483714e18cef7bbb961f0fbec3 /src/Protocol/Protocol17x.cpp | |
| parent | Delayed sending the KeepAlive packet for 3 seconds after login. (diff) | |
| parent | Removed unneeded #includes. (diff) | |
| download | cuberite-014fab58e6eafce87a092aa859c5008dbdaa5c7b.tar cuberite-014fab58e6eafce87a092aa859c5008dbdaa5c7b.tar.gz cuberite-014fab58e6eafce87a092aa859c5008dbdaa5c7b.tar.bz2 cuberite-014fab58e6eafce87a092aa859c5008dbdaa5c7b.tar.lz cuberite-014fab58e6eafce87a092aa859c5008dbdaa5c7b.tar.xz cuberite-014fab58e6eafce87a092aa859c5008dbdaa5c7b.tar.zst cuberite-014fab58e6eafce87a092aa859c5008dbdaa5c7b.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Protocol/Protocol17x.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp index a04d8ac3c..a6d566625 100644 --- a/src/Protocol/Protocol17x.cpp +++ b/src/Protocol/Protocol17x.cpp @@ -33,6 +33,7 @@ Implements the 1.7.x protocol classes: #include "../CompositeChat.h" #include "../Entities/ArrowEntity.h" #include "../Entities/FireworkEntity.h" +#include "PolarSSL++/Sha1Checksum.h" @@ -1690,7 +1691,7 @@ void cProtocol172::HandlePacketLoginEncryptionResponse(cByteBuffer & a_ByteBuffe } // Decrypt EncNonce using privkey - cRSAPrivateKey & rsaDecryptor = cRoot::Get()->GetServer()->GetPrivateKey(); + cRsaPrivateKey & rsaDecryptor = cRoot::Get()->GetServer()->GetPrivateKey(); Int32 DecryptedNonce[MAX_ENC_LEN / sizeof(Int32)]; int res = rsaDecryptor.Decrypt((const Byte *)EncNonce.data(), EncNonce.size(), (Byte *)DecryptedNonce, sizeof(DecryptedNonce)); if (res != 4) @@ -2293,7 +2294,7 @@ void cProtocol172::StartEncryption(const Byte * a_Key) m_IsEncrypted = true; // Prepare the m_AuthServerID: - cSHA1Checksum Checksum; + cSha1Checksum Checksum; cServer * Server = cRoot::Get()->GetServer(); const AString & ServerID = Server->GetServerID(); Checksum.Update((const Byte *)ServerID.c_str(), ServerID.length()); @@ -2301,7 +2302,7 @@ void cProtocol172::StartEncryption(const Byte * a_Key) Checksum.Update((const Byte *)Server->GetPublicKeyDER().data(), Server->GetPublicKeyDER().size()); Byte Digest[20]; Checksum.Finalize(Digest); - cSHA1Checksum::DigestToJava(Digest, m_AuthServerID); + cSha1Checksum::DigestToJava(Digest, m_AuthServerID); } |