23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
|
diff -up qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket.cpp.me qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket.cpp
|
||
|
|
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket.cpp.me 2023-06-09 16:41:34.702124706 +0200
|
||
|
|
+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket.cpp 2023-06-09 16:42:50.152993830 +0200
|
||
|
|
@@ -1863,6 +1863,10 @@ QSslSocketPrivate::QSslSocketPrivate()
|
||
|
|
, plainSocket(0)
|
||
|
|
{
|
||
|
|
QSslConfigurationPrivate::deepCopyDefaultConfiguration(&configuration);
|
||
|
|
+ // If the global configuration doesn't allow root certificates to be loaded
|
||
|
|
+ // on demand then we have to disable it for this socket as well.
|
||
|
|
+ if (!configuration.allowRootCertOnDemandLoading)
|
||
|
|
+ allowRootCertOnDemandLoading = false;
|
||
|
|
}
|
||
|
|
|
||
|
|
/*!
|
||
|
|
@@ -2041,6 +2045,7 @@ void QSslConfigurationPrivate::deepCopyD
|
||
|
|
ptr->sessionCipher = global->sessionCipher;
|
||
|
|
ptr->ciphers = global->ciphers;
|
||
|
|
ptr->caCertificates = global->caCertificates;
|
||
|
|
+ ptr->allowRootCertOnDemandLoading = global->allowRootCertOnDemandLoading;
|
||
|
|
ptr->protocol = global->protocol;
|
||
|
|
ptr->peerVerifyMode = global->peerVerifyMode;
|
||
|
|
ptr->peerVerifyDepth = global->peerVerifyDepth;
|