From ca724e00f8016efd3a3d45e08904eb0c5eb149f8 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Wed, 14 Oct 2026 21:11:55 +0800 Subject: [PATCH] Use the Mbed TLS compat wrappers for MD5 key derivation --- src/crypto/keys.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/crypto/keys.cpp b/src/crypto/keys.cpp index 57439ce0..091d6245 100644 --- a/src/crypto/keys.cpp +++ b/src/crypto/keys.cpp @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-3.0-or-later */ #include "crypto/keys.hpp" +#include "crypto/mbedtls_compat.hpp" #include #include @@ -30,12 +31,12 @@ bool derive_key(const char *password, std::span key) noexcept bool ok = true; for (bool first = true; at < key.size(); first = false) { mbedtls_md5_init(&md5); - ok = ok && mbedtls_md5_starts(&md5) == 0; + ok = ok && mbed::md5_starts(&md5) == 0; if (!first) { - ok = ok && mbedtls_md5_update(&md5, digest, sizeof(digest)) == 0; + ok = ok && mbed::md5_update(&md5, digest, sizeof(digest)) == 0; } - ok = ok && mbedtls_md5_update(&md5, reinterpret_cast(password), len) == 0 - && mbedtls_md5_finish(&md5, digest) == 0; + ok = ok && mbed::md5_update(&md5, reinterpret_cast(password), len) == 0 + && mbed::md5_finish(&md5, digest) == 0; mbedtls_md5_free(&md5); std::size_t n = std::min(sizeof(digest), key.size() - at); std::memcpy(key.data() + at, digest, n);