diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-02-26 00:25:49 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-02-27 09:10:09 +0000 |
| commit | e388d219a4a29e7a5a81ff1a6dcf995662177b43 (patch) | |
| tree | 69a84df389ae9fd28da31dfd722336d5693ab647 /src/concurrent/qtconcurrentthreadengine.cpp | |
| parent | 863eb576c879e0284e794b60ff8450c468f6ae3a (diff) | |
QCryptographicHash: don't include openssl/sha.h
... it conflicts with rfc6234/sha.h's SHA{1,224,256,384,512} symbols.
We can't drop the rfc6234/sha.h header, as openssl/sha.h doesn't give
us the algorithm's block sizes, necessary for HMAC
(QMessageAuthenticationCode).
But we can drop openssl/sha.h. The only reason we included the header
was to get access to SHA<N>_DIGEST_LENGTH, but this is a well-known
value and easily obtained from rfc6234/sha.h as SHA<N>HashSize, so use
that.
Even reduces #ifdef'ery.
Amends d9f9d03fd34d951eb587fe082a0dbda33b8df248.
Fixes: QTBUG-111467
Pick-to: 6.5
Change-Id: Ice19ad8c788fb2828666647cc40abb894cd7af2b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/concurrent/qtconcurrentthreadengine.cpp')
0 files changed, 0 insertions, 0 deletions