1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QCryptographicHash[OpenSSL]: allow to get intermediary result

Browse Source 
OpenSSL doesn't allow to add additional data when the hash has been
finalized. To fix that, we just make a copy of the current context
and call EVP_DigestFinal_ex() on the copy so we can still later add
additional data.

Change-Id: If76d4ec56f8846d6ef55ed7ec7cbab440d43edd0
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
(cherry picked from commit 698c7696ebff4868c695bb6d7ca66ed17b5c2f3b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Jan Grulich 2023-01-11 12:06:16 +01:00 committed by Qt Cherry-pick Bot
parent 0700f561b0
commit f025428d5b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/tools/qcryptographichash.cpp
View File

@ -752,9 +752,11 @@ void QCryptographicHashPrivate::finalize() noexcept
tmpresult.resizeForOverwrite(length);
blake2s_final(&copy, tmpresult.data(), length);
} else if (!initializationFailed) {
EVP_MD_CTX_ptr copy = EVP_MD_CTX_ptr(EVP_MD_CTX_new());
EVP_MD_CTX_copy_ex(copy.get(), context.get());
tmpresult.resizeForOverwrite(EVP_MD_get_size(algorithm.get()));
const int ret = EVP_DigestFinal_ex(context.get(), tmpresult.data(), nullptr);
Q_UNUSED(ret);
const int ret = EVP_DigestFinal_ex(copy.get(), tmpresult.data(), nullptr);
Q_UNUSED(ret)
}
#else
switch (method) {