1
0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-15 09:25:37 +02:00

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

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

View File

@@ -13,7 +13,7 @@
#include "settings.h"
#include "util/hex.h"
#include "util/serialize.h"
#include "util/sha1.h"
#include "util/hashing.h"
#include "util/string.h"
#include <sstream>
@@ -537,12 +537,7 @@ bool IClientMediaDownloader::checkAndLoad(
std::string sha1_hex = hex_encode(sha1);
// Compute actual checksum of data
std::string data_sha1;
{
SHA1 ctx;
ctx.addBytes(data);
data_sha1 = ctx.getDigest();
}
std::string data_sha1 = hashing::sha1(data);
// Check that received file matches announced checksum
if (data_sha1 != sha1) {