QCryptographicHashPrivate: repack, by moving the enum to the end
QCryptographicHashPrivate::SmallByteArray is a 65-byte type, so there were 7 bytes of padding at the end of QCryptographicHashPrivate anyway. Pick-to: 6.5 Change-Id: Ide4dbd0777a44ed0870efffd17394e1d5431e052 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
parent
ccad719d2e
commit
92a7c36020
@ -220,8 +220,6 @@ public:
|
|||||||
QByteArrayView resultView() const noexcept { return result.toByteArrayView(); }
|
QByteArrayView resultView() const noexcept { return result.toByteArrayView(); }
|
||||||
static bool supportsAlgorithm(QCryptographicHash::Algorithm method);
|
static bool supportsAlgorithm(QCryptographicHash::Algorithm method);
|
||||||
|
|
||||||
const QCryptographicHash::Algorithm method;
|
|
||||||
|
|
||||||
#ifdef USING_OPENSSL30
|
#ifdef USING_OPENSSL30
|
||||||
struct EVP_MD_CTX_deleter {
|
struct EVP_MD_CTX_deleter {
|
||||||
void operator()(EVP_MD_CTX *ctx) const noexcept {
|
void operator()(EVP_MD_CTX *ctx) const noexcept {
|
||||||
@ -279,6 +277,8 @@ public:
|
|||||||
QBasicMutex finalizeMutex;
|
QBasicMutex finalizeMutex;
|
||||||
SmallByteArray result;
|
SmallByteArray result;
|
||||||
|
|
||||||
|
const QCryptographicHash::Algorithm method;
|
||||||
|
|
||||||
#if !defined(QT_CRYPTOGRAPHICHASH_ONLY_SHA1) && !defined(USING_OPENSSL30)
|
#if !defined(QT_CRYPTOGRAPHICHASH_ONLY_SHA1) && !defined(USING_OPENSSL30)
|
||||||
enum class Sha3Variant
|
enum class Sha3Variant
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user