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

Prevent data loss when an ssl socket is closed by remote

Browse Source 
SSL context was destroyed on disconnect. This makes it impossible to
decrypt buffered encrypted data. So if there is encrypted data in the
receive buffers, then don't destroy the ssl context until the socket is
destroyed.

Task-Number: QTBUG-23607
Change-Id: I16a7b4fa006647ec73049c90cdbc72686696850f
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Richard J. Moore <rich@kde.org>
This commit is contained in:
Shane Kearns 2012-01-30 15:52:27 +00:00 committed by Qt by Nokia
parent 755cd58f9c
commit c5aba0ac17
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,6 +172,7 @@ QSslSocketBackendPrivate::QSslSocketBackendPrivate()
QSslSocketBackendPrivate::~QSslSocketBackendPrivate()
{
destroySslContext();
}
QSslCipher QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(SSL_CIPHER *cipher)
@ -508,6 +509,22 @@ init_context:
return true;
}
void QSslSocketBackendPrivate::destroySslContext()
{
if (ssl) {
q_SSL_free(ssl);
ssl = 0;
}
if (ctx) {
q_SSL_CTX_free(ctx);
ctx = 0;
}
if (pkey) {
q_EVP_PKEY_free(pkey);
pkey = 0;
}
}
/*!
\internal
*/
@ -1232,18 +1249,10 @@ void QSslSocketBackendPrivate::disconnectFromHost()
void QSslSocketBackendPrivate::disconnected()
{
if (ssl) {
q_SSL_free(ssl);
ssl = 0;
}
if (ctx) {
q_SSL_CTX_free(ctx);
ctx = 0;
}
if (pkey) {
q_EVP_PKEY_free(pkey);
pkey = 0;
}
if (plainSocket->bytesAvailable() <= 0)
destroySslContext();
//if there is still buffered data in the plain socket, don't destroy the ssl context yet.
//it will be destroyed when the socket is deleted.
}
QSslCipher QSslSocketBackendPrivate::sessionCipher() const

1
src/network/ssl/qsslsocket_openssl_p.h
View File

@ -99,6 +99,7 @@ public:
// SSL context
bool initSslContext();
void destroySslContext();
SSL *ssl;
SSL_CTX *ctx;
EVP_PKEY *pkey;