ph10 2006/12/12 15:47:39 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src ACKNOWLEDGMENTS
exim-src/src tls-gnu.c tls-openssl.c
Log:
Apply John Jetmore's patch to allow tls-on-connect and STARTTLS to be
tested/used via the -bh/-bhc/-bs options.
Revision Changes Path
1.444 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.66 +2 -1 exim/exim-src/ACKNOWLEDGMENTS
1.16 +2 -1 exim/exim-src/src/tls-gnu.c
1.8 +2 -1 exim/exim-src/src/tls-openssl.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- ChangeLog 11 Dec 2006 14:15:59 -0000 1.443
+++ ChangeLog 12 Dec 2006 15:47:39 -0000 1.444
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.443 2006/12/11 14:15:59 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.444 2006/12/12 15:47:39 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -347,6 +347,9 @@
PH/51 Error processing for expansion failure of helo_data from an smtp
transport during callout processing was broken.
+
+PH/52 Applied John Jetmore's patch to allow tls-on-connect and STARTTLS to be
+ tested/used via the -bh/-bhc/-bs options.
Exim version 4.63
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ACKNOWLEDGMENTS 20 Nov 2006 11:57:57 -0000 1.65
+++ ACKNOWLEDGMENTS 12 Dec 2006 15:47:39 -0000 1.66
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.65 2006/11/20 11:57:57 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.66 2006/12/12 15:47:39 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -20,7 +20,7 @@
Philip Hazel
Lists created: 20 November 2002
-Last updated: 20 November 2006
+Last updated: 12 December 2006
THE OLD LIST
@@ -172,6 +172,7 @@
John Jetmore Writing and maintaining the 'exipick' utility
Much helpful testing of the test suite & elsewhere
Patch for -Mset
+ Patch for TLS testing with -bh/-bhc/-bs
Bob Johannessen Patch for Sieve envelope tests bug
Patch for negative uid/gid bug
Brad Jorsch Patch for bitwise logical operators
Index: tls-gnu.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/tls-gnu.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tls-gnu.c 4 Dec 2006 15:15:00 -0000 1.15
+++ tls-gnu.c 12 Dec 2006 15:47:39 -0000 1.16
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/tls-gnu.c,v 1.15 2006/12/04 15:15:00 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/tls-gnu.c,v 1.16 2006/12/12 15:47:39 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -809,7 +809,8 @@
/* Now negotiate the TLS session. We put our own timer on it, since it seems
that the GnuTLS library doesn't. */
-gnutls_transport_set_ptr(tls_session, (gnutls_transport_ptr)fileno(smtp_out));
+gnutls_transport_set_ptr2(tls_session, (gnutls_transport_ptr)fileno(smtp_in),
+ (gnutls_transport_ptr)fileno(smtp_out));
sigalrm_seen = FALSE;
if (smtp_receive_timeout > 0) alarm(smtp_receive_timeout);
Index: tls-openssl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/tls-openssl.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tls-openssl.c 14 Feb 2006 14:12:07 -0000 1.7
+++ tls-openssl.c 12 Dec 2006 15:47:39 -0000 1.8
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/tls-openssl.c,v 1.7 2006/02/14 14:12:07 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/tls-openssl.c,v 1.8 2006/12/12 15:47:39 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -684,7 +684,8 @@
/* Now negotiate the TLS session. We put our own timer on it, since it seems
that the OpenSSL library doesn't. */
-SSL_set_fd(ssl, fileno(smtp_out));
+SSL_set_wfd(ssl, fileno(smtp_out));
+SSL_set_rfd(ssl, fileno(smtp_in));
SSL_set_accept_state(ssl);
DEBUG(D_tls) debug_printf("Calling SSL_accept\n");
