diff options
| author | Richard Moore <rich@kde.org> | 2012-05-06 14:28:31 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-06 20:42:00 +0200 |
| commit | e2a77de72615d8367caa0ff7123975b4321bde0e (patch) | |
| tree | 3fa9b1fd06d2357992b63f555d44fe3c39d73b64 /src/network/ssl/qsslcertificate.cpp | |
| parent | eee3798f6f69b99dbe0c6a95ca0a4011a8776c19 (diff) | |
Various minor fixes for qdoc warnings.
Change-Id: I54c5ab6e1bfb1816bb510be9e2bfa1e3362faa36
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/network/ssl/qsslcertificate.cpp')
| -rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 95b8a8e8fa..1fc84cbec1 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -447,10 +447,10 @@ QList<QByteArray> QSslCertificate::issuerInfoAttributes() const #if QT_DEPRECATED_SINCE(5,0) /*! - \fn QMultiMap<QSsl::AlternateNameEntryType, QString> alternateSubjectNames() const + \fn QMultiMap<QSsl::AlternateNameEntryType, QString> QSslCertificate::alternateSubjectNames() const \obsolete - Use subjectAlternativeNames(); + Use QSslCertificate::subjectAlternativeNames(); */ #endif @@ -920,11 +920,13 @@ QList<QSslCertificate> 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 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, + Verifies a certificate chain. The chain to be verified is passed in the + \a certificateChain parameter. The first certificate in the list should + be the leaf certificate of the chain to be verified. 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 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. |