diff options
Diffstat (limited to 'net/qt5-networkauth')
| -rw-r--r-- | net/qt5-networkauth/Makefile | 1 | ||||
| -rw-r--r-- | net/qt5-networkauth/distinfo | 6 | ||||
| -rw-r--r-- | net/qt5-networkauth/files/patch-src_oauth_qabstractoauth.cpp | 55 |
3 files changed, 3 insertions, 59 deletions
diff --git a/net/qt5-networkauth/Makefile b/net/qt5-networkauth/Makefile index de0a0948bc2d..2255dfdc9dbf 100644 --- a/net/qt5-networkauth/Makefile +++ b/net/qt5-networkauth/Makefile @@ -1,6 +1,5 @@ PORTNAME= networkauth PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 CATEGORIES= net PKGNAMEPREFIX= qt5- diff --git a/net/qt5-networkauth/distinfo b/net/qt5-networkauth/distinfo index ce5eb6b35692..32c8c8025666 100644 --- a/net/qt5-networkauth/distinfo +++ b/net/qt5-networkauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711771154 -SHA256 (KDE/Qt/5.15.13/kde-qtnetworkauth-5.15.13p0.tar.xz) = ff183120c28b0cc211f9e0577e18e03f0c3a6aca12e79fefceb121409a946546 -SIZE (KDE/Qt/5.15.13/kde-qtnetworkauth-5.15.13p0.tar.xz) = 120076 +TIMESTAMP = 1716930659 +SHA256 (KDE/Qt/5.15.14/kde-qtnetworkauth-5.15.14p1.tar.xz) = 786e1dbdbd2160f8e1139855b7ea9030d37d97447a34e1edb9e9e06899b4c309 +SIZE (KDE/Qt/5.15.14/kde-qtnetworkauth-5.15.14p1.tar.xz) = 120152 diff --git a/net/qt5-networkauth/files/patch-src_oauth_qabstractoauth.cpp b/net/qt5-networkauth/files/patch-src_oauth_qabstractoauth.cpp deleted file mode 100644 index 7bcad530ec0f..000000000000 --- a/net/qt5-networkauth/files/patch-src_oauth_qabstractoauth.cpp +++ /dev/null @@ -1,55 +0,0 @@ -Address CVE-2024-36048. - -https://www.qt.io/blog/security-advisory-qstringconverter-0 - ---- src/oauth/qabstractoauth.cpp.orig 2024-01-04 19:21:59 UTC -+++ src/oauth/qabstractoauth.cpp -@@ -37,7 +37,6 @@ - #include <QtCore/qurl.h> - #include <QtCore/qpair.h> - #include <QtCore/qstring.h> --#include <QtCore/qdatetime.h> - #include <QtCore/qurlquery.h> - #include <QtCore/qjsondocument.h> - #include <QtCore/qmessageauthenticationcode.h> -@@ -46,6 +45,9 @@ - #include <QtNetwork/qnetworkaccessmanager.h> - #include <QtNetwork/qnetworkreply.h> - -+#include <QtCore/qrandom.h> -+#include <QtCore/private/qlocking_p.h> -+ - #include <random> - - Q_DECLARE_METATYPE(QAbstractOAuth::Error) -@@ -290,15 +292,19 @@ void QAbstractOAuthPrivate::setStatus(QAbstractOAuth:: - } - } - -+static QBasicMutex prngMutex; -+Q_GLOBAL_STATIC_WITH_ARGS(std::mt19937, prng, (*QRandomGenerator::system())) -+ - QByteArray QAbstractOAuthPrivate::generateRandomString(quint8 length) - { -- const char characters[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; -- static std::mt19937 randomEngine(QDateTime::currentDateTime().toMSecsSinceEpoch()); -+ constexpr char characters[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - std::uniform_int_distribution<int> distribution(0, sizeof(characters) - 2); - QByteArray data; - data.reserve(length); -+ auto lock = qt_unique_lock(prngMutex); - for (quint8 i = 0; i < length; ++i) -- data.append(characters[distribution(randomEngine)]); -+ data.append(characters[distribution(*prng)]); -+ lock.unlock(); - return data; - } - -@@ -614,6 +620,7 @@ void QAbstractOAuth::resourceOwnerAuthorization(const - } - - /*! -+ \threadsafe - Generates a random string which could be used as state or nonce. - The parameter \a length determines the size of the generated - string. |