Add ephemeralServerKey to isNull() and operator==

Change-Id: Iacd0f55886847630b84a8037d8d26504c558c90e
Reviewed-by: Sebastian Lösch <Sebastian.Loesch@governikus.com>
Reviewed-by: Markus Goetz (Woboq GmbH) <markus@woboq.com>
bb10
André Klitzing 2016-04-28 17:34:16 +02:00
parent 432d3b6962
commit aebb54b24b
2 changed files with 3 additions and 0 deletions

View File

@ -211,6 +211,7 @@ bool QSslConfiguration::operator==(const QSslConfiguration &other) const
d->sessionProtocol == other.d->sessionProtocol &&
d->ciphers == other.d->ciphers &&
d->ellipticCurves == other.d->ellipticCurves &&
d->ephemeralServerKey == other.d->ephemeralServerKey &&
d->caCertificates == other.d->caCertificates &&
d->protocol == other.d->protocol &&
d->peerVerifyMode == other.d->peerVerifyMode &&
@ -252,6 +253,7 @@ bool QSslConfiguration::isNull() const
d->caCertificates.count() == 0 &&
d->ciphers.count() == 0 &&
d->ellipticCurves.isEmpty() &&
d->ephemeralServerKey.isNull() &&
d->localCertificateChain.isEmpty() &&
d->privateKey.isNull() &&
d->peerCertificate.isNull() &&

View File

@ -88,6 +88,7 @@ public:
peerSessionShared(false),
sslOptions(QSslConfigurationPrivate::defaultSslOptions),
sslSessionTicketLifeTimeHint(-1),
ephemeralServerKey(),
nextProtocolNegotiationStatus(QSslConfiguration::NextProtocolNegotiationNone)
{ }