dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace BytesToHexString with FormatArrayAsHex

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-11-13 23:26:05 +00:00
parent 6a35661db4
commit beee3cc369
6 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc.cpp
View File

@@ -40,6 +40,7 @@
#include "cargopacket.h"
#include "tbtr_template_vehicle_func.h"
#include "event_logs.h"
#include "string_func.h"
#include "3rdparty/monocypher/monocypher.h"
#include "safeguards.h"
@@ -77,7 +78,6 @@ void InitializeOldNames();
std::string GenerateUid(std::string_view subject)
{
extern void NetworkRandomBytesWithFallback(void *buf, size_t n);
extern std::string BytesToHexString(const byte *data, size_t length);
uint8 random_bytes[32];
NetworkRandomBytesWithFallback(random_bytes, lengthof(random_bytes));
@@ -90,7 +90,7 @@ std::string GenerateUid(std::string_view subject)
crypto_blake2b_update(&ctx, (const byte *)subject.data(), subject.size());
crypto_blake2b_final (&ctx, digest);
return BytesToHexString(digest, lengthof(digest));
return FormatArrayAsHex({digest, lengthof(digest)});
}
/**