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

QCryptographicHash: separate EVP and non-EVP OpenSSL3 operations

Browse Source 
These, too, will end up on different classes, eventually. The
addData() function is the odd one out here, as it's EVP part it
trivial.

Pick-to: 6.5
Change-Id: I24c7334edd8ba218e4cfcb64d0ed67bc281c4525
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Marc Mutz 2023-02-24 11:19:34 +01:00
parent 9248d0cfbe
commit 51b1a9963d
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,6 +330,10 @@ public:
EVP_MD_ptr algorithm; EVP_MD_ptr algorithm;
EVP_MD_CTX_ptr context; EVP_MD_CTX_ptr context;
bool initializationFailed = false; bool initializationFailed = false;
void evp_init();
void evp_reset() noexcept;
void evp_finalizeUnchecked() noexcept;
#endif #endif
union { union {
@ -539,14 +543,17 @@ void QCryptographicHashPrivate::init()
method == QCryptographicHash::Blake2b_256 || method == QCryptographicHash::Blake2b_256 ||
method == QCryptographicHash::Blake2b_384) { method == QCryptographicHash::Blake2b_384) {
new (&blake2bContext) blake2b_state; new (&blake2bContext) blake2b_state;
return;
} else if (method == QCryptographicHash::Blake2s_128 || } else if (method == QCryptographicHash::Blake2s_128 ||
method == QCryptographicHash::Blake2s_160 || method == QCryptographicHash::Blake2s_160 ||
method == QCryptographicHash::Blake2s_224) { method == QCryptographicHash::Blake2s_224) {
new (&blake2sContext) blake2s_state; new (&blake2sContext) blake2s_state;
return; } else {
evp_init();
} }
}
void QCryptographicHashPrivate::evp_init()
{
Q_ASSERT(!context); Q_ASSERT(!context);
initializationFailed = true; initializationFailed = true;
@ -652,14 +659,17 @@ void QCryptographicHashPrivate::reset() noexcept
method == QCryptographicHash::Blake2b_256 || method == QCryptographicHash::Blake2b_256 ||
method == QCryptographicHash::Blake2b_384) { method == QCryptographicHash::Blake2b_384) {
blake2b_init(&blake2bContext, hashLengthInternal(method)); blake2b_init(&blake2bContext, hashLengthInternal(method));
return;
} else if (method == QCryptographicHash::Blake2s_128 || } else if (method == QCryptographicHash::Blake2s_128 ||
method == QCryptographicHash::Blake2s_160 || method == QCryptographicHash::Blake2s_160 ||
method == QCryptographicHash::Blake2s_224) { method == QCryptographicHash::Blake2s_224) {
blake2s_init(&blake2sContext, hashLengthInternal(method)); blake2s_init(&blake2sContext, hashLengthInternal(method));
return; } else {
evp_reset();
} }
}
void QCryptographicHashPrivate::evp_reset() noexcept
{
if (!initializationFailed) { if (!initializationFailed) {
Q_ASSERT(context); Q_ASSERT(context);
Q_ASSERT(algorithm); Q_ASSERT(algorithm);
@ -950,7 +960,14 @@ void QCryptographicHashPrivate::finalizeUnchecked() noexcept
blake2s_state copy = blake2sContext; blake2s_state copy = blake2sContext;
result.resizeForOverwrite(length); result.resizeForOverwrite(length);
blake2s_final(&copy, result.data(), length); blake2s_final(&copy, result.data(), length);
} else if (!initializationFailed) { } else {
evp_finalizeUnchecked();
}
}
void QCryptographicHashPrivate::evp_finalizeUnchecked() noexcept
{
if (!initializationFailed) {
EVP_MD_CTX_ptr copy = EVP_MD_CTX_ptr(EVP_MD_CTX_new()); EVP_MD_CTX_ptr copy = EVP_MD_CTX_ptr(EVP_MD_CTX_new());
EVP_MD_CTX_copy_ex(copy.get(), context.get()); EVP_MD_CTX_copy_ex(copy.get(), context.get());
result.resizeForOverwrite(EVP_MD_get_size(algorithm.get())); result.resizeForOverwrite(EVP_MD_get_size(algorithm.get()));