summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-11-03 15:37:05 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-11-03 15:37:05 (GMT)
commitc0a58b079d00dad484faa6249b8109a639576399 (patch)
treed2828950d8e5664da5606783161f2a48db3ce722 /src/network
parent93ec4104781d7f9929b8b8a05dee3d94f8cd4b17 (diff)
parentc95a0e6e8eb8ba5fd2a4412b318ad998b3ccb4fc (diff)
downloadQt-c0a58b079d00dad484faa6249b8109a639576399.zip
Qt-c0a58b079d00dad484faa6249b8109a639576399.tar.gz
Qt-c0a58b079d00dad484faa6249b8109a639576399.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6
Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp
Diffstat (limited to 'src/network')
-rw-r--r--src/network/ssl/qsslerror.cpp4
-rw-r--r--src/network/ssl/qsslsocket_openssl.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp
index 4bb58b1..e912626 100644
--- a/src/network/ssl/qsslerror.cpp
+++ b/src/network/ssl/qsslerror.cpp
@@ -252,10 +252,10 @@ QString QSslError::errorString() const
errStr = QSslSocket::tr("One of the CA certificates is invalid");
break;
case PathLengthExceeded:
- errStr = QSslSocket::tr("The basicConstraints pathlength parameter has been exceeded");
+ errStr = QSslSocket::tr("The basicConstraints path length parameter has been exceeded");
break;
case InvalidPurpose:
- errStr = QSslSocket::tr("The supplied certificate is unsuited for this purpose");
+ errStr = QSslSocket::tr("The supplied certificate is unsuitable for this purpose");
break;
case CertificateUntrusted:
errStr = QSslSocket::tr("The root CA certificate is not trusted for this purpose");
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;
}