diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-29 15:47:24 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-01 10:35:09 +0000 |
| commit | 5de981d3bc3df874f9df35a6899345f4f61fa951 (patch) | |
| tree | 97dd0a90fbb7fcc69f8ca796fb9f5d1b92efcf3e /src/network/ssl | |
| parent | 201dde1f313ab42b34fe96bd0c630beccca4960e (diff) | |
QtNetwork: Fix some messages in OCSP stapling
Amends a8412dc020e82b45b54b0b6637b8b88b255c413a.
Task-number: QTBUG-12812
Task-number: QTBUG-17158
Change-Id: Idcdf9ad39a43373097e2c3f31a62ce1b3cb46c22
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslerror.cpp | 2 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket_schannel.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp index 74ff6987d2..02dd16a58d 100644 --- a/src/network/ssl/qsslerror.cpp +++ b/src/network/ssl/qsslerror.cpp @@ -326,7 +326,7 @@ QString QSslError::errorString() const errStr = QSslSocket::tr("The client is not authorized to request OCSP status from this server"); break; case OcspResponseCannotBeTrusted: - errStr = QSslSocket::tr("OCSP reponder's identity cannot be verified"); + errStr = QSslSocket::tr("OCSP responder's identity cannot be verified"); break; case OcspResponseCertIdUnknown: errStr = QSslSocket::tr("The identity of a certificate in an OCSP response cannot be established"); diff --git a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp index e5f31a3fcf..06bbc86469 100644 --- a/src/network/ssl/qsslsocket_schannel.cpp +++ b/src/network/ssl/qsslsocket_schannel.cpp @@ -578,10 +578,10 @@ bool QSslSocketBackendPrivate::acquireCredentialsHandle() &findParam, nullptr); if (!chainContext) { - setErrorAndEmit(QAbstractSocket::SocketError::SslInvalidUserDataError, - QSslSocket::tr("The certificate provided can not be used for a %1.") - .arg(isClient ? QSslSocket::tr("client") - : QSslSocket::tr("server"))); + const QString message = isClient + ? QSslSocket::tr("The certificate provided can not be used for a client.") + : QSslSocket::tr("The certificate provided can not be used for a server."); + setErrorAndEmit(QAbstractSocket::SocketError::SslInvalidUserDataError, message); return false; } Q_ASSERT(chainContext->cChain == 1); |