[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog NewSt…

Kezdőlap
Üzenet törlése
Válasz az üzenetre
Szerző: Philip Hazel
Dátum:  
Címzett: exim-cvs
Tárgy: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog NewStuff OptionLists.txt exim/exim-src/src exim.c globals.c globals.h tls-openssl.c transport.c exim/exim-src/src/transports pipe.c pipe.h exi
ph10 2005/05/03 15:20:02 BST

  Modified files:
    exim-doc/doc-txt     ChangeLog NewStuff OptionLists.txt 
    exim-src/src         exim.c globals.c globals.h tls-openssl.c 
                         transport.c 
    exim-src/src/transports pipe.c pipe.h 
    exim-test-orig/AutoTest/confs 002 210 391 
    exim-test-orig/AutoTest/log 210 211 321 332 391 575 598 
    exim-test-orig/AutoTest/mail 210.ph10 211.ph10 391.ph10 
                                 598.ph10 
    exim-test-orig/AutoTest/rejectlog 211 
    exim-test-orig/AutoTest/stderr 451 470 555 565 575 581 
    exim-test-orig/AutoTest/stdout 001 002 210 211 213 214 215 225 
                                   321 391 429 433 486 550 584 
  Added files:
    exim-test-orig/AutoTest/confs 611 
    exim-test-orig/AutoTest/log 611 
    exim-test-orig/AutoTest/mail 611.ph10 
    exim-test-orig/AutoTest/scripts 611 
  Log:
  (1) Don't ignore timeouts while writing to a pipe! (As opposed to
  timeout of the pipe command process.)
  (2) Add timeout_defer option to turn timeouts into defers (default has
  always been to fail).
  (3) An upgrade to my desktop OS and to SSL has caused the output from
  some of the test scripts to change.


  Revision  Changes    Path
  1.132     +11 -0     exim/exim-doc/doc-txt/ChangeLog
  1.39      +11 -0     exim/exim-doc/doc-txt/NewStuff
  1.8       +2 -1      exim/exim-doc/doc-txt/OptionLists.txt
  1.19      +6 -0      exim/exim-src/src/exim.c
  1.23      +1 -0      exim/exim-src/src/globals.c
  1.15      +1 -0      exim/exim-src/src/globals.h
  1.5       +0 -3      exim/exim-src/src/tls-openssl.c
  1.8       +3 -0      exim/exim-src/src/transport.c
  1.5       +12 -6     exim/exim-src/src/transports/pipe.c
  1.3       +1 -0      exim/exim-src/src/transports/pipe.h
  1.8       +1 -0      exim/exim-test-orig/AutoTest/confs/002
  1.2       +1 -1      exim/exim-test-orig/AutoTest/confs/210
  1.2       +1 -1      exim/exim-test-orig/AutoTest/confs/391
  1.1       +69 -0     exim/exim-test-orig/AutoTest/confs/611 (new)
  1.3       +2 -2      exim/exim-test-orig/AutoTest/log/210
  1.3       +2 -2      exim/exim-test-orig/AutoTest/log/211
  1.3       +1 -1      exim/exim-test-orig/AutoTest/log/321
  1.3       +7 -7      exim/exim-test-orig/AutoTest/log/332
  1.3       +2 -2      exim/exim-test-orig/AutoTest/log/391
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/575
  1.7       +7 -7      exim/exim-test-orig/AutoTest/log/598
  1.1       +16 -0     exim/exim-test-orig/AutoTest/log/611 (new)
  1.3       +4 -4      exim/exim-test-orig/AutoTest/mail/210.ph10
  1.3       +2 -2      exim/exim-test-orig/AutoTest/mail/211.ph10
  1.3       +4 -4      exim/exim-test-orig/AutoTest/mail/391.ph10
  1.7       +7 -7      exim/exim-test-orig/AutoTest/mail/598.ph10
  1.1       +62 -0     exim/exim-test-orig/AutoTest/mail/611.ph10 (new)
  1.2       +1 -1      exim/exim-test-orig/AutoTest/rejectlog/211
  1.1       +13 -0     exim/exim-test-orig/AutoTest/scripts/611 (new)
  1.6       +1 -1      exim/exim-test-orig/AutoTest/stderr/451
  1.6       +1 -1      exim/exim-test-orig/AutoTest/stderr/470
  1.5       +3 -1      exim/exim-test-orig/AutoTest/stderr/555
  1.3       +1 -1      exim/exim-test-orig/AutoTest/stderr/565
  1.2       +4 -4      exim/exim-test-orig/AutoTest/stderr/575
  1.6       +2 -5      exim/exim-test-orig/AutoTest/stderr/581
  1.10      +1 -0      exim/exim-test-orig/AutoTest/stdout/001
  1.8       +2 -0      exim/exim-test-orig/AutoTest/stdout/002
  1.2       +3 -3      exim/exim-test-orig/AutoTest/stdout/210
  1.3       +3 -3      exim/exim-test-orig/AutoTest/stdout/211
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/213
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/214
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/215
  1.3       +8 -8      exim/exim-test-orig/AutoTest/stdout/225
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/321
  1.2       +2 -2      exim/exim-test-orig/AutoTest/stdout/391
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/429
  1.2       +2 -2      exim/exim-test-orig/AutoTest/stdout/433
  1.2       +2 -2      exim/exim-test-orig/AutoTest/stdout/486
  1.3       +2 -2      exim/exim-test-orig/AutoTest/stdout/550
  1.3       +2 -2      exim/exim-test-orig/AutoTest/stdout/584


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -r1.131 -r1.132
  --- ChangeLog    3 May 2005 10:02:27 -0000    1.131
  +++ ChangeLog    3 May 2005 14:20:00 -0000    1.132
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.131 2005/05/03 10:02:27 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.132 2005/05/03 14:20:00 ph10 Exp $


   Change log file for Exim from version 4.21
   -------------------------------------------
  @@ -269,6 +269,17 @@
   PH/44 Applied patch from the Sieve maintainer: "The vacation draft is still
         being worked on, but at least Exim now implements the latest version to
         play with."
  +
  +PH/45 In a pipe transport, although a timeout while waiting for the pipe
  +      process to complete was treated as a delivery failure, a timeout while
  +      writing the message to the pipe was logged, but erroneously treated as a
  +      successful delivery. Such timeouts include transport filter timeouts. For
  +      consistency with the overall process timeout, these timeouts are now
  +      treated as errors, giving rise to delivery failures by default. However,
  +      there is now a new Boolean option for the pipe transport called
  +      timeout_defer, which, if set TRUE, converts the failures into defers for
  +      both kinds of timeout. A transport filter timeout is now identified in
  +      the log output.



A note about Exim versions 4.44 and 4.50

  Index: NewStuff
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- NewStuff    28 Apr 2005 13:29:27 -0000    1.38
  +++ NewStuff    3 May 2005 14:20:00 -0000    1.39
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.38 2005/04/28 13:29:27 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.39 2005/05/03 14:20:00 ph10 Exp $


New Features in Exim
--------------------
@@ -169,6 +169,17 @@

   PH/11 In a ${run expansion, the variable $value (which contains the standard
         output) is now also usable in the "else" string.
  +
  +PH/12 In a pipe transport, although a timeout while waiting for the pipe
  +      process to complete was treated as a delivery failure, a timeout while
  +      writing the message to the pipe was logged, but erroneously treated as a
  +      successful delivery. Such timeouts include transport filter timeouts. For
  +      consistency with the overall process timeout, these timeouts are now
  +      treated as errors, giving rise to delivery failures by default. However,
  +      there is now a new Boolean option for the pipe transport called
  +      timeout_defer, which, if set TRUE, converts the failures into defers for
  +      both kinds of timeout. A transport filter timeout is now identified in
  +      the log output.



Version 4.50

  Index: OptionLists.txt
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/OptionLists.txt,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- OptionLists.txt    4 Apr 2005 10:33:49 -0000    1.7
  +++ OptionLists.txt    3 May 2005 14:20:00 -0000    1.8
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/OptionLists.txt,v 1.7 2005/04/04 10:33:49 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/OptionLists.txt,v 1.8 2005/05/03 14:20:00 ph10 Exp $


   LISTS OF EXIM OPTIONS
   ---------------------
  @@ -11,7 +11,7 @@
     4. Those that can appear in the build time configuration for the Exim monitor
        (Local/eximon.conf).


-This file was last updated for Exim release 4.50.
+This file was last updated for Exim release 4.51.


   1. RUN TIME OPTIONS
  @@ -497,6 +497,7 @@
                                                        1h            pipe
                                                        1h            queryprogram      4.00
                                                        5s            iplookup          4.00
  +timeout_defer                        boolean         false         pipe              4.51
   timeout_frozen_after                 time            0s            main              3.20
   timezone                             string          +             main              3.15
   tls_advertise_hosts                  host list       *             main              3.20


  Index: exim.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/exim.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- exim.c    6 Apr 2005 10:06:14 -0000    1.18
  +++ exim.c    3 May 2005 14:20:01 -0000    1.19
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/exim.c,v 1.18 2005/04/06 10:06:14 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/exim.c,v 1.19 2005/05/03 14:20:01 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -4702,6 +4702,12 @@
         int rc;
         close_unwanted();      /* Close unwanted file descriptors and TLS */
         exim_nullstd();        /* Ensure std{in,out,err} exist */
  +
  +      /* Occasionally in the test harness we don't have synchronous delivery
  +      set (can happen with bounces). In that case, let the old process finish
  +      before continuing, to keep the debug output the same. */
  +
  +      if (running_in_test_harness && !synchronous_delivery) millisleep(100);


         /* Re-exec Exim if we need to regain privilege (note: in mua_wrapper
         mode, deliver_drop_privilege is forced TRUE). */


  Index: globals.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/globals.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- globals.c    7 Apr 2005 10:54:54 -0000    1.22
  +++ globals.c    3 May 2005 14:20:01 -0000    1.23
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/globals.c,v 1.22 2005/04/07 10:54:54 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/globals.c,v 1.23 2005/05/03 14:20:01 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -1130,6 +1130,7 @@
   int     transport_count;
   uschar **transport_filter_argv  = NULL;
   int     transport_filter_timeout;
  +BOOL    transport_filter_timed_out = FALSE;
   int     transport_write_timeout= 0;


   tree_node  *tree_dns_fails     = NULL;


  Index: globals.h
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/globals.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- globals.h    4 Apr 2005 10:33:49 -0000    1.14
  +++ globals.h    3 May 2005 14:20:01 -0000    1.15
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/globals.h,v 1.14 2005/04/04 10:33:49 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/globals.h,v 1.15 2005/05/03 14:20:01 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -682,6 +682,7 @@
   extern int     transport_count;        /* Count of bytes transported */
   extern uschar **transport_filter_argv; /* For on-the-fly filtering */
   extern int     transport_filter_timeout; /* Timeout for same */
  +extern BOOL    transport_filter_timed_out; /* True if it did */


extern transport_info transports_available[]; /* Vector of available transports */
extern transport_instance *transports; /* Chain of instantiated transports */

  Index: tls-openssl.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/tls-openssl.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- tls-openssl.c    29 Mar 2005 14:53:09 -0000    1.4
  +++ tls-openssl.c    3 May 2005 14:20:01 -0000    1.5
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/tls-openssl.c,v 1.4 2005/03/29 14:53:09 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/tls-openssl.c,v 1.5 2005/05/03 14:20:01 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -181,9 +181,6 @@
       verify_callback_called? "" : " authenticated", txt);
     tls_peerdn = txt;
     }
  -
  -
  -debug_printf("+++verify_callback_called=%d\n", verify_callback_called);


if (!verify_callback_called) tls_certificate_verified = TRUE;
verify_callback_called = TRUE;

  Index: transport.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/transport.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- transport.c    22 Mar 2005 16:44:04 -0000    1.7
  +++ transport.c    3 May 2005 14:20:01 -0000    1.8
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/transport.c,v 1.7 2005/03/22 16:44:04 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/transport.c,v 1.8 2005/05/03 14:20:01 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -1099,6 +1099,8 @@
   int pfd[2];
   pid_t filter_pid, write_pid;


+transport_filter_timed_out = FALSE;
+
/* If there is no filter command set up, call the internal function that does
the actual work, passing it the incoming fd, and return its result. */

  @@ -1211,6 +1213,7 @@
     if (sigalrm_seen)
       {
       errno = ETIMEDOUT;
  +    transport_filter_timed_out = TRUE;
       goto TIDY_UP;
       }



  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/transports/pipe.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- pipe.c    17 Feb 2005 11:58:27 -0000    1.4
  +++ pipe.c    3 May 2005 14:20:01 -0000    1.5
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/transports/pipe.c,v 1.4 2005/02/17 11:58:27 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/transports/pipe.c,v 1.5 2005/05/03 14:20:01 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -65,6 +65,8 @@
         (void *)offsetof(pipe_transport_options_block, temp_errors) },
     { "timeout",           opt_time,
         (void *)offsetof(pipe_transport_options_block, timeout) },
  +  { "timeout_defer",     opt_bool,
  +      (void *)offsetof(pipe_transport_options_block, timeout_defer) },
     { "umask",             opt_octint,
         (void *)offsetof(pipe_transport_options_block, umask) },
     { "use_bsmtp",         opt_bool,
  @@ -101,6 +103,7 @@
     FALSE,          /* freeze_exec_fail */
     FALSE,          /* ignore_status */
     FALSE,          /* restrict_to_path */
  +  FALSE,          /* timeout_defer */
     FALSE,          /* use_shell */
     FALSE,          /* use_bsmtp */
     FALSE           /* use_crlf */
  @@ -786,17 +789,20 @@
   without reading all of it, we expect an EPIPE error, which should be ignored.
   We used also to ignore WRITEINCOMPLETE but the writing function is now cleverer
   at handling OS where the death of a pipe doesn't give EPIPE immediately. See
  -comments therein. This change made 04-Sep-98. Clean up this code in a year or
  -so. */
  +comments therein. */


   if (!written_ok)
     {
     if (errno == ETIMEDOUT)
  +    {
  +    addr->message = string_sprintf("%stimeout while writing to pipe",
  +      transport_filter_timed_out? "transport filter " : "");
  +    addr->transport_return = ob->timeout_defer? DEFER : FAIL;
       timeout = 1;
  -  else if (errno == EPIPE /* || errno == ERRNO_WRITEINCOMPLETE */ )
  +    }
  +  else if (errno == EPIPE)
       {
  -    debug_printf("transport error %s ignored\n",
  -      (errno == EPIPE)? "EPIPE" : "WRITEINCOMPLETE");
  +    debug_printf("transport error EPIPE ignored\n");
       }
     else
       {
  @@ -834,7 +840,7 @@
       {
       killpg(pid, SIGKILL);
       kill(outpid, SIGKILL);
  -    addr->transport_return = FAIL;
  +    addr->transport_return = ob->timeout_defer? DEFER : FAIL;
       addr->message = string_sprintf("pipe delivery process timed out");
       }



  Index: pipe.h
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/transports/pipe.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pipe.h    4 Jan 2005 10:00:45 -0000    1.2
  +++ pipe.h    3 May 2005 14:20:01 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/transports/pipe.h,v 1.2 2005/01/04 10:00:45 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/transports/pipe.h,v 1.3 2005/05/03 14:20:01 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -26,6 +26,7 @@
     BOOL  freeze_exec_fail;
     BOOL  ignore_status;
     BOOL  restrict_to_path;
  +  BOOL  timeout_defer;
     BOOL  use_shell;
     BOOL  use_bsmtp;
     BOOL  use_crlf;


Index: 611
====================================================================
# Exim test configuration 611

TIMEOUTDEFER=

# Macros are set externally in order to get the path
# of the Exim that is being tested, and the directory
# in which the test data lives.

exim_path = EXIM_PATH
primary_hostname = myhost.test.ex
spool_directory = DIR/spool

# ----- Main settings -----

qualify_domain = test.ex


# ----- Routers -----

begin routers

  r0:
    driver = accept
    senders = :
    transport = t0


  r1:
    driver = accept
    local_parts = nofilter 
    transport = t1 


  r2:
    driver = accept
    transport = t2 




# ----- Transports -----

begin transports

  t0:
    driver = appendfile
    file = DIR/test-mail/$local_part
    user = CALLER  


  t1:
    driver = pipe
    timeout = 1s
    command = /bin/sleep 2  
    TIMEOUTDEFER 


  t2:
    driver = pipe
    timeout = 5s
    command = /bin/cat
    transport_filter = /bin/sleep 2    
    transport_filter_timeout = 1s 
    TIMEOUTDEFER 



# ----- Retry -----

begin retry

* * F,1h,1m


# End

  Index: 002
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/002,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- 002    6 Apr 2005 16:26:42 -0000    1.7
  +++ 002    3 May 2005 14:20:01 -0000    1.8
  @@ -806,6 +806,7 @@
     message_suffix = \n
     temp_errors = 75 : 73
     timeout = 1h
  +  timeout_defer 
     transport_filter =
     umask = 022
     use_bsmtp 


  Index: 210
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/210,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 210    8 Oct 2004 14:49:15 -0000    1.1
  +++ 210    3 May 2005 14:20:01 -0000    1.2
  @@ -35,7 +35,7 @@
   check_recipient:
     accept  hosts = :
     deny    hosts = <; ::1
  -         !encrypted = IDEA-CBC-MD5:DES-CBC3-SHA : DHE_RSA_3DES_EDE_CBC_SHA
  +         !encrypted = AES256-SHA : IDEA-CBC-MD5:DES-CBC3-SHA : DHE_RSA_3DES_EDE_CBC_SHA
     accept  




  Index: 391
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/391,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 391    8 Oct 2004 14:49:15 -0000    1.1
  +++ 391    3 May 2005 14:20:01 -0000    1.2
  @@ -35,7 +35,7 @@
   check_recipient:
     accept  hosts = :
     deny    hosts = <; ::1
  -         !encrypted = IDEA-CBC-MD5:DES-CBC3-SHA:DHE_RSA_3DES_EDE_CBC_SHA 
  +         !encrypted = AES256-SHA:IDEA-CBC-MD5:DES-CBC3-SHA:DHE_RSA_3DES_EDE_CBC_SHA 
     accept  




Index: 611
====================================================================
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=257
1999-03-02 09:44:33 10HmaX-0005vi-00 ** nofilter@??? R=r1 T=t1: pipe delivery process timed out
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1029
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=r0 T=t0
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=255
1999-03-02 09:44:33 10HmaZ-0005vi-00 ** filter@??? R=r2 T=t2: transport filter timeout while writing to pipe
1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1023
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=r0 T=t0
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local S=257
1999-03-02 09:44:33 10HmbB-0005vi-00 == nofilter@??? R=r1 T=t1 defer (0): pipe delivery process timed out
1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=255
1999-03-02 09:44:33 10HmbC-0005vi-00 == filter@??? R=r2 T=t2 defer (0): transport filter timeout while writing to pipe

  Index: 210
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/210,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 210    25 Nov 2004 15:29:37 -0000    1.2
  +++ 210    3 May 2005 14:20:01 -0000    1.3
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
  -1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=[127.0.0.1] P=smtps X=TLSv1:DES-CBC3-SHA:168 S=202
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=[127.0.0.1] P=smtps X=TLSv1:AES256-SHA:256 S=200
   1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [::1] (SSL_accept): error:140890C7:SSL routines:SSL3_GET_CLIENT_CERTIFICATE:peer did not return a certificate
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=[::1] P=smtps X=TLSv1:DES-CBC3-SHA:168 DN="/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel" S=217
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=[::1] P=smtps X=TLSv1:AES256-SHA:256 DN="/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel" S=215
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@???> R=abc T=local_delivery
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 211
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/211,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 211    25 Nov 2004 15:29:37 -0000    1.2
  +++ 211    3 May 2005 14:20:01 -0000    1.3
  @@ -1,6 +1,6 @@
   1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
  -1999-03-02 09:44:33 H=[::1] F=<ph10@???> rejected RCPT <ph10@???>: unacceptable cipher TLSv1:DES-CBC3-SHA:168
  -1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=(rhu.barb) [127.0.0.1] P=smtps X=TLSv1:DES-CBC3-SHA:168 S=218
  +1999-03-02 09:44:33 H=[::1] F=<ph10@???> rejected RCPT <ph10@???>: unacceptable cipher TLSv1:AES256-SHA:256
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=(rhu.barb) [127.0.0.1] P=smtps X=TLSv1:AES256-SHA:256 S=216
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@???> R=abc T=local_delivery
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 321
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/321,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 321    25 Nov 2004 15:29:37 -0000    1.2
  +++ 321    3 May 2005 14:20:01 -0000    1.3
  @@ -1,3 +1,3 @@
   1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
  -1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=[127.0.0.1] P=smtps X=TLSv1:DES-CBC3-SHA:168 S=202
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=[127.0.0.1] P=smtps X=TLSv1:AES256-SHA:256 S=200
   1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<ph10@???> rejected RCPT <ph10@???>: "You must encrypt"


  Index: 332
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/332,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 332    28 Apr 2005 13:06:33 -0000    1.2
  +++ 332    3 May 2005 14:20:01 -0000    1.3
  @@ -1,11 +1,11 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=235
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => e@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => f@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 => a@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 -> b@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => e@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => f@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1230
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp
  @@ -15,14 +15,14 @@
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=235
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** e@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<e@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** f@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<f@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 => g@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 -> h@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** b@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => c@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaZ-0005vi-00 -> d@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** e@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<e@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** f@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<f@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 => g@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 -> h@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1518
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp


  Index: 391
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/391,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 391    25 Nov 2004 15:29:37 -0000    1.2
  +++ 391    3 May 2005 14:20:01 -0000    1.3
  @@ -1,6 +1,6 @@
   1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port 1225 (IPv6 and IPv4)
  -1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:DES-CBC3-SHA:168 S=219
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=[::1] P=smtp X=TLSv1:DES-CBC3-SHA:168 DN="/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel" S=216
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 S=217
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=[::1] P=smtp X=TLSv1:AES256-SHA:256 DN="/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel" S=214
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@???> R=abc T=local_delivery
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 575
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/575,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 575    8 Oct 2004 14:49:31 -0000    1.1
  +++ 575    3 May 2005 14:20:01 -0000    1.2
  @@ -1,10 +1,10 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=242
  -1999-03-02 09:44:33 10HmaX-0005vi-00 *> b@??? P=<b@aa> R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 *> a@??? P=<a@aa> R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
  +1999-03-02 09:44:33 10HmaX-0005vi-00 *> b@??? P=<b@aa> R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=242
  -1999-03-02 09:44:33 10HmaY-0005vi-00 *> a@??? P=<a@aa> R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaY-0005vi-00 *> b@??? P=<b@aa> R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
  +1999-03-02 09:44:33 10HmaY-0005vi-00 *> a@??? P=<a@aa> R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=265
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => /dev/null <blackhole@???> R=bh T=**bypassed**


  Index: 598
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/598,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- 598    4 Apr 2005 10:33:49 -0000    1.6
  +++ 598    3 May 2005 14:20:01 -0000    1.7
  @@ -1,21 +1,21 @@
  -1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1066
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1080
   1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1184 id=41C2F849.3060203@???
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1198 id=41C2F849.3060203@???
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1487 id=abcde
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1501 id=abcde
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1300 id=41C2F849.3060203@???
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1314 id=41C2F849.3060203@???
   1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=4370 id=20041217133501.GA3058@???
  +1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=4384 id=20041217133501.GA3058@???
   1999-03-02 09:44:33 10HmbB-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=1044
  +1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=1058
   1999-03-02 09:44:33 10HmbC-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
   1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=4348 id=20041217133501.GA3058@???
  +1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=4362 id=20041217133501.GA3058@???
   1999-03-02 09:44:33 10HmbD-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
   1999-03-02 09:44:33 10HmbD-0005vi-00 Completed


  Index: 611.ph10
  ====================================================================
  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from exim by myhost.test.ex with local (Exim x.yz)
      id 10HmaY-0005vi-00
      for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  X-Failed-Recipients: nofilter@???
  Auto-Submitted: auto-generated
  From: Mail Delivery System <Mailer-Daemon@???>
  To: ph10@???
  Subject: Mail delivery failed: returning message to sender
  Message-Id: <E10HmaY-0005vi-00@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

    nofilter@???
      local delivery failed


------ This is a copy of the message, including all the headers. ------

  Return-path: <ph10@???>
  Received: from ph10 by myhost.test.ex with local (Exim x.yz)
      id 10HmaX-0005vi-00
      for nofilter@???; Tue, 2 Mar 1999 09:44:33 +0000
  Message-Id: <E10HmaX-0005vi-00@???>
  From: Philip Hazel <ph10@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000



  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from exim by myhost.test.ex with local (Exim x.yz)
      id 10HmbA-0005vi-00
      for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  X-Failed-Recipients: filter@???
  Auto-Submitted: auto-generated
  From: Mail Delivery System <Mailer-Daemon@???>
  To: ph10@???
  Subject: Mail delivery failed: returning message to sender
  Message-Id: <E10HmbA-0005vi-00@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

    filter@???
      local delivery failed


------ This is a copy of the message, including all the headers. ------

  Return-path: <ph10@???>
  Received: from ph10 by myhost.test.ex with local (Exim x.yz)
      id 10HmaZ-0005vi-00
      for filter@???; Tue, 2 Mar 1999 09:44:33 +0000
  Message-Id: <E10HmaZ-0005vi-00@???>
  From: Philip Hazel <ph10@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000




  Index: 210.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/210.ph10,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 210.ph10    25 Nov 2004 15:29:37 -0000    1.2
  +++ 210.ph10    3 May 2005 14:20:01 -0000    1.3
  @@ -1,22 +1,22 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [127.0.0.1]
  -    by myhost.test.ex with smtps (TLSv1:DES-CBC3-SHA:168)
  +    by myhost.test.ex with smtps (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmaX-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
   tls-certificate-verified: 0
  -TLS: cipher=TLSv1:DES-CBC3-SHA:168 peerdn=
  +TLS: cipher=TLSv1:AES256-SHA:256 peerdn=


This is a test encrypted message.

   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [::1]
  -    by myhost.test.ex with smtps (TLSv1:DES-CBC3-SHA:168)
  +    by myhost.test.ex with smtps (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmaY-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
   tls-certificate-verified: 1
  -TLS: cipher=TLSv1:DES-CBC3-SHA:168 peerdn=/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel
  +TLS: cipher=TLSv1:AES256-SHA:256 peerdn=/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel


This is a test encrypted message from a verified host.


  Index: 211.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/211.ph10,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 211.ph10    25 Nov 2004 15:29:37 -0000    1.2
  +++ 211.ph10    3 May 2005 14:20:01 -0000    1.3
  @@ -1,10 +1,10 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [127.0.0.1] (helo=rhu.barb)
  -    by myhost.test.ex with smtps (TLSv1:DES-CBC3-SHA:168)
  +    by myhost.test.ex with smtps (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmaX-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLSv1:DES-CBC3-SHA:168 peerdn=
  +TLS: cipher=TLSv1:AES256-SHA:256 peerdn=


This is a test encrypted message.


  Index: 391.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/391.ph10,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 391.ph10    25 Nov 2004 15:29:37 -0000    1.2
  +++ 391.ph10    3 May 2005 14:20:01 -0000    1.3
  @@ -1,20 +1,20 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [127.0.0.1] (helo=rhu.barb)
  -    by myhost.test.ex with esmtps (TLSv1:DES-CBC3-SHA:168)
  +    by myhost.test.ex with esmtps (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmaX-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLSv1:DES-CBC3-SHA:168 peerdn=
  +TLS: cipher=TLSv1:AES256-SHA:256 peerdn=


This is a test encrypted message.

   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [::1]
  -    by myhost.test.ex with smtp (TLSv1:DES-CBC3-SHA:168)
  +    by myhost.test.ex with smtp (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmaY-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLSv1:DES-CBC3-SHA:168 peerdn=/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel
  +TLS: cipher=TLSv1:AES256-SHA:256 peerdn=/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel


This is a test encrypted message from a verified host.


  Index: 598.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/598.ph10,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- 598.ph10    4 Apr 2005 10:33:49 -0000    1.6
  +++ 598.ph10    3 May 2005 14:20:01 -0000    1.7
  @@ -9,7 +9,7 @@
   X-Spam_score: -0.7
   X-Spam_score_int: -6
   X-Spam_bar: /
  -X-Spam_report: Spam detection software, running on the system "xoanon", has
  +X-Spam_report: Spam detection software, running on the system "xoanon.csi.cam.ac.uk", has
       identified this incoming email as possible spam.  The original message
       has been attached to this so you can view it (if it isn't spam) or label
       similar future email.  If you have any questions, see
  @@ -39,7 +39,7 @@
   X-Spam_score: -1.7
   X-Spam_score_int: -16
   X-Spam_bar: -
  -X-Spam_report: Spam detection software, running on the system "xoanon", has
  +X-Spam_report: Spam detection software, running on the system "xoanon.csi.cam.ac.uk", has
       identified this incoming email as possible spam.  The original message
       has been attached to this so you can view it (if it isn't spam) or label
       similar future email.  If you have any questions, see
  @@ -68,7 +68,7 @@
   X-Spam_score: 1.9
   X-Spam_score_int: 19
   X-Spam_bar: +
  -X-Spam_report: Spam detection software, running on the system "xoanon", has
  +X-Spam_report: Spam detection software, running on the system "xoanon.csi.cam.ac.uk", has
       identified this incoming email as possible spam.  The original message
       has been attached to this so you can view it (if it isn't spam) or label
       similar future email.  If you have any questions, see
  @@ -104,7 +104,7 @@
   X-Spam_score: -1.7
   X-Spam_score_int: -16
   X-Spam_bar: -
  -X-Spam_report: Spam detection software, running on the system "xoanon", has
  +X-Spam_report: Spam detection software, running on the system "xoanon.csi.cam.ac.uk", has
       identified this incoming email as possible spam.  The original message
       has been attached to this so you can view it (if it isn't spam) or label
       similar future email.  If you have any questions, see
  @@ -195,7 +195,7 @@
   X-Spam_score: -1.7
   X-Spam_score_int: -16
   X-Spam_bar: -
  -X-Spam_report: Spam detection software, running on the system "xoanon", has
  +X-Spam_report: Spam detection software, running on the system "xoanon.csi.cam.ac.uk", has
       identified this incoming email as possible spam.  The original message
       has been attached to this so you can view it (if it isn't spam) or label
       similar future email.  If you have any questions, see
  @@ -265,7 +265,7 @@
   X-Spam_score: -0.7
   X-Spam_score_int: -6
   X-Spam_bar: /
  -X-Spam_report: Spam detection software, running on the system "xoanon", has
  +X-Spam_report: Spam detection software, running on the system "xoanon.csi.cam.ac.uk", has
       identified this incoming email as possible spam.  The original message
       has been attached to this so you can view it (if it isn't spam) or label
       similar future email.  If you have any questions, see
  @@ -353,7 +353,7 @@
   X-Spam_score: -1.7
   X-Spam_score_int: -16
   X-Spam_bar: -
  -X-Spam_report: Spam detection software, running on the system "xoanon", has
  +X-Spam_report: Spam detection software, running on the system "xoanon.csi.cam.ac.uk", has
       identified this incoming email as possible spam.  The original message
       has been attached to this so you can view it (if it isn't spam) or label
       similar future email.  If you have any questions, see


  Index: 211
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/rejectlog/211,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 211    8 Oct 2004 14:49:51 -0000    1.1
  +++ 211    3 May 2005 14:20:01 -0000    1.2
  @@ -1 +1 @@
  -1999-03-02 09:44:33 H=[::1] F=<ph10@???> rejected RCPT <ph10@???>: unacceptable cipher TLSv1:DES-CBC3-SHA:168
  +1999-03-02 09:44:33 H=[::1] F=<ph10@???> rejected RCPT <ph10@???>: unacceptable cipher TLSv1:AES256-SHA:256


  Index: 611
  ====================================================================
  0 Timeouts in pipe with and without a transport filter
  exim -odi nofilter
  ****               
  0
  exim -odi filter
  ****
  0 
  exim -DTIMEOUTDEFER=timeout_defer -odi nofilter
  ****               
  0
  exim -DTIMEOUTDEFER=timeout_defer -odi filter
  ****
  no_msglog_check


  Index: 451
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/451,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- 451    28 Apr 2005 13:06:34 -0000    1.5
  +++ 451    3 May 2005 14:20:01 -0000    1.6
  @@ -183,8 +183,8 @@
   LOG: MAIN
     ** x@y: retry timeout exceeded
   end of retry processing
  -writing data block fd=8 size=286 timeout=0
   exec /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/451 -d=0xfbb95ced -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
  +writing data block fd=8 size=286 timeout=0
   Exim version x.yz uid=42 gid=42 pid=pppp D=fbb95ced
   Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
   Fixed never_users: 0


  Index: 470
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/470,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- 470    7 Apr 2005 15:37:14 -0000    1.5
  +++ 470    3 May 2005 14:20:01 -0000    1.6
  @@ -227,7 +227,7 @@
   search_tidyup called
   changed uid/gid: local delivery to >sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@??? <>sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???> transport=t1
     uid=1169 gid=1169 pid=pppp
  -  auxiliary group list: 1169 4 10 18 19 100 250 42 2194
  +  auxiliary group list: 4 10 18 19 42 100 250 1169 2194
     home=NULL current=/
   set_process_info: 21680 **** string overflowed buffer ****
   t1 transport entered


  Index: 555
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/555,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 555    28 Apr 2005 13:06:34 -0000    1.4
  +++ 555    3 May 2005 14:20:01 -0000    1.5
  @@ -35,8 +35,10 @@
     SMTP>> RCPT TO:<ph1@???>
     SMTP>> DATA
   waiting for data on socket
  -read response data: size=16
  +read response data: size=8
     SMTP<< 250 OK
  +waiting for data on socket
  +read response data: size=8
     SMTP<< 550 NO
   waiting for data on socket
   Remote host 127.0.0.1 [127.0.0.1] closed connection in response to pipelined DATA


  Index: 565
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/565,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 565    14 Oct 2004 11:16:36 -0000    1.2
  +++ 565    3 May 2005 14:20:01 -0000    1.3
  @@ -3,7 +3,7 @@
   Fixed never_users: 0
   changed uid/gid: -C, -D, -be or -bf forces real uid
     uid=1169 gid=1169 pid=pppp
  -  auxiliary group list: 1169 4 10 18 19 100 250 42 2194
  +  auxiliary group list: 4 10 18 19 42 100 250 1169 2194
   configuration file is /source/exim4/AutoTest/confs/565
   log selectors = xxxxxxxx xxxxxxxx
   admin user


  Index: 575
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/575,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 575    8 Oct 2004 14:50:08 -0000    1.1
  +++ 575    3 May 2005 14:20:01 -0000    1.2
  @@ -2,17 +2,17 @@
     <= ph10@??? U=ph10 P=local S=242
   delivering 10HmaX-0005vi-00
   LOG: MAIN
  -  *> b@??? P=<b@aa> R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
  -LOG: MAIN
     *> a@??? P=<a@aa> R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
   LOG: MAIN
  +  *> b@??? P=<b@aa> R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
  +LOG: MAIN
     Completed
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=242
   delivering 10HmaY-0005vi-00
   LOG: MAIN
  -  *> a@??? P=<a@aa> R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
  -LOG: MAIN
     *> b@??? P=<b@aa> R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
  +LOG: MAIN
  +  *> a@??? P=<a@aa> R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
   LOG: MAIN
     Completed


  Index: 581
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/581,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- 581    28 Apr 2005 13:06:34 -0000    1.5
  +++ 581    3 May 2005 14:20:01 -0000    1.6
  @@ -172,9 +172,9 @@
     ** ph10@???: retry timeout exceeded
   end of retry processing
   processing failed address ph10@???
  +exec /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/581 -d=0xfbb95cfd -t -oem -oi -f <> -E10HmaX-0005vi-00
   sending error message to: ph10@???
   writing data block fd=9 size=291 timeout=0
  -exec /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/581 -d=0xfbb95cfd -t -oem -oi -f <> -E10HmaX-0005vi-00
   Exim version x.yz uid=42 gid=42 pid=pppp D=fbb95cfd
   Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
   Fixed never_users: 0
  @@ -342,10 +342,7 @@
   set_process_info: 21680 delivering 10HmaY-0005vi-00 (just run t1 for ph10@??? in subprocess)
   search_tidyup called
   reading pipe for subprocess 12345 (not ended)
  -read() yielded 5
  -selecting on subprocess pipes
  -reading pipe for subprocess 12345 (not ended)
  -read() yielded 98
  +read() yielded 103
   reading retry information for T:127.0.0.1:127.0.0.1:1225 from subprocess
     added retry item
   Z0 item read


  Index: 001
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/001,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- 001    6 Apr 2005 16:26:42 -0000    1.9
  +++ 001    3 May 2005 14:20:02 -0000    1.10
  @@ -904,6 +904,7 @@
   return_output
   temp_errors = 75:73
   timeout = 1h
  +no_timeout_defer
   umask = 022
   no_use_bsmtp
   no_use_crlf


  Index: 002
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/002,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- 002    6 Apr 2005 16:26:42 -0000    1.7
  +++ 002    3 May 2005 14:20:02 -0000    1.8
  @@ -874,6 +874,7 @@
   no_return_output
   temp_errors = 75:73
   timeout = 1h
  +no_timeout_defer
   umask = 022
   no_use_bsmtp
   no_use_crlf
  @@ -1278,6 +1279,7 @@
   return_output
   temp_errors = 75 : 73
   timeout = 1h
  +timeout_defer
   umask = 022
   use_bsmtp
   no_use_crlf


  Index: 210
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/210,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 210    8 Oct 2004 14:50:13 -0000    1.1
  +++ 210    3 May 2005 14:20:02 -0000    1.2
  @@ -29,7 +29,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250
  @@ -80,7 +80,7 @@
   SSL info: SSLv3 flush data
   SSL info: SSLv3 read finished A
   SSL info: SSLv3 read finished A
  -pppp:error14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure:s3_pkt.c:1046:SSL alert number 40
  +pppp:error14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure:s3_pkt.c:1052:SSL alert number 40
   Failed to start TLS
   End of script
   Certificate file = aux/cert2
  @@ -119,7 +119,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250


  Index: 211
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/211,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 211    25 Nov 2004 15:29:37 -0000    1.2
  +++ 211    3 May 2005 14:20:02 -0000    1.3
  @@ -29,14 +29,14 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250
   <<< 250 OK
   >>> rcpt to:<ph10@???>
   ??? 550
  -<<< 550 unacceptable cipher TLSv1:DES-CBC3-SHA:168
  +<<< 550 unacceptable cipher TLSv1:AES256-SHA:256
   >>> quit
   ??? 221
   <<< 221 myhost.test.ex closing connection
  @@ -72,7 +72,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> helo rhu.barb
   ??? 250


  Index: 213
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/213,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 213    8 Oct 2004 14:50:13 -0000    1.1
  +++ 213    3 May 2005 14:20:02 -0000    1.2
  @@ -35,7 +35,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250


  Index: 214
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/214,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 214    8 Oct 2004 14:50:13 -0000    1.1
  +++ 214    3 May 2005 14:20:02 -0000    1.2
  @@ -29,7 +29,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   +++ 3
   End of script


  Index: 215
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/215,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 215    8 Oct 2004 14:50:13 -0000    1.1
  +++ 215    3 May 2005 14:20:02 -0000    1.2
  @@ -57,7 +57,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> ehlo foobar
   ??? 250-


  Index: 225
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/225,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 225    25 Nov 2004 15:29:37 -0000    1.2
  +++ 225    3 May 2005 14:20:02 -0000    1.3
  @@ -30,7 +30,7 @@
   SSL info: SSLv3 flush data
   SSL info: SSLv3 read finished A
   SSL info: SSLv3 read finished A
  -pppp:error14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure:s3_pkt.c:1046:SSL alert number 40
  +pppp:error14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure:s3_pkt.c:1052:SSL alert number 40
   Failed to start TLS
   End of script
   Connecting to 127.0.0.1 port 1225 ... connected
  @@ -66,7 +66,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> helo rhu.barb
   ??? 250
  @@ -117,7 +117,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250
  @@ -165,7 +165,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250
  @@ -212,7 +212,7 @@
   SSL info: SSLv3 flush data
   SSL info: SSLv3 read finished A
   SSL info: SSLv3 read finished A
  -pppp:error14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown ca:s3_pkt.c:1046:SSL alert number 48
  +pppp:error14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown ca:s3_pkt.c:1052:SSL alert number 48
   Failed to start TLS
   End of script
   Certificate file = aux/cert1
  @@ -251,7 +251,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250
  @@ -300,7 +300,7 @@
   SSL info: SSLv3 flush data
   SSL info: SSLv3 read finished A
   SSL info: SSLv3 read finished A
  -pppp:error14094414:SSL routines:SSL3_READ_BYTES:sslv3 alert certificate revoked:s3_pkt.c:1046:SSL alert number 44
  +pppp:error14094414:SSL routines:SSL3_READ_BYTES:sslv3 alert certificate revoked:s3_pkt.c:1052:SSL alert number 44
   Failed to start TLS
   End of script
   Certificate file = aux/cert1
  @@ -339,7 +339,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250


  Index: 321
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/321,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 321    8 Oct 2004 14:50:13 -0000    1.1
  +++ 321    3 May 2005 14:20:02 -0000    1.2
  @@ -29,7 +29,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250


  Index: 391
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/391,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 391    8 Oct 2004 14:50:13 -0000    1.1
  +++ 391    3 May 2005 14:20:02 -0000    1.2
  @@ -13,7 +13,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   ??? 220
   <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  @@ -63,7 +63,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   ??? 220
   <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000


  Index: 429
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/429,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 429    8 Oct 2004 14:50:13 -0000    1.1
  +++ 429    3 May 2005 14:20:02 -0000    1.2
  @@ -29,7 +29,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> help
   ??? 214-


  Index: 433
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/433,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 433    8 Oct 2004 14:50:13 -0000    1.1
  +++ 433    3 May 2005 14:20:02 -0000    1.2
  @@ -7,8 +7,8 @@
   > 3 >>ANSWER-3*EOL*<<
   > 4 >>ANSWER-4*EOL*<<
   > 5 >>ANSWER-5<<
  -> Failed: request write to socket failed: Broken pipe
  -> 7 >>sock error<<
  +> 6 >><<
  +> 7 >><<
   > Failed: socket read timed out
   > 9 >>sock error<<

>

  Index: 486
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/486,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 486    8 Oct 2004 14:50:14 -0000    1.1
  +++ 486    3 May 2005 14:20:02 -0000    1.2
  @@ -31,7 +31,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> auth plain AHBoMTAAc2VjcmV0
   ??? 503
  @@ -76,7 +76,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> auth plain AHBoMTAAc2VjcmV0
   ??? 235


  Index: 550
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/550,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 550    25 Nov 2004 15:29:37 -0000    1.2
  +++ 550    3 May 2005 14:20:02 -0000    1.3
  @@ -33,7 +33,7 @@
   SSL info: SSLv3 flush data
   SSL info: SSLv3 read finished A
   SSL info: SSLv3 read finished A
  -pppp:error14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown ca:s3_pkt.c:1046:SSL alert number 48
  +pppp:error14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown ca:s3_pkt.c:1052:SSL alert number 48
   Failed to start TLS
   End of script
   Certificate file = aux/cert2
  @@ -60,6 +60,6 @@
   SSL info: before/connect initialization
   SSL info: SSLv2/v3 write client hello A
   SSL info: SSLv2/v3 read server hello A
  -pppp:error140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol:s23_clnt.c:470:
  +pppp:error140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol:s23_clnt.c:478:
   Failed to start TLS
   End of script


  Index: 584
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/584,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 584    25 Nov 2004 15:29:37 -0000    1.2
  +++ 584    3 May 2005 14:20:02 -0000    1.3
  @@ -29,7 +29,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   >>> quit
   ??? 221
  @@ -50,7 +50,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using DES-CBC3-SHA
  +SSL connection using AES256-SHA
   Succeeded in starting TLS
   ??? 220
   <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000