flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Update mbedtls to 2.5.1 (#3964)

Browse Source 
* Renaming changes:
  * macro prefix "POLARSSL" -> "MBEDTLS"
  * functions now prefixed with "mbedtls_"
  * rename PolarSSL++ -> mbedTLS++
  * rename polarssl submodule

* Use mbedtls' AES-CFB8 implementation.

* Add cSslConfig to wrap mbedtls_ssl_config

* Update cTCPLink and cBlockingSslClientSocket to use cSslConfig

* Use cSslConfig in cHTTPServer

* Use cSslConfig for cMojangAPI::SecureRequest

* CI Fixes

* Set -fomit-frame-pointer on the right target
This commit is contained in:
peterbell10
2017-08-30 15:00:06 +01:00
committed by Tiger Wang
parent c6bc822054
commit 84941bcc9f
59 changed files with 952 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/UUID.cpp
View File

@@ -5,7 +5,7 @@
#include "Globals.h"
#include "UUID.h"
#include "polarssl/md5.h"
#include "mbedtls/md5.h"
/** UUID normalised in textual form. */
@@ -265,7 +265,7 @@ cUUID cUUID::GenerateVersion3(const AString & a_Name)
cUUID UUID;
// Generate an md5 checksum, and use it as base for the ID:
const Byte * ByteString = reinterpret_cast<const Byte *>(a_Name.data());
md5(ByteString, a_Name.length(), UUID.m_UUID.data());
mbedtls_md5(ByteString, a_Name.length(), UUID.m_UUID.data());
// Insert version number
UUID.m_UUID[6] = (UUID.m_UUID[6] & 0x0f) | 0x30;