1 files changed, 77 insertions, 9 deletions
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
index 7e92d3a526..f5ce02807f 100644
--- a/src/network/ssl/qsslconfiguration.cpp
+++ b/src/network/ssl/qsslconfiguration.cpp
@@ -631,11 +631,10 @@ QList<QSslCipher> QSslConfiguration::supportedCiphers()
   Returns this connection's CA certificate database. The CA certificate
   database is used by the socket during the handshake phase to
   validate the peer's certificate. It can be modified prior to the
-  handshake with setCaCertificates(), or with \l{QSslSocket}'s
-  \l{QSslSocket::}{addCaCertificate()} and
-  \l{QSslSocket::}{addCaCertificates()}.
+  handshake with setCaCertificates(), or with addCaCertificate() and
+  addCaCertificates().
 
-  \sa setCaCertificates()
+  \sa setCaCertificates(), addCaCertificate(), addCaCertificates()
 */
 QList<QSslCertificate> QSslConfiguration::caCertificates() const
 {
@@ -652,7 +651,7 @@ QList<QSslCertificate> QSslConfiguration::caCertificates() const
   that is not available (as is commonly the case on iOS), the default database
   is empty.
 
-  \sa caCertificates()
+  \sa caCertificates(), addCaCertificates(), addCaCertificate()
 */
 void QSslConfiguration::setCaCertificates(const QList<QSslCertificate> &certificates)
 {
@@ -661,6 +660,74 @@ void QSslConfiguration::setCaCertificates(const QList<QSslCertificate> &certific
 }
 
 /*!
+  \since 5.15
+
+  Searches all files in the \a path for certificates encoded in the
+  specified \a format and adds them to this socket's CA certificate
+  database. \a path must be a file or a pattern matching one or more
+  files, as specified by \a syntax. Returns \c true if one or more
+  certificates are added to the socket's CA certificate database;
+  otherwise returns \c false.
+
+  The CA certificate database is used by the socket during the
+  handshake phase to validate the peer's certificate.
+
+  For more precise control, use addCaCertificate().
+
+  \sa addCaCertificate(), QSslCertificate::fromPath()
+*/
+bool QSslConfiguration::addCaCertificates(const QString &path, QSsl::EncodingFormat format,
+                                          QSslCertificate::PatternSyntax syntax)
+{
+    QList<QSslCertificate> certs = QSslCertificate::fromPath(path, format, syntax);
+    if (certs.isEmpty())
+        return false;
+
+    d->caCertificates += certs;
+    return true;
+}
+
+/*!
+    \since 5.15
+
+    Adds \a certificate to this configuration's CA certificate database.
+    The certificate database must be set prior to the SSL handshake.
+    The CA certificate database is used by the socket during the
+    handshake phase to validate the peer's certificate.
+
+    \note The default configuration uses the system CA certificate database. If
+    that is not available (as is commonly the case on iOS), the default database
+    is empty.
+
+  \sa caCertificates(), setCaCertificates(), addCaCertificates()
+*/
+void QSslConfiguration::addCaCertificate(const QSslCertificate &certificate)
+{
+    d->caCertificates += certificate;
+    d->allowRootCertOnDemandLoading = false;
+}
+
+/*!
+    \since 5.15
+
+    Adds \a certificates to this configuration's CA certificate database.
+    The certificate database must be set prior to the SSL handshake.
+    The CA certificate database is used by the socket during the
+    handshake phase to validate the peer's certificate.
+
+    \note The default configuration uses the system CA certificate database. If
+    that is not available (as is commonly the case on iOS), the default database
+    is empty.
+
+  \sa caCertificates(), setCaCertificates(), addCaCertificate()
+*/
+void QSslConfiguration::addCaCertificates(const QList<QSslCertificate> &certificates)
+{
+    d->caCertificates += certificates;
+    d->allowRootCertOnDemandLoading = false;
+}
+
+/*!
     \since 5.5
 
     This function provides the CA certificate database
@@ -668,7 +735,8 @@ void QSslConfiguration::setCaCertificates(const QList<QSslCertificate> &certific
     returned by this function is used to initialize the database
     returned by caCertificates() on the default QSslConfiguration.
 
-    \sa caCertificates(), setCaCertificates(), defaultConfiguration()
+    \sa caCertificates(), setCaCertificates(), defaultConfiguration(),
+    addCaCertificate(), addCaCertificates()
 */
 QList<QSslCertificate> QSslConfiguration::systemCaCertificates()
 {
@@ -714,7 +782,7 @@ bool QSslConfiguration::testSslOption(QSsl::SslOption option) const
   knowledge of the session allows for eavesdropping on data
   encrypted with the session parameters.
 
-  \sa setSessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption()
+  \sa setSessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption(), QSslSocket::newSessionTicketReceived()
  */
 QByteArray QSslConfiguration::sessionTicket() const
 {
@@ -729,7 +797,7 @@ QByteArray QSslConfiguration::sessionTicket() const
   for this to work, and \a sessionTicket must be in ASN.1 format
   as returned by sessionTicket().
 
-  \sa sessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption()
+  \sa sessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption(), QSslSocket::newSessionTicketReceived()
  */
 void QSslConfiguration::setSessionTicket(const QByteArray &sessionTicket)
 {
@@ -747,7 +815,7 @@ void QSslConfiguration::setSessionTicket(const QByteArray &sessionTicket)
   QSsl::SslOptionDisableSessionPersistence was not turned off,
   this function returns -1.
 
-  \sa sessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption()
+  \sa sessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption(), QSslSocket::newSessionTicketReceived()
  */
 int QSslConfiguration::sessionTicketLifeTimeHint() const
 {