diff options
author | peterbell10 <peterbell10@live.co.uk> | 2017-08-30 16:00:06 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@outlook.com> | 2017-08-30 16:00:06 +0200 |
commit | 84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7 (patch) | |
tree | aa1648c2ba260b8576673677435481d371eec7b0 /src/Bindings | |
parent | Update core plugins to latest version (#3951) (diff) | |
download | cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.tar cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.tar.gz cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.tar.bz2 cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.tar.lz cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.tar.xz cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.tar.zst cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.zip |
Diffstat (limited to 'src/Bindings')
-rw-r--r-- | src/Bindings/LuaTCPLink.cpp | 4 | ||||
-rw-r--r-- | src/Bindings/ManualBindings.cpp | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/Bindings/LuaTCPLink.cpp b/src/Bindings/LuaTCPLink.cpp index 905dfc5ac..3933e9b36 100644 --- a/src/Bindings/LuaTCPLink.cpp +++ b/src/Bindings/LuaTCPLink.cpp @@ -6,8 +6,8 @@ #include "Globals.h" #include "LuaTCPLink.h" #include "LuaServerHandle.h" -#include "../PolarSSL++/X509Cert.h" -#include "../PolarSSL++/CryptoKey.h" +#include "../mbedTLS++/X509Cert.h" +#include "../mbedTLS++/CryptoKey.h" diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp index ee9cb61e9..d4477bf4e 100644 --- a/src/Bindings/ManualBindings.cpp +++ b/src/Bindings/ManualBindings.cpp @@ -1,4 +1,4 @@ - + #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "ManualBindings.h" @@ -6,8 +6,8 @@ #include <sstream> #include <iomanip> #include "tolua++/include/tolua++.h" -#include "polarssl/md5.h" -#include "polarssl/sha1.h" +#include "mbedtls/md5.h" +#include "mbedtls/sha1.h" #include "PluginLua.h" #include "PluginManager.h" #include "LuaWindow.h" @@ -1838,7 +1838,7 @@ static int tolua_md5(lua_State * tolua_S) { return 0; } - md5(SourceString, len, Output); + mbedtls_md5(SourceString, len, Output); lua_pushlstring(tolua_S, reinterpret_cast<const char *>(Output), ARRAYCOUNT(Output)); return 1; } @@ -1869,7 +1869,7 @@ static int tolua_md5HexString(lua_State * tolua_S) { return 0; } - md5(SourceString, len, md5Output); + mbedtls_md5(SourceString, len, md5Output); // Convert the md5 checksum to hex string: std::stringstream Output; @@ -1896,7 +1896,7 @@ static int tolua_sha1(lua_State * tolua_S) { return 0; } - sha1(SourceString, len, Output); + mbedtls_sha1(SourceString, len, Output); lua_pushlstring(tolua_S, reinterpret_cast<const char *>(Output), ARRAYCOUNT(Output)); return 1; } @@ -1915,7 +1915,7 @@ static int tolua_sha1HexString(lua_State * tolua_S) { return 0; } - sha1(SourceString, len, sha1Output); + mbedtls_sha1(SourceString, len, sha1Output); // Convert the sha1 checksum to hex string: std::stringstream Output; |