[exim-dev] [Bug 995] openssl: output error message if SSL_re…

Pàgina inicial
Delete this message
Reply to this message
Autor: Phil Pennock
Data:  
A: exim-dev
Assumpte: [exim-dev] [Bug 995] openssl: output error message if SSL_read() fails
------- You are receiving this mail because: -------
You are on the CC list for the bug.

http://bugs.exim.org/show_bug.cgi?id=995

Phil Pennock <pdp@???> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED





--- Comment #1 from Phil Pennock <pdp@???> 2010-06-05 10:36:35 ---
I'd like to head to bed, so don't feel like figuring out a way to reproduce the
bug so that I can test the changes.

I've looked over the code twice, after verifying it compiles, and it looks
innocuous, so I went ahead and committed. If you can pull HEAD and confirm
that it resolves this problem for you, that would be great. For me, anyway.

For anyone panicing at this cavalier commit, here's the diff:


diff -a -u -p -r1.23 tls-openssl.c
--- src/tls-openssl.c   5 Jun 2010 09:10:10 -0000       1.23
+++ src/tls-openssl.c   5 Jun 2010 09:29:23 -0000
@@ -900,6 +900,14 @@ if (ssl_xfer_buffer_lwm >= ssl_xfer_buff


/* Handle genuine errors */

+  else if (error == SSL_ERROR_SSL)
+    {
+    ERR_error_string(ERR_get_error(), ssl_errstring);
+    log_write(0, LOG_MAIN, "TLS error (SSL_write): %s", ssl_errstring);
+    ssl_xfer_error = 1;
+    return EOF;
+    }
+  
   else if (error != SSL_ERROR_NONE)
     {
     DEBUG(D_tls) debug_printf("Got SSL error %d\n", error);


Of course, *now* I see that I failed to s/SSL_write/SSL_read/ in the error
message ... fixed.


--
Configure bugmail: http://bugs.exim.org/userprefs.cgi?tab=email