diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-04 05:22:24 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-04 05:22:24 (GMT) |
| commit | ec502c9e9a26f984023e4f08126e033a504970b2 (patch) | |
| tree | 3082b195068a450b3844285f0f77ffe6fb32dc3c /src/network/ssl/qsslsocket_openssl.cpp | |
| parent | 3a369d590c04e9528265c6bf2dd33f8606df8ea5 (diff) | |
| parent | 69b4b690cc26b697675264298623d9974cc76796 (diff) | |
| download | Qt-ec502c9e9a26f984023e4f08126e033a504970b2.zip Qt-ec502c9e9a26f984023e4f08126e033a504970b2.tar.gz Qt-ec502c9e9a26f984023e4f08126e033a504970b2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 6f7e55a..743722f 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -324,7 +324,7 @@ init_context: // Check if the certificate matches the private key. if (!q_SSL_CTX_check_private_key(ctx)) { - q->setErrorString(QSslSocket::tr("Private key does not certificate public key, %1").arg(SSL_ERRORSTR())); + q->setErrorString(QSslSocket::tr("Private key does not certify public key, %1").arg(SSL_ERRORSTR())); emit q->error(QAbstractSocket::UnknownSocketError); return false; } |