diff options
Diffstat (limited to 'src/network/ssl')
-rw-r--r-- | src/network/ssl/qsslcertificateextension.cpp | 54 | ||||
-rw-r--r-- | src/network/ssl/qsslconfiguration.cpp | 20 | ||||
-rw-r--r-- | src/network/ssl/qsslsocket.cpp | 10 |
3 files changed, 42 insertions, 42 deletions
diff --git a/src/network/ssl/qsslcertificateextension.cpp b/src/network/ssl/qsslcertificateextension.cpp index eef27d7c2e..89b1a929c8 100644 --- a/src/network/ssl/qsslcertificateextension.cpp +++ b/src/network/ssl/qsslcertificateextension.cpp @@ -58,26 +58,26 @@ \table \header - \o Property - \o Description + \li Property + \li Description \row - \o name - \o The human readable name of the extension, eg. 'basicConstraints'. + \li name + \li The human readable name of the extension, eg. 'basicConstraints'. \row - \o criticality - \o This is a boolean value indicating if the extension is critical + \li criticality + \li This is a boolean value indicating if the extension is critical to correctly interpreting the certificate. \row - \o oid - \o The ASN.1 object identifier that specifies which extension this + \li oid + \li The ASN.1 object identifier that specifies which extension this is. \row - \o supported - \o If this is true the structure of the extension's value will not + \li supported + \li If this is true the structure of the extension's value will not change between Qt versions. \row - \o value - \o A QVariant with a structure dependent on the type of extension. + \li value + \li A QVariant with a structure dependent on the type of extension. \endtable Whilst this class provides access to any type of extension, only @@ -90,28 +90,28 @@ \table \header - \o Name - \o OID - \o Details + \li Name + \li OID + \li Details \row - \o basicConstraints - \o 2.5.29.19 - \o Returned as a QVariantMap. The key 'ca' contains a boolean value, + \li basicConstraints + \li 2.5.29.19 + \li Returned as a QVariantMap. The key 'ca' contains a boolean value, the optional key 'pathLenConstraint' contains an integer. \row - \o authorityInfoAccess - \o 1.3.6.1.5.5.7.1.1 - \o Returned as a QVariantMap. There is a key for each access method, + \li authorityInfoAccess + \li 1.3.6.1.5.5.7.1.1 + \li Returned as a QVariantMap. There is a key for each access method, with the value being a URI. \row - \o subjectKeyIdentifier - \o 2.5.29.14 - \o Returned as a QVariant containing a QString. The string is the key + \li subjectKeyIdentifier + \li 2.5.29.14 + \li Returned as a QVariant containing a QString. The string is the key identifier. \row - \o authorityKeyIdentifier - \o 2.5.29.35 - \o Returned as a QVariantMap. The optional key 'keyid' contains the key + \li authorityKeyIdentifier + \li 2.5.29.35 + \li Returned as a QVariantMap. The optional key 'keyid' contains the key identifier as a hex string stored in a QByteArray. The optional key 'serial' contains the authority key serial number as a qlonglong. Currently there is no support for the general names field of this diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index dc530dae88..ec49c0f56e 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -67,11 +67,11 @@ const QSsl::SslOptions QSslConfigurationPrivate::defaultSslOptions = QSsl::SslOp The settings that QSslConfiguration currently supports are: \list - \o The SSL/TLS protocol to be used - \o The certificate to be presented to the peer during connection + \li The SSL/TLS protocol to be used + \li The certificate to be presented to the peer during connection and its associated private key - \o The ciphers allowed to be used for encrypting the connection - \o The list of Certificate Authorities certificates that are + \li The ciphers allowed to be used for encrypting the connection + \li The list of Certificate Authorities certificates that are used to validate the peer's certificate \endlist @@ -81,9 +81,9 @@ const QSsl::SslOptions QSslConfigurationPrivate::defaultSslOptions = QSsl::SslOp The state that QSslConfiguration supports are: \list - \o The certificate the peer presented during handshake, along + \li The certificate the peer presented during handshake, along with the chain leading to a CA certificate - \o The cipher used to encrypt this session + \li The cipher used to encrypt this session \endlist The state can only be obtained once the SSL connection starts, but @@ -541,10 +541,10 @@ bool QSslConfiguration::testSslOption(QSsl::SslOption option) const The default SSL configuration consists of: \list - \o no local certificate and no private key - \o protocol SecureProtocols (meaning either TLS 1.0 or SSL 3 will be used) - \o the system's default CA certificate list - \o the cipher list equal to the list of the SSL libraries' + \li no local certificate and no private key + \li protocol SecureProtocols (meaning either TLS 1.0 or SSL 3 will be used) + \li the system's default CA certificate list + \li the cipher list equal to the list of the SSL libraries' supported SSL ciphers \endlist diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 311ac5fe86..6338cbbe6f 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -132,12 +132,12 @@ The following features can also be customized: \list - \o The socket's cryptographic cipher suite can be customized before + \li The socket's cryptographic cipher suite can be customized before the handshake phase with setCiphers() and setDefaultCiphers(). - \o The socket's local certificate and private key can be customized + \li The socket's local certificate and private key can be customized before the handshake phase with setLocalCertificate() and setPrivateKey(). - \o The CA certificate database can be extended and customized with + \li The CA certificate database can be extended and customized with addCaCertificate(), addCaCertificates(), setCaCertificates(), addDefaultCaCertificate(), addDefaultCaCertificates(), and setDefaultCaCertificates(). @@ -398,7 +398,7 @@ void QSslSocket::resume() \snippet doc/src/snippets/code/src_network_ssl_qsslsocket.cpp 3 - \bold{Note:} The example above shows that text can be written to + \b{Note:} The example above shows that text can be written to the socket immediately after requesting the encrypted connection, before the encrypted() signal has been emitted. In such cases, the text is queued in the object and written to the socket \e after @@ -468,7 +468,7 @@ void QSslSocket::connectToHostEncrypted(const QString &hostName, quint16 port, The socket is opened in the mode specified by \a openMode, and enters the socket state specified by \a state. - \bold{Note:} It is not possible to initialize two sockets with the same + \b{Note:} It is not possible to initialize two sockets with the same native socket descriptor. \sa socketDescriptor() |