jessequ
/
AMQP-CPP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SSL state bugs (#413)

This commit is contained in:
Raoul Wols 2021-07-30 14:50:15 +02:00 committed by GitHub
parent 819af12055
commit 0499863da2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/linux_tcp/sslconnected.h
View File

@ -301,9 +301,13 @@ private:
// go process the received data // go process the received data
auto *nextstate = parse(monitor, result); auto *nextstate = parse(monitor, result);
// leap out if we moved to a different state // leap out if we moved to a different state
if (nextstate != this) return nextstate; if (nextstate != this) return nextstate;
// the call to userspace might have turned the object in sending-state, which
// means that we must stop the receiving process
if (_state != state_idle) return this;
} }
while (OpenSSL::SSL_pending(_ssl) > 0); while (OpenSSL::SSL_pending(_ssl) > 0);
@ -384,7 +388,7 @@ public:
if (_closed) return; if (_closed) return;
// if we're not idle, we can just add bytes to the buffer and we're done // if we're not idle, we can just add bytes to the buffer and we're done
if (_state != state_idle) return _out.add(buffer, size); if (_state != state_idle || _out) return _out.add(buffer, size);
// clear ssl-level error // clear ssl-level error
OpenSSL::ERR_clear_error(); OpenSSL::ERR_clear_error();