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

QMessageAuthenticationCode: make messageHash a QCryptographicHashPrivate

Browse Source 
... avoiding one more memory allocation, and giving us access to
QCryptographicHashPrivate::result, for use in subsequent commits.

The only real adjustment to users of QMACPrivate::messageHash is that
instead of

   messageHash.result();

they now need to use

   messageHash.finalizeUnchecked();
   messageHash.resultView() // .toByteArray()

I.e. explicitly finalize.

Pick-to: 6.5
Change-Id: I80b1158b062554bbf8afa7241674a892de27f204
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2023-02-23 15:45:46 +01:00
parent d53f8d6bbb
commit 494786ce73
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

@ -996,7 +996,7 @@ public:
QByteArray key; QByteArray key;
QByteArray result; QByteArray result;
QBasicMutex finalizeMutex; QBasicMutex finalizeMutex;
QCryptographicHash messageHash; QCryptographicHashPrivate messageHash;
const QCryptographicHash::Algorithm method; const QCryptographicHash::Algorithm method;
void initMessageHash(); void initMessageHash();
@ -1022,7 +1022,8 @@ void QMessageAuthenticationCodePrivate::initMessageHash()
if (key.size() > blockSize) { if (key.size() > blockSize) {
messageHash.addData(key); messageHash.addData(key);
key = messageHash.result(); messageHash.finalizeUnchecked();
key = messageHash.resultView().toByteArray();
messageHash.reset(); messageHash.reset();
} }
@ -1186,6 +1187,7 @@ void QMessageAuthenticationCodePrivate::finalizeUnchecked()
{ {
const int blockSize = qt_hash_block_size(method); const int blockSize = qt_hash_block_size(method);
messageHash.finalizeUnchecked();
QByteArrayView hashedMessage = messageHash.resultView(); QByteArrayView hashedMessage = messageHash.resultView();
QVarLengthArray<char> oKeyPad(blockSize); QVarLengthArray<char> oKeyPad(blockSize);