diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-06-12 11:11:08 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-07-01 11:26:15 +0200 |
| commit | 37d9e44cd010c9844b0dbe2b25f307eab15b3ea8 (patch) | |
| tree | 930a202df40ba87e2d37532b07dd21be847531c1 /src/network/ssl/qsslconfiguration.h | |
| parent | 4fbb040f754b7db310018394dd7ea6f5c997d50e (diff) | |
QSslConfiguration::setCiphers - introduce the overload taking QString
We had such an overloaded version in QSslSocket, it was deprecated without
providing any alternative. Now this function has some use and may be
introduced in Qt6, as QSslConfiguration::setCiphers(const QString &).
Last but not the least - a useless and strange auto-test was removed
(it was creating a list of 5 QSslCiphers each with isNull() == true).
That's becasue '!MD5' or 'ALL' (for example) is not a cipher to be found
in supportedCiphers.
Change-Id: I47eb4c0faa9b52885e883751dd992cd9cb3d26fe
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/ssl/qsslconfiguration.h')
| -rw-r--r-- | src/network/ssl/qsslconfiguration.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index 90a876b6c5..706ac5775f 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/src/network/ssl/qsslconfiguration.h @@ -125,6 +125,7 @@ public: // Cipher settings QList<QSslCipher> ciphers() const; void setCiphers(const QList<QSslCipher> &ciphers); + void setCiphers(const QString &ciphers); static QList<QSslCipher> supportedCiphers(); // Certificate Authority (CA) settings |