diff options
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/ssl/qsslconfiguration.cpp | 8 | ||||
| -rw-r--r-- | src/network/ssl/qssldiffiehellmanparameters.cpp | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index e009824a69..bc8394afdc 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -830,9 +830,9 @@ QByteArray QSslConfiguration::preSharedKeyIdentityHint() const /*! \since 5.8 - Sets the identity hint for a preshared key authentication. This will affect the next - initiated handshake; calling this function on an already-encrypted socket - will not affect the socket's identity hint. + Sets the identity hint for a preshared key authentication to \a hint. This will + affect the next initiated handshake; calling this function on an already-encrypted + socket will not affect the socket's identity hint. The identity hint is used in QSslSocket::SslServerMode only! */ @@ -858,7 +858,7 @@ QSslDiffieHellmanParameters QSslConfiguration::diffieHellmanParameters() const \since 5.8 Sets a custom set of Diffie-Hellman parameters to be used by this socket when functioning as - a server. + a server to \a dhparams. If no Diffie-Hellman parameters have been set, the QSslConfiguration object defaults to using the 1024-bit MODP group from RFC 2409. diff --git a/src/network/ssl/qssldiffiehellmanparameters.cpp b/src/network/ssl/qssldiffiehellmanparameters.cpp index d411ea0a5d..e6a2fe8a2a 100644 --- a/src/network/ssl/qssldiffiehellmanparameters.cpp +++ b/src/network/ssl/qssldiffiehellmanparameters.cpp @@ -104,7 +104,7 @@ QSslDiffieHellmanParameters::QSslDiffieHellmanParameters() /*! Constructs a QSslDiffieHellmanParameters object using - the byte array \a encoded in either PEM or DER form. + the byte array \a encoded in either PEM or DER form as specified by \a encoding. After construction, the isValid() method should be used to check whether the Diffie-Hellman parameters were valid and @@ -214,7 +214,6 @@ bool QSslDiffieHellmanParameters::isEmpty() const Q_DECL_NOTHROW If a QSslDiffieHellmanParameters object is not valid, you can use the error() method to determine what error prevented the object from being constructed. - \sa clear() \sa error() */ bool QSslDiffieHellmanParameters::isValid() const Q_DECL_NOTHROW @@ -227,11 +226,13 @@ bool QSslDiffieHellmanParameters::isValid() const Q_DECL_NOTHROW Describes a QSslDiffieHellmanParameters error. - \value ErrorInvalidInputData The given input data could not be used to + \value NoError No error occurred. + + \value InvalidInputDataError The given input data could not be used to construct a QSslDiffieHellmanParameters object. - \value ErrorUnsafeParameters The Diffie-Hellman parameters are unsafe + \value UnsafeParametersError The Diffie-Hellman parameters are unsafe and should not be used. */ @@ -277,7 +278,7 @@ bool operator==(const QSslDiffieHellmanParameters &lhs, const QSslDiffieHellmanP /*! \relates QSslDiffieHellmanParameters - Writes the set of Diffie-Hellman parameters in \a dhparm into the debug object \a debug for + Writes the set of Diffie-Hellman parameters in \a dhparam into the debug object \a debug for debugging purposes. The Diffie-Hellman parameters will be represented in Base64-encoded DER form. |