summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol132.cpp
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-04-29 17:37:15 +0200
committermadmaxoft <github@xoft.cz>2014-04-29 17:37:15 +0200
commit6cb2d2461f869d5c9d986cccec5edf1021878df2 (patch)
tree41445e9e4a1336026e905be5a20700b58511c58d /src/Protocol/Protocol132.cpp
parentMoved cPublicKey to its separate file in PolarSSL++. (diff)
downloadcuberite-6cb2d2461f869d5c9d986cccec5edf1021878df2.tar
cuberite-6cb2d2461f869d5c9d986cccec5edf1021878df2.tar.gz
cuberite-6cb2d2461f869d5c9d986cccec5edf1021878df2.tar.bz2
cuberite-6cb2d2461f869d5c9d986cccec5edf1021878df2.tar.lz
cuberite-6cb2d2461f869d5c9d986cccec5edf1021878df2.tar.xz
cuberite-6cb2d2461f869d5c9d986cccec5edf1021878df2.tar.zst
cuberite-6cb2d2461f869d5c9d986cccec5edf1021878df2.zip
Diffstat (limited to '')
-rw-r--r--src/Protocol/Protocol132.cpp18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp
index acfa5e811..f4717f592 100644
--- a/src/Protocol/Protocol132.cpp
+++ b/src/Protocol/Protocol132.cpp
@@ -18,19 +18,7 @@
#include "../WorldStorage/FastNBT.h"
#include "../WorldStorage/EnchantmentSerializer.h"
#include "../StringCompression.h"
-
-#ifdef _MSC_VER
- #pragma warning(push)
- #pragma warning(disable:4127)
- #pragma warning(disable:4244)
- #pragma warning(disable:4231)
- #pragma warning(disable:4189)
- #pragma warning(disable:4702)
-#endif
-
-#ifdef _MSC_VER
- #pragma warning(pop)
-#endif
+#include "PolarSSL++/Sha1Checksum.h"
@@ -876,7 +864,7 @@ void cProtocol132::StartEncryption(const Byte * a_Key)
m_IsEncrypted = true;
// Prepare the m_AuthServerID:
- cSHA1Checksum Checksum;
+ cSha1Checksum Checksum;
cServer * Server = cRoot::Get()->GetServer();
AString ServerID = Server->GetServerID();
Checksum.Update((const Byte *)ServerID.c_str(), ServerID.length());
@@ -884,7 +872,7 @@ void cProtocol132::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);
}