diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2016-05-25 21:24:25 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-05-25 20:00:12 +0000 |
| commit | 2cf63c71ebe139890526057dcc51b24ea6df6c30 (patch) | |
| tree | e444f983ebd0a0de69278c68834863f56e32afa8 /src/network/ssl/qsslconfiguration_p.h | |
| parent | 6d9f648d0ed591a0afba018adfbb089871f67b38 (diff) | |
Add settable QSslDiffieHellmanParameters for QSslSocket-based servers.
Only the OpenSSL backend is supported right now.
[ChangeLog][QtNetwork][SSL/TLS support] It is now possible to
set custom Diffie-Hellman parameters for QSslSocket-based servers.
Change-Id: I50148873132cd0ec7e414250b107b6b4cbde02ea
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Diffstat (limited to 'src/network/ssl/qsslconfiguration_p.h')
| -rw-r--r-- | src/network/ssl/qsslconfiguration_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h index 5ab0ef36e4..139a9fc32b 100644 --- a/src/network/ssl/qsslconfiguration_p.h +++ b/src/network/ssl/qsslconfiguration_p.h @@ -73,6 +73,7 @@ #include "qsslcipher.h" #include "qsslkey.h" #include "qsslellipticcurve.h" +#include "qssldiffiehellmanparameters.h" QT_BEGIN_NAMESPACE @@ -87,6 +88,7 @@ public: allowRootCertOnDemandLoading(true), peerSessionShared(false), sslOptions(QSslConfigurationPrivate::defaultSslOptions), + dhParams(QSslDiffieHellmanParameters::defaultParameters()), sslSessionTicketLifeTimeHint(-1), ephemeralServerKey(), preSharedKeyIdentityHint(), @@ -118,6 +120,8 @@ public: QVector<QSslEllipticCurve> ellipticCurves; + QSslDiffieHellmanParameters dhParams; + QByteArray sslSession; int sslSessionTicketLifeTimeHint; |