summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslconfiguration_p.h
diff options
context:
space:
mode:
authorAndré Klitzing <aklitzing@gmail.com>2016-03-23 12:27:11 +0100
committerAndré Klitzing <aklitzing@gmail.com>2016-05-02 20:33:00 +0000
commit0eaac0a3a95f8a74c06d062d3aa7928cbb09d493 (patch)
tree8b30219461b612a4cb934fd4334fee27d0eb3238 /src/network/ssl/qsslconfiguration_p.h
parent9f416fad366f24436204a67b6571024d7bebe98f (diff)
Add support for PSK on server side
[ChangeLog][QtNetwork][QSslSocket] TLS PSK ciphers are possible in server sockets. Task-number: QTBUG-39077 Change-Id: Iaa854a6f50242deae5492f2e4759c727488995f5 Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/ssl/qsslconfiguration_p.h')
-rw-r--r--src/network/ssl/qsslconfiguration_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h
index 093c9d6598..113954d7d1 100644
--- a/src/network/ssl/qsslconfiguration_p.h
+++ b/src/network/ssl/qsslconfiguration_p.h
@@ -88,6 +88,7 @@ public:
peerSessionShared(false),
sslOptions(QSslConfigurationPrivate::defaultSslOptions),
sslSessionTicketLifeTimeHint(-1),
+ preSharedKeyIdentityHint(),
nextProtocolNegotiationStatus(QSslConfiguration::NextProtocolNegotiationNone)
{ }
@@ -121,6 +122,8 @@ public:
QSslKey ephemeralServerKey;
+ QByteArray preSharedKeyIdentityHint;
+
QList<QByteArray> nextAllowedProtocols;
QByteArray nextNegotiatedProtocol;
QSslConfiguration::NextProtocolNegotiationStatus nextProtocolNegotiationStatus;