QMessageAuthenticationCode: have setKey() call initMessageHash()

All callers of Private::setKey() follow the call with one to
initMessageHash(), so move the call into setKey(). We can't remove
initMessageHash(), because reset() still needs to call it without a
setKey().

Pick-to: 6.5
Change-Id: I1fc8cd5cda90f1595cedcc323a4cee8baa7ce6a5
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Mårten Nordheim <[email protected]>

1 files changed, 2 insertions, 3 deletions

diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp
index 72c13d247b1..dbb2448c1f7 100644
--- a/src/corelib/tools/qcryptographichash.cpp
+++ b/src/corelib/tools/qcryptographichash.cpp
@@ -1352,6 +1352,8 @@ void QMessageAuthenticationCodePrivate::setKey(QByteArrayView newKey) noexcept
 
     if (key.size() < blockSize)
         key.resize(blockSize, '\0');
+
+    initMessageHash();
 }
 
 /*!
@@ -1414,7 +1416,6 @@ QMessageAuthenticationCode::QMessageAuthenticationCode(QCryptographicHash::Algor
     : d(new QMessageAuthenticationCodePrivate(method))
 {
     d->setKey(key);
-    d->initMessageHash();
 }
 
 /*!
@@ -1503,7 +1504,6 @@ void QMessageAuthenticationCode::setKey(QByteArrayView key) noexcept
 {
     d->messageHash.reset();
     d->setKey(key);
-    d->initMessageHash();
 }
 
 /*!
@@ -1594,7 +1594,6 @@ QByteArray QMessageAuthenticationCode::hash(QByteArrayView message, QByteArrayVi
 {
     QMessageAuthenticationCodePrivate mac(method);
     mac.setKey(key);
-    mac.initMessageHash();
     mac.messageHash.addData(message);
     mac.finalizeUnchecked();
     return mac.messageHash.resultView().toByteArray();