luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 16:45:20 +02:00
Code Activity

Use openssl's sha1 and sha256, optionally (#15472)

Browse Source
This commit is contained in:
DS
2024-12-10 22:00:43 +01:00
committed by GitHub
parent 4f800dd2b4
commit bcbee873e8
17 changed files with 141 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server.cpp
View File

@@ -44,7 +44,7 @@
#include "defaultsettings.h"
#include "server/mods.h"
#include "util/base64.h"
#include "util/sha1.h"
#include "util/hashing.h"
#include "util/hex.h"
#include "database/database.h"
#include "chatmessage.h"
@@ -2548,14 +2548,11 @@ bool Server::addMediaFile(const std::string &filename,
return false;
}
SHA1 sha1;
sha1.addBytes(filedata);
std::string digest = sha1.getDigest();
std::string sha1_base64 = base64_encode(digest);
std::string sha1_hex = hex_encode(digest);
std::string sha1 = hashing::sha1(filedata);
std::string sha1_base64 = base64_encode(sha1);
std::string sha1_hex = hex_encode(sha1);
if (digest_to)
*digest_to = digest;
*digest_to = sha1;
// Put in list
m_media[filename] = MediaInfo(filepath, sha1_base64);