From 920487bf6b4d06ce9fef82e99e262ee0dd7d2ea3 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Fri, 8 May 2020 12:52:25 +0200 Subject: QSslSocket::setSslSonfiguration - set d.configuration properly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We end up with an absurd situation: QSslConfiguration conf; //we set CA certs so that on demand loading is disabled: conf.setCaCertificates({...}); QSslSocket s; s.setSslConfiguration(conf); Q_ASSERT(conf == s.sslConfiguration); // this assert fails. Pick-to: 5.15 Change-Id: I272bed145434082acc6ead95fe3640d222b21131 Reviewed-by: Mårten Nordheim --- src/network/ssl/qsslsocket.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/network/ssl') diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 5313e97430..5252f3348b 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1111,8 +1111,10 @@ void QSslSocket::setSslConfiguration(const QSslConfiguration &configuration) // if the CA certificates were set explicitly (either via // QSslConfiguration::setCaCertificates() or QSslSocket::setCaCertificates(), // we cannot load the certificates on demand - if (!configuration.d->allowRootCertOnDemandLoading) + if (!configuration.d->allowRootCertOnDemandLoading) { d->allowRootCertOnDemandLoading = false; + d->configuration.allowRootCertOnDemandLoading = false; + } } /*! -- cgit v1.2.3