[exim-cvs] OpenSSL: clear error stack before avery I/O opera…

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Exim Git Commits Mailing List
Datum:  
To: exim-cvs
Betreff: [exim-cvs] OpenSSL: clear error stack before avery I/O operation
Gitweb: https://git.exim.org/exim.git/commitdiff/b87042e8b8d47ccc76b7873fc8c6afd5ab64508e
Commit:     b87042e8b8d47ccc76b7873fc8c6afd5ab64508e
Parent:     666eb084c9925c35d1e30d2809f04fcb57802a32
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Wed May 20 22:14:59 2020 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Wed May 20 22:14:59 2020 +0100


    OpenSSL: clear error stack before avery I/O operation
---
 src/src/tls-openssl.c | 3 +++
 1 file changed, 3 insertions(+)


diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 0caf1c0..8c9d8aa 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -3458,6 +3458,7 @@ int inbytes;
DEBUG(D_tls) debug_printf("Calling SSL_read(%p, %p, %u)\n", server_ssl,
ssl_xfer_buffer, ssl_xfer_buffer_size);

+ERR_clear_error();
 if (smtp_receive_timeout > 0) ALARM(smtp_receive_timeout);
 inbytes = SSL_read(server_ssl, CS ssl_xfer_buffer,
           MIN(ssl_xfer_buffer_size, lim));
@@ -3607,6 +3608,7 @@ int error;
 DEBUG(D_tls) debug_printf("Calling SSL_read(%p, %p, %u)\n", ssl,
   buff, (unsigned int)len);


+ERR_clear_error();
inbytes = SSL_read(ssl, CS buff, len);
error = SSL_get_error(ssl, inbytes);

@@ -3696,6 +3698,7 @@ if ((more || corked))
for (int left = len; left > 0;)
{
DEBUG(D_tls) debug_printf("SSL_write(%p, %p, %d)\n", ssl, buff, left);
+ ERR_clear_error();
outbytes = SSL_write(ssl, CS buff, left);
error = SSL_get_error(ssl, outbytes);
DEBUG(D_tls) debug_printf("outbytes=%d error=%d\n", outbytes, error);