From e11fac22c41f5f796bbfabc5088ff8a1cee3cd3b Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Tue, 12 Jul 2011 11:52:10 +0200 Subject: QSslCertificate: extend documentation for new verify method Change-Id: I47e038299a7e6ef18206839ff59ecef9f0860415 Reviewed-on: http://codereview.qt.nokia.com/1510 Reviewed-by: Qt Sanity Bot Reviewed-by: Markus Goetz --- src/network/ssl/qsslcertificate.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 41e54b2eb6..94273b0754 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -668,10 +668,14 @@ QList QSslCertificate::fromData(const QByteArray &data, QSsl::E } /*! - Verifies a certificate chain. If a hostName is specified then the certificate is - also checked to see if it is valid for the specified hostName. + Verifies a certificate chain. If \a hostName is specified then the certificate is + also checked to see if it is valid for the specified host name. Note that the first certificate in the list should be the leaf certificate of the chain to be verified. + The root (CA) certificate should not be included in the list to be verified, + this will be looked up automatically either using the CA list specified by + QSslSocket::defaultCaCertificates() or, if possible, it will be loaded on demand + on Unix. */ QList QSslCertificate::verify(QList certificateChain, const QString &hostName) { -- cgit v1.2.3