diff options
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 16 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 4 |
2 files changed, 11 insertions, 9 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. diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 6f031f241c..a041a2aaf1 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -757,7 +757,7 @@ qint64 QSslSocket::encryptedBytesToWrite() const \reimp Returns true if you can read one while line (terminated by a single ASCII - '\n' character) of decrypted characters; otherwise, false is returned. + '\\n' character) of decrypted characters; otherwise, false is returned. */ bool QSslSocket::canReadLine() const { @@ -1673,7 +1673,7 @@ void QSslSocket::startClientEncryption() initiate the SSL handshake. Most servers will call this function immediately upon receiving a connection, or as a result of having received a protocol-specific command to enter SSL mode (e.g, the - server may respond to receiving the string "STARTTLS\r\n" by + server may respond to receiving the string "STARTTLS\\r\\n" by calling this function). The most common way to implement an SSL server is to create a |