dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile of Utilities::Hmac with Qt 6.3

Browse Source
This commit is contained in:
Jonas Kvinge
2021-07-07 23:54:21 +02:00
parent 2a7312f2b4
commit 2bee41e90e
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/utilities.cpp
View File

@@ -469,7 +469,7 @@ void OpenInFileBrowser(const QList<QUrl> &urls) {
} }
QByteArray Hmac(const QByteArray &key, const QByteArray &data, const HashFunction method) { QByteArray Hmac(const QByteArray &key, const QByteArray &data, const QCryptographicHash::Algorithm method) {
const int kBlockSize = 64; // bytes const int kBlockSize = 64; // bytes
Q_ASSERT(key.length() <= kBlockSize); Q_ASSERT(key.length() <= kBlockSize);
@@ -481,28 +481,29 @@ QByteArray Hmac(const QByteArray &key, const QByteArray &data, const HashFunctio
inner_padding[i] = inner_padding[i] ^ key[i]; inner_padding[i] = inner_padding[i] ^ key[i];
outer_padding[i] = outer_padding[i] ^ key[i]; outer_padding[i] = outer_padding[i] ^ key[i];
} }
if (Md5_Algo == method) {
return QCryptographicHash::hash(outer_padding + QCryptographicHash::hash(inner_padding + data, QCryptographicHash::Md5), QCryptographicHash::Md5); QByteArray part;
} part.append(inner_padding);
else if (Sha1_Algo == method) { part.append(data);
return QCryptographicHash::hash(outer_padding + QCryptographicHash::hash(inner_padding + data, QCryptographicHash::Sha1), QCryptographicHash::Sha1);
} QByteArray total;
else { // Sha256_Algo, currently default total.append(outer_padding);
return QCryptographicHash::hash(outer_padding + QCryptographicHash::hash(inner_padding + data, QCryptographicHash::Sha256), QCryptographicHash::Sha256); total.append(QCryptographicHash::hash(part, method));
}
return QCryptographicHash::hash(total, method);
} }
QByteArray HmacSha256(const QByteArray &key, const QByteArray &data) { QByteArray HmacSha256(const QByteArray &key, const QByteArray &data) {
return Hmac(key, data, Sha256_Algo); return Hmac(key, data, QCryptographicHash::Sha256);
} }
QByteArray HmacMd5(const QByteArray &key, const QByteArray &data) { QByteArray HmacMd5(const QByteArray &key, const QByteArray &data) {
return Hmac(key, data, Md5_Algo); return Hmac(key, data, QCryptographicHash::Md5);
} }
QByteArray HmacSha1(const QByteArray &key, const QByteArray &data) { QByteArray HmacSha1(const QByteArray &key, const QByteArray &data) {
return Hmac(key, data, Sha1_Algo); return Hmac(key, data, QCryptographicHash::Sha1);
} }
QByteArray Sha1CoverHash(const QString &artist, const QString &album) { QByteArray Sha1CoverHash(const QString &artist, const QString &album) {

8
src/core/utilities.h
View File

@@ -41,6 +41,7 @@
#include <QColor> #include <QColor>
#include <QRegion> #include <QRegion>
#include <QtEvents> #include <QtEvents>
#include <QCryptographicHash>
#include "core/song.h" #include "core/song.h"
@@ -71,12 +72,7 @@ bool Copy(QIODevice *source, QIODevice *destination);
void OpenInFileBrowser(const QList<QUrl> &urls); void OpenInFileBrowser(const QList<QUrl> &urls);
enum HashFunction { QByteArray Hmac(const QByteArray &key, const QByteArray &data, const QCryptographicHash::Algorithm method);
Md5_Algo,
Sha256_Algo,
Sha1_Algo,
};
QByteArray Hmac(const QByteArray &key, const QByteArray &data, const HashFunction method);
QByteArray HmacMd5(const QByteArray &key, const QByteArray &data); QByteArray HmacMd5(const QByteArray &key, const QByteArray &data);
QByteArray HmacSha256(const QByteArray &key, const QByteArray &data); QByteArray HmacSha256(const QByteArray &key, const QByteArray &data);
QByteArray HmacSha1(const QByteArray &key, const QByteArray &data); QByteArray HmacSha1(const QByteArray &key, const QByteArray &data);