AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve error caused by server-initiated TLS renegotiation

Browse Source 
Updating the SSL_write code to correctly handle
SSL_ERROR_WANT_WRITE and SSL_ERROR_WANT_READ, which are not actual errors.

Change-Id: Icd7369b438ef402bf438c3fcc64514a1f9f45452
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
This commit is contained in:
Scott Deboy 2013-07-25 10:22:01 -07:00 committed by The Qt Project
parent 898b8d05c5
commit af61b7312e
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/network/ssl/qsslsocket_openssl.cpp
View File

@ -796,11 +796,22 @@ void QSslSocketBackendPrivate::transmit()
while ((nextDataBlockSize = writeBuffer.nextDataBlockSize()) > 0) {
int writtenBytes = q_SSL_write(ssl, writeBuffer.readPointer(), nextDataBlockSize);
if (writtenBytes <= 0) {
// ### Better error handling.
q->setErrorString(QSslSocket::tr("Unable to write data: %1").arg(getErrorsFromOpenSsl()));
q->setSocketError(QAbstractSocket::SslInternalError);
emit q->error(QAbstractSocket::SslInternalError);
return;
int error = q_SSL_get_error(ssl, writtenBytes);
//write can result in a want_write_error - not an error - continue transmitting
if (error == SSL_ERROR_WANT_WRITE) {
transmitting = true;
break;
} else if (error == SSL_ERROR_WANT_READ) {
//write can result in a want_read error, possibly due to renegotiation - not an error - stop transmitting
transmitting = false;
break;
} else {
// ### Better error handling.
q->setErrorString(QSslSocket::tr("Unable to write data: %1").arg(getErrorsFromOpenSsl()));
q->setSocketError(QAbstractSocket::SslInternalError);
emit q->error(QAbstractSocket::SslInternalError);
return;
}
}
#ifdef QSSLSOCKET_DEBUG
qDebug() << "QSslSocketBackendPrivate::transmit: encrypted" << writtenBytes << "bytes";